Updates from both Vladimir and Larry

[oweals/busybox.git] / gunzip.c

diff --git a/gunzip.c b/gunzip.c
index b4edb25ac19fb502fcf727919bf7673406c11b54..c39814de05218f4227242b693869d03efdeb514c 100644 (file)
--- a/gunzip.c
+++ b/gunzip.c
@@ -65,10 +65,6 @@ static char *license_msg[] = {
 #include <unistd.h>
 #include <getopt.h>
 #include "busybox.h"
-#define BB_DECLARE_EXTERN
-#define bb_need_memory_exhausted
-#define bb_need_name_too_long
-#include "messages.c"
 
 extern int gunzip_main(int argc, char **argv)
 {
@@ -91,7 +87,7 @@ extern int gunzip_main(int argc, char **argv)
        if (strcmp(applet_name, "zcat") == 0)
                flags |= gunzip_to_stdout;
 
-       while ((opt = getopt(argc, argv, "ctfhd")) != -1) {
+       while ((opt = getopt(argc, argv, "ctfhdq")) != -1) {
                switch (opt) {
                case 'c':
                        flags |= gunzip_to_stdout;
@@ -104,6 +100,9 @@ extern int gunzip_main(int argc, char **argv)
                        break;
                case 'd': /* Used to convert gzip to gunzip. */
                        break;
+               case 'q':
+                       error_msg("-q option not supported, ignored");
+                       break;
                case 'h':
                default:
                        show_usage(); /* exit's inside usage */
@@ -111,7 +110,7 @@ extern int gunzip_main(int argc, char **argv)
        }
 
        /* Set input filename and number */
-       if (argv[optind] == NULL) {
+       if (argv[optind] == NULL || strcmp(argv[optind], "-") == 0) {
                flags |= gunzip_to_stdout;
                in_file = stdin;
        } else {