From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 1 Sep 2000 00:41:10 +0000 (-0000)
Subject: Correct the stdin/stdout behavior when no args are provided.
X-Git-Tag: 0_47~129
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e99674a70fa444e2b6e5d4db9e66113c7df76508;p=oweals%2Fbusybox.git

Correct the stdin/stdout behavior when no args are provided.
 -Erik
---

diff --git a/archival/gunzip.c b/archival/gunzip.c
index 20af97aed..9032852ed 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -581,10 +581,7 @@ int gunzip_main(int argc, char **argv)
 	char ofname[MAX_PATH_LEN + 1];	/* output file name */
 
 	if (strcmp(applet_name, "zcat") == 0) {
-		tostdout = 1;
-		if (argc == 1) {
-			fromstdin = 1;
-		}
+		force = 1;
 	}
 
 	/* Parse any options */
@@ -608,8 +605,11 @@ int gunzip_main(int argc, char **argv)
 			}
 		}
 	}
-	if (argc <= 0)
+
+	if (argc <= 0) {
+		tostdout = 1;
 		fromstdin = 1;
+	}
 
 	if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
 		fatalError( "data not read from terminal. Use -f to force it.\n");
diff --git a/gunzip.c b/gunzip.c
index 20af97aed..9032852ed 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -581,10 +581,7 @@ int gunzip_main(int argc, char **argv)
 	char ofname[MAX_PATH_LEN + 1];	/* output file name */
 
 	if (strcmp(applet_name, "zcat") == 0) {
-		tostdout = 1;
-		if (argc == 1) {
-			fromstdin = 1;
-		}
+		force = 1;
 	}
 
 	/* Parse any options */
@@ -608,8 +605,11 @@ int gunzip_main(int argc, char **argv)
 			}
 		}
 	}
-	if (argc <= 0)
+
+	if (argc <= 0) {
+		tostdout = 1;
 		fromstdin = 1;
+	}
 
 	if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
 		fatalError( "data not read from terminal. Use -f to force it.\n");