openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 16:33:41 +02:00
Code Issues Releases Wiki Activity

flashrom.c: allow - as filename for stdin

Browse Source 
Allows - as filename for -w/-v options. It is sometimes useful to
script flashrom and allowing it to work with pipes allows for more
flexibility in this specific use-case.

Signed-off-by: Daniel Campello <campello@chromium.org>
Change-Id: I97889cfdf7ba9a257e182c4ee2b20075cfa58d4d
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52383
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Daniel Campello 2021-04-15 10:36:04 -06:00 committed by Edward O'Callaghan
parent 4cc7363d25
commit d4063bf3a7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli_classic.c
View File

@ -48,8 +48,10 @@ static void cli_classic_usage(const char *name)
printf(" -h | --help print this help text\n" printf(" -h | --help print this help text\n"
" -R | --version print version (release)\n" " -R | --version print version (release)\n"
" -r | --read <file> read flash and save to <file>\n" " -r | --read <file> read flash and save to <file>\n"
" -w | --write <file> write <file> to flash\n" " -w | --write <file|-> write <file> or the content provided\n"
" -v | --verify <file> verify flash against <file>\n" " on the standard input to flash\n"
" -v | --verify <file|-> verify flash against <file>\n"
" or the content provided on the standard input\n"
" -E | --erase erase flash memory\n" " -E | --erase erase flash memory\n"
" -V | --verbose more verbose output\n" " -V | --verbose more verbose output\n"
" -c | --chip <chipname> probe only for specified flash chip\n" " -c | --chip <chipname> probe only for specified flash chip\n"
@ -107,7 +109,7 @@ static int check_filename(char *filename, const char *type)
return 1; return 1;
} }
/* Not an error, but maybe the user intended to specify a CLI option instead of a file name. */ /* Not an error, but maybe the user intended to specify a CLI option instead of a file name. */
if (filename[0] == '-') if (filename[0] == '-' && filename[1] != '\0')
fprintf(stderr, "Warning: Supplied %s file name starts with -\n", type); fprintf(stderr, "Warning: Supplied %s file name starts with -\n", type);
return 0; return 0;
} }

8
flashrom.c
View File

@ -1348,7 +1348,11 @@ int read_buf_from_file(unsigned char *buf, unsigned long size,
int ret = 0; int ret = 0;
FILE *image; FILE *image;
if ((image = fopen(filename, "rb")) == NULL) { if (!strcmp(filename, "-"))
image = fdopen(fileno(stdin), "rb");
else
image = fopen(filename, "rb");
if (image == NULL) {
msg_gerr("Error: opening file \"%s\" failed: %s\n", filename, strerror(errno)); msg_gerr("Error: opening file \"%s\" failed: %s\n", filename, strerror(errno));
return 1; return 1;
} }
@ -1359,7 +1363,7 @@ int read_buf_from_file(unsigned char *buf, unsigned long size,
ret = 1; ret = 1;
goto out; goto out;
} }
if (image_stat.st_size != (intmax_t)size) { if ((image_stat.st_size != (intmax_t)size) && strcmp(filename, "-")) {
msg_gerr("Error: Image size (%jd B) doesn't match the expected size (%lu B)!\n", msg_gerr("Error: Image size (%jd B) doesn't match the expected size (%lu B)!\n",
(intmax_t)image_stat.st_size, size); (intmax_t)image_stat.st_size, size);
ret = 1; ret = 1;