From: Ben Laurie <ben@links.org>
Date: Wed, 30 Sep 2015 11:17:52 +0000 (+0100)
Subject: Display brief help if no options for list.
X-Git-Tag: OpenSSL_1_1_0-pre1~485
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19948ceab73d11217cf4df51e5b489aa487a2561;p=oweals%2Fopenssl.git

Display brief help if no options for list.

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 1c9ce13bd8..81a37629d1 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -493,11 +493,12 @@ int list_main(int argc, char **argv)
 {
     char *prog;
     HELPLIST_CHOICE o;
+    int done = 0;
 
     prog = opt_init(argc, argv, list_options);
     while ((o = opt_next()) != OPT_EOF) {
         switch (o) {
-        case OPT_EOF:
+        case OPT_EOF:  /* Never hit, but suppresses warning */
         case OPT_ERR:
             BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
             return 1;
@@ -526,6 +527,12 @@ int list_main(int argc, char **argv)
             list_disabled();
             break;
         }
+        done = 1;
+    }
+
+    if (!done) {
+        BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
+        return 1;
     }
 
     return 0;