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

util/nvmutil: split flags init to new function

Browse Source 
main is getting much smaller now

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-02 12:54:47 +00:00
parent ab057e006c
commit 697eda800a
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+16 -13
View File
@@ -19,7 +19,7 @@ void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
checkdir(const char *path), macf(int partnum), hexdump(int partnum), checkdir(const char *path), macf(int partnum), hexdump(int partnum),
parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void), parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void),
openFiles(const char *path), cmd_copy(void), writeGbe_part(int), openFiles(const char *path), cmd_copy(void), writeGbe_part(int),
readGbe_part(int), usage(char*); readGbe_part(int), usage(char*), set_io_flags(int, char **);
int goodChecksum(int partnum); int goodChecksum(int partnum);
uint8_t hextonum(char chs), rhex(void); uint8_t hextonum(char chs), rhex(void);
@@ -84,23 +84,12 @@ main(int argc, char *argv[])
usage(argv[0]); usage(argv[0]);
fname = argv[1]; fname = argv[1];
flags = O_RDWR; set_io_flags(argc, argv);
if (argc > 2)
if (strcmp(COMMAND, "dump") == 0)
flags = O_RDONLY;
#ifdef __OpenBSD__
if (flags == O_RDONLY)
err_if(pledge("stdio rpath unveil", NULL) == -1);
#endif
checkdir("/dev/urandom"); checkdir("/dev/urandom");
checkdir(fname); checkdir(fname);
#ifdef __OpenBSD__ #ifdef __OpenBSD__
block_unveil(); block_unveil();
#endif #endif
openFiles(fname); openFiles(fname);
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1); err_if(pledge("stdio", NULL) == -1);
@@ -143,6 +132,20 @@ main(int argc, char *argv[])
return errno; return errno;
} }
void
set_io_flags(int argc, char *argv[])
{
flags = O_RDWR;
if (argc > 2)
if (strcmp(COMMAND, "dump") == 0)
flags = O_RDONLY;
#ifdef __OpenBSD__
if (flags == O_RDONLY)
err_if(pledge("stdio rpath unveil", NULL) == -1);
#endif
}
void void
checkdir(const char *path) checkdir(const char *path)
{ {