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

util/nvmutil: more consistent output in usage()

Browse Source 
and use getnvmprogname

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-03 18:03:27 +00:00
parent 2faea7d890
commit 3af94efc16
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+11 -10
View File
@@ -43,7 +43,7 @@ static void check_bound(int, int);
static void write_gbe(void); static void write_gbe(void);
static void write_gbe_part(int); static void write_gbe_part(int);
static void swap(int); static void swap(int);
static void usage(const char *); static void usage(void);
static void err_if(int); static void err_if(int);
static void err(int, const char *, ...); static void err(int, const char *, ...);
static const char *getnvmprogname(void); static const char *getnvmprogname(void);
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
{ {
argv0 = argv[0]; argv0 = argv[0];
if (argc < 2) if (argc < 2)
usage(getnvmprogname()); usage();
fname = argv[1]; 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);
@@ -572,21 +572,22 @@ swap(int partnum)
} }
static void static void
usage(const char *util) usage(void)
{ {
const char *util = getnvmprogname();
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1); err_if(pledge("stdio", NULL) == -1);
#endif #endif
fprintf(stderr, fprintf(stderr,
"Modify Intel GbE NVM images e.g. set MAC\n" "Modify Intel GbE NVM images e.g. set MAC\n"
"USAGE:\n" "USAGE:\n"
"%s FILE dump\n" "\t%s FILE dump\n"
" %s FILE\n # same as setmac without arg\n" "\t%s FILE # same as setmac without [MAC]\n"
" %s FILE setmac [MAC]\n" "\t%s FILE setmac [MAC]\n"
" %s FILE swap\n" "\t%s FILE swap\n"
" %s FILE copy 0|1\n" "\t%s FILE copy 0|1\n"
" %s FILE brick 0|1\n" "\t%s FILE brick 0|1\n"
" %s FILE setchecksum 0|1\n", "\t%s FILE setchecksum 0|1\n",
util, util, util, util, util, util, util); util, util, util, util, util, util, util);
err(set_err(ECANCELED), "Too few arguments"); err(set_err(ECANCELED), "Too few arguments");
} }