From: Richard Levitte <levitte@openssl.org>
Date: Wed, 24 Jun 2020 11:16:30 +0000 (+0200)
Subject: apps/openssl: clean-up of unused fallback code
X-Git-Tag: openssl-3.0.0-alpha5~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96e0445195e22f27c661ca4cd57c1caa52b6abb4;p=thirdparty%2Fopenssl.git

apps/openssl: clean-up of unused fallback code

Remove code in help_main() that duplicates the case when 'openssl' is
called with no arguments, which is now handled in main().

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/12295)
---

diff --git a/apps/openssl.c b/apps/openssl.c
index 3593c2b9f24..a1b4443e4b2 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -312,12 +312,6 @@ int help_main(int argc, char **argv)
     DISPLAY_COLUMNS dc;
     char *new_argv[3];
 
-    if (argc == 0) {
-        new_argv[0] = "help";
-        new_argv[1] = NULL;
-        return do_cmd(prog_init(), 1, new_argv);
-    }
-
     prog = opt_init(argc, argv, help_options);
     while ((o = opt_next()) != OPT_hEOF) {
         switch (o) {