coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-17 18:34:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: tidy up set_cmd()

Browse Source 
don't set args here

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-08 03:34:03 +00:00
parent de1963fdee
commit 0160b26aee
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+17 -22
View File
@@ -142,8 +142,8 @@ static int gbe_fd = -1;
static size_t part; static size_t part;
static uint8_t part_modified[2]; static uint8_t part_modified[2];
static const char *mac_str;
static const char rmac[] = "xx:xx:xx:xx:xx:xx"; static const char rmac[] = "xx:xx:xx:xx:xx:xx";
static const char *mac_str;
static const char *fname; static const char *fname;
static const char *argv0; static const char *argv0;
@@ -300,25 +300,15 @@ main(int argc, char *argv[])
static void static void
set_cmd(int argc, char *argv[]) set_cmd(int argc, char *argv[])
{ {
/*
* No extra args: ./nvmutil gbe.bin
* Equivalent: ./nvmutil gbe.bin setmac xx:xx:xx:xx:xx:xx
*/
if (argc == 2) {
cmd = CMD_SETMAC;
return;
}
/*
* Three or more args.
* Example: ./nvmutil gbe.bin copy 0
*/
for (cmd = 0; cmd < (ssize_t)items(command); cmd++) { for (cmd = 0; cmd < (ssize_t)items(command); cmd++) {
if (argc < 3)
break;
if (strcmp(argv[2], command[cmd].str) != 0) if (strcmp(argv[2], command[cmd].str) != 0)
continue; continue;
if (argc >= command[cmd].argc) {
if (argc >= command[cmd].argc)
return; return;
}
err(EINVAL, "Too few args: command '%s'", command[cmd].str); err(EINVAL, "Too few args: command '%s'", command[cmd].str);
} }
@@ -329,20 +319,25 @@ set_cmd(int argc, char *argv[])
static void static void
set_cmd_args(int argc, char *argv[]) set_cmd_args(int argc, char *argv[])
{ {
if (cmd == CMD_NULL && argc > 2) { if (cmd == CMD_SETMAC && argc >= 4) {
/*
* 4th arg e.g.: ./nvmutil gbe.bin setmac 00:xx:11:22:xx:xx
*/
mac_str = argv[3];
} else if (cmd == CMD_NULL && argc >= 3) {
/* /*
* Example: ./nvmutil gbe.bin xx:1f:16:xx:xx:xx * Example: ./nvmutil gbe.bin xx:1f:16:xx:xx:xx
* Equivalent ./nvmutil gbe.bin setmac xx:1f:16:xx:xx:xx * Equivalent ./nvmutil gbe.bin setmac xx:1f:16:xx:xx:xx
*/ */
mac_str = argv[2]; mac_str = argv[2];
cmd = CMD_SETMAC; cmd = CMD_SETMAC;
} else if (cmd == CMD_SETMAC) { } else if (argc == 2) {
/* /*
* Example: ./nvmutil gbe.bin setmac xx:1f:16:xx:xx:xx * No extra args: ./nvmutil gbe.bin
* Equivalent: ./nvmutil gbe.bin setmac xx:xx:xx:xx:xx:xx
*/ */
mac_str = rmac; /* random MAC */ mac_str = rmac;
if (argc > 3) cmd = CMD_SETMAC;
mac_str = argv[3];
} else if (cmd != CMD_NULL && argc > 3) { /* user-supplied partnum */ } else if (cmd != CMD_NULL && argc > 3) { /* user-supplied partnum */
/* /*
* Example: ./nvmutil gbe.bin copy 0 * Example: ./nvmutil gbe.bin copy 0