From 5eb5912790b32df1dcf3ed91652d0c373c735bb0 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 1 Sep 2000 00:33:06 +0000 Subject: [PATCH] Sigh. Seems I screwed up last time. This fixed detecting when on a console or not, and make default behavior compatible with GNU gzip... -Erik --- archival/gzip.c | 7 +++---- gzip.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/archival/gzip.c b/archival/gzip.c index 591b8cc7f..c0832680f 100644 --- a/archival/gzip.c +++ b/archival/gzip.c @@ -1802,9 +1802,6 @@ int gzip_main(int argc, char **argv) int fromstdin = 0; int force = 0; - if (argc == 1) - usage(gzip_usage); - /* Parse any options */ while (--argc > 0 && **(++argv) == '-') { if (*((*argv) + 1) == '\0') { @@ -1827,8 +1824,10 @@ int gzip_main(int argc, char **argv) } } } - if (argc <= 0) + if (argc <= 0 ) { fromstdin = 1; + tostdout = 1; + } if (isatty(fileno(stdin)) && fromstdin==1 && force==0) fatalError( "data not read from terminal. Use -f to force it.\n"); diff --git a/gzip.c b/gzip.c index 591b8cc7f..c0832680f 100644 --- a/gzip.c +++ b/gzip.c @@ -1802,9 +1802,6 @@ int gzip_main(int argc, char **argv) int fromstdin = 0; int force = 0; - if (argc == 1) - usage(gzip_usage); - /* Parse any options */ while (--argc > 0 && **(++argv) == '-') { if (*((*argv) + 1) == '\0') { @@ -1827,8 +1824,10 @@ int gzip_main(int argc, char **argv) } } } - if (argc <= 0) + if (argc <= 0 ) { fromstdin = 1; + tostdout = 1; + } if (isatty(fileno(stdin)) && fromstdin==1 && force==0) fatalError( "data not read from terminal. Use -f to force it.\n");