[flashrom-gerrit] Change in flashrom[master]: flashrom.c: allow - as filename for stdin

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/52383 )

Change subject: flashrom.c: allow - as filename for stdin
......................................................................

flashrom.c: allow - as filename for stdin

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 
Change-Id: I97889cfdf7ba9a257e182c4ee2b20075cfa58d4d
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52383
Tested-by: build bot (Jenkins) 
Reviewed-by: Edward O'Callaghan 
---
M cli_classic.c
M flashrom.c
2 files changed, 11 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Edward O'Callaghan: Looks good to me, approved

diff --git a/cli_classic.c b/cli_classic.c
index a22d642..7d4dee0 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -48,8 +48,10 @@
    printf(" -h | --help                        print this help text\n"
           " -R | --version                     print version (release)\n"
           " -r | --read <file>                 read flash and save to <file>\n"
-	       " -w | --write <file>                write <file> to flash\n"
-	       " -v | --verify <file>               verify flash against <file>\n"
+	       " -w | --write <file|->              write <file> or the content provided\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"
           " -V | --verbose                     more verbose output\n"
           " -c | --chip <chipname>             probe only for specified flash chip\n"
@@ -107,7 +109,7 @@
    	return 1;
    }
    /* 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);
    return 0;
 }
diff --git a/flashrom.c b/flashrom.c
index 3a733df..e1121d8 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1348,7 +1348,11 @@
    int ret = 0;

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));
    	return 1;
    }
@@ -1359,7 +1363,7 @@
    	ret = 1;
    	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",
    		 (intmax_t)image_stat.st_size, size);
    	ret = 1;