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

util/nvmutil: fix cat

Browse Source 
i simplified it in the last commits, but i sttill
need this loop to properly handle parts

otherwise yeah, all it's doing is copying a file
verbatim. duh.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-15 20:20:19 +00:00
parent af7ab6f786
commit 5d8b19fb75
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+34 -7
View File
@@ -408,6 +408,7 @@ static void cmd_helper_copy(void);
* cat, cat16 and cat128 * cat, cat16 and cat128
*/ */
static void cmd_helper_cat(void); static void cmd_helper_cat(void);
static void cat_buf(u8 *b);
/* /*
* After command processing, write * After command processing, write
@@ -773,11 +774,6 @@ main(int argc, char *argv[])
memset(buf, 0, GBE_BUF_SIZE); memset(buf, 0, GBE_BUF_SIZE);
memset(bufcmp, 0, GBE_BUF_SIZE); memset(bufcmp, 0, GBE_BUF_SIZE);
/*
* Used by CMD_CAT, for padding
*/
memset(pad, 0xff, sizeof(pad));
copy_gbe(); copy_gbe();
read_checksums(); read_checksums();
@@ -1540,10 +1536,41 @@ cmd_helper_copy(void)
static void static void
cmd_helper_cat(void) cmd_helper_cat(void)
{ {
size_t p = 0;
size_t ff = 0;
size_t nff = 0;
fflush(NULL); fflush(NULL);
if (rw_file_exact(STDOUT_FILENO, bufcmp, memset(pad, 0xff, GBE_PART_SIZE);
gbe_file_size, 0, IO_WRITE, LOOP_EAGAIN, LOOP_EINTR,
switch (cmd_index) {
case CMD_CAT:
nff = 0;
break;
case CMD_CAT16:
nff = 1;
break;
case CMD_CAT128:
nff = 15;
break;
default:
err(EINVAL, "erroneous call to cat");
}
for (p = 0; p < 2; p++) {
cat_buf(bufcmp + (size_t)(p * (gbe_file_size >> 1)));
for (ff = 0; ff < nff; ff++)
cat_buf(pad);
}
}
static void
cat_buf(u8 *b)
{
if (rw_file_exact(STDOUT_FILENO, b,
GBE_PART_SIZE, 0, IO_WRITE, LOOP_EAGAIN, LOOP_EINTR,
MAX_ZERO_RW_RETRY, OFF_ERR) < 0) MAX_ZERO_RW_RETRY, OFF_ERR) < 0)
err(errno, "stdout: cat"); err(errno, "stdout: cat");
} }