[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  00701e5ea84861b74d9d624f21a6b3fcb12e8acd (commit)
      from  8eb399fb25a6ef68b2a9e8d34b242b9767c46abe (commit)


- Log -----------------------------------------------------------------
commit 00701e5ea84861b74d9d624f21a6b3fcb12e8acd
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 28 14:46:27 2018 +0200

    Revert "util/dofile.pl: only quote stuff that actually needs quoting"
    
    This wasn't a good solution, too many things depend on the quotes being
    there consistently.
    
    This reverts commit 49cd47eaababc8c57871b929080fc1357e2ad7b8.
    
    Fixes #5772
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5773)

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

Summary of changes:
 util/dofile.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/dofile.pl b/util/dofile.pl
index 955224d..b0e2068 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -99,9 +99,9 @@ package main;
 # This adds quotes (") around the given string, and escapes any $, @, \,
 # " and ' by prepending a \ to them.
 sub quotify1 {
-    my $s = my $orig = shift @_;
+    my $s = shift @_;
     $s =~ s/([\$\@\\"'])/\\$1/g;
-    $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
+    '"'.$s.'"';
 }
 
 # quotify_l LIST