Updates from both Vladimir and Larry

[oweals/busybox.git] / gunzip.c

diff --git a/gunzip.c b/gunzip.c
index db5f6ee556dbb79a5cf8666c94ea68e700d34c88..c39814de05218f4227242b693869d03efdeb514c 100644 (file)
--- a/gunzip.c
+++ b/gunzip.c
@@ -87,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;
@@ -100,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 */
@@ -107,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 {