libreboot
/
lbmk
1
0
Fork 0
Code Packages Projects Releases Activity

util/nvmutil: simplified error handling in main 

This change also reduces code indentation.

Signed-off-by: Leah Rowe <leah@libreboot.org>
fsdg20230625
Leah Rowe 2023-05-31 09:30:13 +01:00
parent 78fc89352b
commit 8f1e6d792f
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
util/nvmutil/nvmutil.c
View File

@ -58,6 +58,7 @@ void byteswap(int n, int partnum);
void writeGbeFile(int *fd, const char *filename, size_t nw); void writeGbeFile(int *fd, const char *filename, size_t nw);
void xpledge(const char *promises, const char *execpromises); void xpledge(const char *promises, const char *execpromises);
void xunveil(const char *path, const char *permissions); void xunveil(const char *path, const char *permissions);
void err_if(int condition);
#define FILENAME argv[1] #define FILENAME argv[1]
#define COMMAND argv[2] #define COMMAND argv[2]
@ -118,31 +119,27 @@ main(int argc, char *argv[])
} }
} }
if ((strMac == NULL) && (cmd == NULL)) err_if(errno = ((strMac == NULL) && (cmd == NULL)) ? EINVAL : errno);
errno = EINVAL;
if (errno == 0) { skipread[part ^ 1] = (cmd == &cmd_copy) |
skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum) | (cmd == &cmd_brick);
(cmd == &cmd_setchecksum) | (cmd == &cmd_brick); readGbeFile(&fd, FILENAME, flags, nr);
readGbeFile(&fd, FILENAME, flags, nr); (void)rhex();
(void)rhex(); xunveil("/dev/urandom", "r");
xunveil("/dev/urandom", "r"); if (flags == O_RDONLY) {
if (flags == O_RDONLY) {
xpledge("stdio", NULL);
} else {
xpledge("stdio wpath unveil", NULL);
xunveil(FILENAME, "w");
}
if (strMac != NULL)
cmd_setmac(strMac); /* nvm gbe.bin setmac */
else if (cmd != NULL)
(*cmd)(); /* all other commands except setmac */
writeGbeFile(&fd, FILENAME, nr);
} else
xpledge("stdio", NULL); xpledge("stdio", NULL);
} else {
xpledge("stdio wpath unveil", NULL);
xunveil(FILENAME, "w");
}
if ((errno != 0) && (cmd != &cmd_dump)) if (strMac != NULL)
err(errno, NULL); cmd_setmac(strMac); /* nvm gbe.bin setmac */
else if (cmd != NULL)
(*cmd)(); /* all other commands except setmac */
writeGbeFile(&fd, FILENAME, nr);
err_if((errno != 0) && (cmd != &cmd_dump));
return errno; return errno;
} }
@ -396,3 +393,13 @@ xunveil(const char *path, const char *permissions)
err(errno, NULL); err(errno, NULL);
#endif #endif
} }
void
err_if(int condition)
{
if (!condition)
return;
if (!errno)
errno = ECANCELED;
err(errno, NULL);
}