Treat filenames starting with hyphen correctly

tormodvolden · tormodvolden · commit cc97bcafffca · 2017-04-18T21:18:04.000+02:00
In places we were a bit sloppy with the file name check
and names only starting with '-' would be interpreted
as the magic "-" filename for stdin/stdout.

Signed-off-by: Tormod Volden &lt;debian.tormod@gmail.com&gt;
diff --git a/main.c b/main.c
@@ -81,6 +81,7 @@ int		retry		= 10;
 char		exec_flag	= 0;
 uint32_t	execute		= 0;
 char		init_flag	= 1;
+int		use_stdinout	= 0;
 char		force_binary	= 0;
 char		reset_flag	= 0;
 char		*filename;
@@ -239,7 +240,7 @@ int main(int argc, char* argv[]) {
 	sigaction(SIGINT, &sigIntHandler, NULL);
 #endif
 
-	if ((action == ACT_READ) && filename[0] == '-') {
+	if (action == ACT_READ && use_stdinout) {
 		diag = stderr;
 	}
 
@@ -487,7 +488,7 @@ int main(int argc, char* argv[]) {
 		max_rlen = max_rlen < max_wlen ? max_rlen : max_wlen;
 
 		/* Assume data from stdin is whole device */
-		if (filename[0] == '-' && filename[1] == '\0')
+		if (use_stdinout)
 			size = end - start;
 		else
 			size = parser->size(p_st);
@@ -521,7 +522,7 @@ int main(int argc, char* argv[]) {
 				goto close;
 
 			if (len == 0) {
-				if (filename[0] == '-') {
+				if (use_stdinout) {
 					break;
 				} else {
 					fprintf(stderr, "Failed to read input file\n");
@@ -680,7 +681,8 @@ int parse_options(int argc, char *argv[])
 				}
 				action = (c == 'r') ? ACT_READ : ACT_WRITE;
 				filename = optarg;
-				if (filename[0] == '-') {
+				if (filename[0] == '-' && filename[1] == '\0') {
+					use_stdinout = 1;
 					force_binary = 1;
 				}
 				break;
diff --git a/parsers/binary.c b/parsers/binary.c
@@ -39,7 +39,7 @@ void* binary_init() {
 parser_err_t binary_open(void *storage, const char *filename, const char write) {
 	binary_t *st = storage;
 	if (write) {
-		if (filename[0] == '-')
+		if (filename[0] == '-' && filename[1] == '\0')
 			st->fd = 1;
 		else
 			st->fd = open(
@@ -57,7 +57,7 @@ parser_err_t binary_open(void *storage, const char *filename, const char write)
 			);
 		st->stat.st_size = 0;
 	} else {
-		if (filename[0] == '-') {
+		if (filename[0] == '-' && filename[1] == '\0') {
 			st->fd = 0;
 		} else {
 			if (stat(filename, &st->stat) != 0)
