From: Richard Levitte <levitte@openssl.org>
Date: Sun, 31 Dec 2017 07:44:26 +0000 (+0100)
Subject: Add the possibility to do 'openssl help [command]'
X-Git-Tag: OpenSSL_1_1_1-pre1~232
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=da6be198f7ab690b8ace83f35502bca8dd9218e5;p=oweals%2Fopenssl.git

Add the possibility to do 'openssl help [command]'

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5002)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index dd7463edf3..4ab6be84b5 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -442,6 +442,8 @@ typedef enum HELP_CHOICE {
 } HELP_CHOICE;
 
 const OPTIONS help_options[] = {
+    {OPT_HELP_STR, 1, '-', "Usage: help [options]\n"},
+    {OPT_HELP_STR, 1, '-', "       help [command]\n"},
     {"help", OPT_hHELP, '-', "Display this summary"},
     {NULL}
 };
@@ -469,6 +471,14 @@ int help_main(int argc, char **argv)
         }
     }
 
+    if (opt_num_rest() == 1) {
+        char *new_argv[3];
+
+        new_argv[0] = opt_rest()[0];
+        new_argv[1] = "--help";
+        new_argv[2] = NULL;
+        return do_cmd(prog_init(), 2, new_argv);
+    }
     if (opt_num_rest() != 0) {
         BIO_printf(bio_err, "Usage: %s\n", prog);
         return 1;