Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-18 07:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Sigh. Seems I screwed up last time. This fixed detecting

Browse Source 
when on a console or not, and make default behavior compatible
with GNU gzip...
 -Erik
This commit is contained in:
Eric Andersen 2000-09-01 00:33:06 +00:00
parent 4e61db2284
commit 5eb5912790
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archival/gzip.c
View File

@ -1802,9 +1802,6 @@ int gzip_main(int argc, char **argv)
int fromstdin = 0; int fromstdin = 0;
int force = 0; int force = 0;
if (argc == 1)
usage(gzip_usage);
/* Parse any options */ /* Parse any options */
while (--argc > 0 && **(++argv) == '-') { while (--argc > 0 && **(++argv) == '-') {
if (*((*argv) + 1) == '\0') { if (*((*argv) + 1) == '\0') {
@ -1827,8 +1824,10 @@ int gzip_main(int argc, char **argv)
} }
} }
} }
if (argc <= 0) if (argc <= 0 ) {
fromstdin = 1; fromstdin = 1;
tostdout = 1;
}
if (isatty(fileno(stdin)) && fromstdin==1 && force==0) if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
fatalError( "data not read from terminal. Use -f to force it.\n"); fatalError( "data not read from terminal. Use -f to force it.\n");

7
gzip.c
View File

@ -1802,9 +1802,6 @@ int gzip_main(int argc, char **argv)
int fromstdin = 0; int fromstdin = 0;
int force = 0; int force = 0;
if (argc == 1)
usage(gzip_usage);
/* Parse any options */ /* Parse any options */
while (--argc > 0 && **(++argv) == '-') { while (--argc > 0 && **(++argv) == '-') {
if (*((*argv) + 1) == '\0') { if (*((*argv) + 1) == '\0') {
@ -1827,8 +1824,10 @@ int gzip_main(int argc, char **argv)
} }
} }
} }
if (argc <= 0) if (argc <= 0 ) {
fromstdin = 1; fromstdin = 1;
tostdout = 1;
}
if (isatty(fileno(stdin)) && fromstdin==1 && force==0) if (isatty(fileno(stdin)) && fromstdin==1 && force==0)
fatalError( "data not read from terminal. Use -f to force it.\n"); fatalError( "data not read from terminal. Use -f to force it.\n");