emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tolerate -q argument, if -q is passed give a warning and continue rather than just fail

Browse Source
This commit is contained in:
Glenn L McGrath 2001-05-07 12:01:58 +00:00
parent cc0aa0f2d7
commit 5bcfc9ba1a
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/gunzip.c
View File

@ -87,7 +87,7 @@ extern int gunzip_main(int argc, char **argv)
if (strcmp(applet_name, "zcat") == 0) if (strcmp(applet_name, "zcat") == 0)
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
while ((opt = getopt(argc, argv, "ctfhd")) != -1) { while ((opt = getopt(argc, argv, "ctfhdq")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
@ -100,6 +100,8 @@ extern int gunzip_main(int argc, char **argv)
break; break;
case 'd': /* Used to convert gzip to gunzip. */ case 'd': /* Used to convert gzip to gunzip. */
break; break;
case 'q':
error_msg("-q option not supported, ignored");
case 'h': case 'h':
default: default:
show_usage(); /* exit's inside usage */ show_usage(); /* exit's inside usage */

4
archival/gzip.c
View File

@ -1899,7 +1899,7 @@ int gzip_main(int argc, char **argv)
int force = 0; int force = 0;
int opt; int opt;
while ((opt = getopt(argc, argv, "cf123456789d")) != -1) { while ((opt = getopt(argc, argv, "cf123456789dq")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
tostdout = 1; tostdout = 1;
@ -1911,6 +1911,8 @@ int gzip_main(int argc, char **argv)
case '1': case '2': case '3': case '4': case '5': case '1': case '2': case '3': case '4': case '5':
case '6': case '7': case '8': case '9': case '6': case '7': case '8': case '9':
break; break;
case 'q':
break;
#ifdef BB_GUNZIP #ifdef BB_GUNZIP
case 'd': case 'd':
optind = 1; optind = 1;

4
gunzip.c
View File

@ -87,7 +87,7 @@ extern int gunzip_main(int argc, char **argv)
if (strcmp(applet_name, "zcat") == 0) if (strcmp(applet_name, "zcat") == 0)
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
while ((opt = getopt(argc, argv, "ctfhd")) != -1) { while ((opt = getopt(argc, argv, "ctfhdq")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
@ -100,6 +100,8 @@ extern int gunzip_main(int argc, char **argv)
break; break;
case 'd': /* Used to convert gzip to gunzip. */ case 'd': /* Used to convert gzip to gunzip. */
break; break;
case 'q':
error_msg("-q option not supported, ignored");
case 'h': case 'h':
default: default:
show_usage(); /* exit's inside usage */ show_usage(); /* exit's inside usage */

4
gzip.c
View File

@ -1899,7 +1899,7 @@ int gzip_main(int argc, char **argv)
int force = 0; int force = 0;
int opt; int opt;
while ((opt = getopt(argc, argv, "cf123456789d")) != -1) { while ((opt = getopt(argc, argv, "cf123456789dq")) != -1) {
switch (opt) { switch (opt) {
case 'c': case 'c':
tostdout = 1; tostdout = 1;
@ -1911,6 +1911,8 @@ int gzip_main(int argc, char **argv)
case '1': case '2': case '3': case '4': case '5': case '1': case '2': case '3': case '4': case '5':
case '6': case '7': case '8': case '9': case '6': case '7': case '8': case '9':
break; break;
case 'q':
break;
#ifdef BB_GUNZIP #ifdef BB_GUNZIP
case 'd': case 'd':
optind = 1; optind = 1;