[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1c9c243509d017244764545dc01e40d962423bbb (commit)
      from  373dc6e196835c06f31ff34cd188471f296126c1 (commit)


- Log -----------------------------------------------------------------
commit 1c9c243509d017244764545dc01e40d962423bbb
Author: Rich Salz <rsalz at akamai.com>
Date:   Mon Sep 7 09:42:05 2015 -0400

    Restore the old interactive prompt.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/openssl.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index d01731f..1c9ce13 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -329,17 +329,6 @@ int main(int argc, char *argv[])
     }
 
     apps_startup();
-
-    /*
-     * If first argument is a colon, skip it.  Because in "interactive"
-     * mode our prompt is a colon and we can cut/paste whole lines
-     * by doing this hack.
-     */
-    if (argv[1] && strcmp(argv[1], ":") == 0) {
-        argv[1] = argv[0];
-        argc--;
-        argv++;
-    }
     prog = prog_init();
     pname = opt_progname(argv[0]);
 
@@ -367,7 +356,7 @@ int main(int argc, char *argv[])
         ret = 0;
         /* Read a line, continue reading if line ends with \ */
         for (p = buf, n = sizeof buf, i = 0, first = 1; n > 0; first = 0) {
-            prompt = first ? "openssl : " : "> ";
+            prompt = first ? "OpenSSL> " : "> ";
             p[0] = '\0';
 #ifndef READLINE
             fputs(prompt, stdout);