canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvmutil: print dump *after* modification 

this way, we still get an error exit for example
when trying to invalidate an already invalid
checksum; this error exit was disabled by the
last revisions.

Signed-off-by: Leah Rowe <leah@libreboot.org>
20250107_branch
Leah Rowe 2025-01-27 05:50:34 +00:00
parent 5540713d16
commit a5549b43f8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/nvmutil/nvmutil.c
View File

@ -449,13 +449,6 @@ writeGbe(void)
{ {
ssize_t tnw = 0; /* total bytes written */ ssize_t tnw = 0; /* total bytes written */
if ((flags != O_RDONLY) && (cmd != cmd_dump)) {
if (nvmPartChanged[0] || nvmPartChanged[1])
printf("The following nvm words will be written:\n");
cmd_dump();
errno = 0; /* reset for cmd_brick */
}
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if ((!nvmPartChanged[p]) || (flags == O_RDONLY)) if ((!nvmPartChanged[p]) || (flags == O_RDONLY))
continue; continue;
@ -471,12 +464,20 @@ writeGbe(void)
tnw += nf; tnw += nf;
} }
if ((flags != O_RDONLY) && (cmd != cmd_dump)) {
if (nvmPartChanged[0] || nvmPartChanged[1])
printf("The following nvm words were written:\n");
cmd_dump();
}
if ((!tnw) && (flags != O_RDONLY)) if ((!tnw) && (flags != O_RDONLY))
fprintf(stderr, "No changes needed on file '%s'\n", filename); fprintf(stderr, "No changes needed on file '%s'\n", filename);
else if (tnw) else if (tnw)
printf("%ld bytes written to file '%s'\n", tnw, filename); printf("%ld bytes written to file '%s'\n", tnw, filename);
errno = 0; if (tnw)
errno = 0;
err_if(close(fd) == -1); err_if(close(fd) == -1);
} }