From: Dan Kegel <dank@kegel.com>
Date: Wed, 10 Jun 2020 15:40:34 +0000 (-0700)
Subject: minigzip.c: bring back default bahavior, use distinguishable error code on bad cmdline
X-Git-Tag: 1.9.9-b1~214
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8bc9ebf01d29f60f7675852aec5651111bcb697;p=thirdparty%2Fzlib-ng.git

minigzip.c: bring back default bahavior, use distinguishable error code on bad cmdline

Fixes #635
---

diff --git a/test/minigzip.c b/test/minigzip.c
index d75c317f..a7047a73 100644
--- a/test/minigzip.c
+++ b/test/minigzip.c
@@ -275,11 +275,6 @@ int main(int argc, char *argv[]) {
     char *level = "6";
     char *type = "b";
 
-    if ((argc == 1) || (argc == 2 && strcmp(argv[1], "--help") == 0)) {
-        show_help();
-        return 0;
-    }
-
     prog = argv[i];
     bname = strrchr(argv[i], '/');
     if (bname)
@@ -306,8 +301,15 @@ int main(int argc, char *argv[]) {
             strategy = argv[i] + 1;
         else if (argv[i][0] == '-' && argv[i][1] >= '0' && argv[i][1] <= '9' && argv[i][2] == 0)
             level = argv[i] + 1;
-        else
+        else if (strcmp(argv[i], "--help") == 0) {
+            show_help();
+            return 0;
+        } else if (argv[i][0] == '-') {
+            show_help();
+            return 64;   /* EX_USAGE */
+        } else {
             break;
+        }
     }
 
     snprintf(outmode, sizeof(outmode), "w%s%s%s", type, strategy, level);