coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-14 15:29:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: remove COMMAND, MAC_ADDRESS, PARTN

Browse Source 
these macros serve no purpose except to obfuscate the
code. it's actually cleaner just to refer directly to
argv, and it reduces the chance of contamination later
upon re-factoring.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-03 16:15:33 +00:00
parent b3119c8b4d
commit 61fa94d0d2
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+17 -14
View File
@@ -48,9 +48,6 @@ static void usage(const char *);
static void err_if(int); static void err_if(int);
static int set_err(int); static int set_err(int);
#define COMMAND argv[2]
#define MAC_ADDRESS argv[3]
#define PARTN argv[3]
#define NVM_CHECKSUM 0xBABA #define NVM_CHECKSUM 0xBABA
#define NVM_CHECKSUM_WORD 0x3F #define NVM_CHECKSUM_WORD 0x3F
#define NVM_SIZE 128 #define NVM_SIZE 128
@@ -96,8 +93,9 @@ static void (*cmd)(void) = NULL;
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
if (argc >= 2) if (argc < 2)
fname = argv[1]; usage(argv[0]);
fname = argv[1];
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio rpath wpath unveil", NULL) == -1); err_if(pledge("stdio rpath wpath unveil", NULL) == -1);
err_if(unveil("/dev/urandom", "r") == -1); err_if(unveil("/dev/urandom", "r") == -1);
@@ -132,16 +130,17 @@ static void
set_cmd(int argc, char *argv[]) set_cmd(int argc, char *argv[])
{ {
size_t i; size_t i;
const char *arg_cmd = argv[2];
if (argc < 2) { if (argc == 2) {
usage(argv[0]);
} else if (argc == 2) {
cmd = cmd_setmac; cmd = cmd_setmac;
return; return;
} }
arg_cmd = argv[2];
for (i = 0; (i < items(ops)) && (cmd == NULL); i++) { for (i = 0; (i < items(ops)) && (cmd == NULL); i++) {
if (strcmp(COMMAND, ops[i].str) != 0) if (strcmp(arg_cmd, ops[i].str) != 0)
continue; continue;
if (argc >= ops[i].args) { if (argc >= ops[i].args) {
cmd = ops[i].cmd; cmd = ops[i].cmd;
@@ -155,16 +154,18 @@ set_cmd(int argc, char *argv[])
static void static void
check_cmd_args(int argc, char *argv[]) check_cmd_args(int argc, char *argv[])
{ {
const char *arg_cmd = argv[2];
if ((cmd == NULL) && (argc > 2)) { /* nvm gbe [MAC] */ if ((cmd == NULL) && (argc > 2)) { /* nvm gbe [MAC] */
mac = COMMAND; mac = arg_cmd;
cmd = cmd_setmac; cmd = cmd_setmac;
} else if (cmd == cmd_setmac) { /* nvm gbe setmac [MAC] */ } else if (cmd == cmd_setmac) { /* nvm gbe setmac [MAC] */
mac = rmac; /* random MAC */ mac = rmac; /* random MAC */
if (argc > 3) if (argc > 3)
mac = MAC_ADDRESS; mac = argv[3];
} else if ((cmd != NULL) && (argc > 3)) { /* user-supplied partnum */ } else if ((cmd != NULL) && (argc > 3)) { /* user-supplied partnum */
err_if((errno = (!((part = PARTN[0] - '0') == 0 || part == 1)) err_if((errno = (!((part = argv[3][0] - '0') == 0 || part == 1))
|| PARTN[1] ? EINVAL : errno)); /* only allow '0' or '1' */ || argv[3][1] ? EINVAL : errno)); /* only '0' or '1' */
} }
if (cmd == NULL) if (cmd == NULL)
@@ -174,9 +175,11 @@ check_cmd_args(int argc, char *argv[])
static void static void
set_io_flags(int argc, char *argv[]) set_io_flags(int argc, char *argv[])
{ {
const char *arg_cmd = argv[2];
flags = O_RDWR; flags = O_RDWR;
if (argc > 2) if (argc > 2)
if (strcmp(COMMAND, "dump") == 0) if (strcmp(arg_cmd, "dump") == 0)
flags = O_RDONLY; flags = O_RDONLY;
} }