aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath <bug1@ihug.co.nz>2001-05-07 12:01:58 +0000
committerGlenn L McGrath <bug1@ihug.co.nz>2001-05-07 12:01:58 +0000
commit5bcfc9ba1aaaec3a413d39d60e6a904daafa2cc1 (patch)
treecd1ba2dfa79ec9864542bb52808f3d27b280ebc4
parentcc0aa0f2d74901f3cdc87073f52020b98605cb79 (diff)
downloadbusybox-w32-5bcfc9ba1aaaec3a413d39d60e6a904daafa2cc1.tar.gz
busybox-w32-5bcfc9ba1aaaec3a413d39d60e6a904daafa2cc1.tar.bz2
busybox-w32-5bcfc9ba1aaaec3a413d39d60e6a904daafa2cc1.zip
Tolerate -q argument, if -q is passed give a warning and continue rather than just fail
-rw-r--r--archival/gunzip.c4
-rw-r--r--archival/gzip.c4
-rw-r--r--gunzip.c4
-rw-r--r--gzip.c4
4 files changed, 12 insertions, 4 deletions
diff --git a/archival/gunzip.c b/archival/gunzip.c
index db5f6ee55..ed4a3de36 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -87,7 +87,7 @@ extern int gunzip_main(int argc, char **argv)
87 if (strcmp(applet_name, "zcat") == 0) 87 if (strcmp(applet_name, "zcat") == 0)
88 flags |= gunzip_to_stdout; 88 flags |= gunzip_to_stdout;
89 89
90 while ((opt = getopt(argc, argv, "ctfhd")) != -1) { 90 while ((opt = getopt(argc, argv, "ctfhdq")) != -1) {
91 switch (opt) { 91 switch (opt) {
92 case 'c': 92 case 'c':
93 flags |= gunzip_to_stdout; 93 flags |= gunzip_to_stdout;
@@ -100,6 +100,8 @@ extern int gunzip_main(int argc, char **argv)
100 break; 100 break;
101 case 'd': /* Used to convert gzip to gunzip. */ 101 case 'd': /* Used to convert gzip to gunzip. */
102 break; 102 break;
103 case 'q':
104 error_msg("-q option not supported, ignored");
103 case 'h': 105 case 'h':
104 default: 106 default:
105 show_usage(); /* exit's inside usage */ 107 show_usage(); /* exit's inside usage */
diff --git a/archival/gzip.c b/archival/gzip.c
index 6d46926ee..c4c592729 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -1899,7 +1899,7 @@ int gzip_main(int argc, char **argv)
1899 int force = 0; 1899 int force = 0;
1900 int opt; 1900 int opt;
1901 1901
1902 while ((opt = getopt(argc, argv, "cf123456789d")) != -1) { 1902 while ((opt = getopt(argc, argv, "cf123456789dq")) != -1) {
1903 switch (opt) { 1903 switch (opt) {
1904 case 'c': 1904 case 'c':
1905 tostdout = 1; 1905 tostdout = 1;
@@ -1911,6 +1911,8 @@ int gzip_main(int argc, char **argv)
1911 case '1': case '2': case '3': case '4': case '5': 1911 case '1': case '2': case '3': case '4': case '5':
1912 case '6': case '7': case '8': case '9': 1912 case '6': case '7': case '8': case '9':
1913 break; 1913 break;
1914 case 'q':
1915 break;
1914#ifdef BB_GUNZIP 1916#ifdef BB_GUNZIP
1915 case 'd': 1917 case 'd':
1916 optind = 1; 1918 optind = 1;
diff --git a/gunzip.c b/gunzip.c
index db5f6ee55..ed4a3de36 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -87,7 +87,7 @@ extern int gunzip_main(int argc, char **argv)
87 if (strcmp(applet_name, "zcat") == 0) 87 if (strcmp(applet_name, "zcat") == 0)
88 flags |= gunzip_to_stdout; 88 flags |= gunzip_to_stdout;
89 89
90 while ((opt = getopt(argc, argv, "ctfhd")) != -1) { 90 while ((opt = getopt(argc, argv, "ctfhdq")) != -1) {
91 switch (opt) { 91 switch (opt) {
92 case 'c': 92 case 'c':
93 flags |= gunzip_to_stdout; 93 flags |= gunzip_to_stdout;
@@ -100,6 +100,8 @@ extern int gunzip_main(int argc, char **argv)
100 break; 100 break;
101 case 'd': /* Used to convert gzip to gunzip. */ 101 case 'd': /* Used to convert gzip to gunzip. */
102 break; 102 break;
103 case 'q':
104 error_msg("-q option not supported, ignored");
103 case 'h': 105 case 'h':
104 default: 106 default:
105 show_usage(); /* exit's inside usage */ 107 show_usage(); /* exit's inside usage */
diff --git a/gzip.c b/gzip.c
index 6d46926ee..c4c592729 100644
--- a/gzip.c
+++ b/gzip.c
@@ -1899,7 +1899,7 @@ int gzip_main(int argc, char **argv)
1899 int force = 0; 1899 int force = 0;
1900 int opt; 1900 int opt;
1901 1901
1902 while ((opt = getopt(argc, argv, "cf123456789d")) != -1) { 1902 while ((opt = getopt(argc, argv, "cf123456789dq")) != -1) {
1903 switch (opt) { 1903 switch (opt) {
1904 case 'c': 1904 case 'c':
1905 tostdout = 1; 1905 tostdout = 1;
@@ -1911,6 +1911,8 @@ int gzip_main(int argc, char **argv)
1911 case '1': case '2': case '3': case '4': case '5': 1911 case '1': case '2': case '3': case '4': case '5':
1912 case '6': case '7': case '8': case '9': 1912 case '6': case '7': case '8': case '9':
1913 break; 1913 break;
1914 case 'q':
1915 break;
1914#ifdef BB_GUNZIP 1916#ifdef BB_GUNZIP
1915 case 'd': 1917 case 'd':
1916 optind = 1; 1918 optind = 1;