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

 -Erik

diff --git a/archival/gunzip.c b/archival/gunzip.c
index 20af97aed2c5e05b455f90b8c2093976153bf8b1..9032852ed80818f8c331deaa72bfb359834d1ac7 100644 (file)
--- 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 20af97aed2c5e05b455f90b8c2093976153bf8b1..9032852ed80818f8c331deaa72bfb359834d1ac7 100644 (file)
--- 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");