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

util/nvmutil: cleanup: move logic out of main() 

Signed-off-by: Leah Rowe <leah@libreboot.org>
fsdg20230625
Leah Rowe 2023-06-03 13:44:04 +01:00
parent 46a9eea0f6
commit 270693fc92
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/nvmutil/nvmutil.c
View File

@ -17,9 +17,6 @@ main(int argc, char *argv[])
err_if((errno = (!((part = PARTNUM[0] - '0') == 0 || part == 1)) err_if((errno = (!((part = PARTNUM[0] - '0') == 0 || part == 1))
|| PARTNUM[1] ? EINVAL : errno)); || PARTNUM[1] ? EINVAL : errno));
err_if((errno = (!cmd) ? EINVAL : errno)); err_if((errno = (!cmd) ? EINVAL : errno));
nf = ((cmd == cmd_swap) || (cmd == cmd_copy)) ? SIZE_4KB : nf;
flags = (strcmp(COMMAND, "dump") == 0) ? O_RDONLY : flags;
openFiles(FILENAME); openFiles(FILENAME);
readGbeFile(FILENAME); readGbeFile(FILENAME);
@ -34,7 +31,7 @@ void
openFiles(const char *path) openFiles(const char *path)
{ {
struct stat st; struct stat st;
xopen(fd, path, flags); xopen(fd, path, flags = (cmd == cmd_dump) ? O_RDONLY : flags);
if ((st.st_size != SIZE_8KB)) if ((st.st_size != SIZE_8KB))
err(errno = ECANCELED, "File `%s` not 8KiB", path); err(errno = ECANCELED, "File `%s` not 8KiB", path);
xopen(rfd, "/dev/urandom", O_RDONLY); xopen(rfd, "/dev/urandom", O_RDONLY);
@ -48,6 +45,7 @@ openFiles(const char *path)
void void
readGbeFile(const char *path) readGbeFile(const char *path)
{ {
nf = ((cmd == cmd_swap) || (cmd == cmd_copy)) ? SIZE_4KB : nf;
skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum) skipread[part ^ 1] = (cmd == &cmd_copy) | (cmd == &cmd_setchecksum)
| (cmd == &cmd_brick); | (cmd == &cmd_brick);
gbe[1] = (gbe[0] = (size_t) buf) + SIZE_4KB; gbe[1] = (gbe[0] = (size_t) buf) + SIZE_4KB;