From: Richard Levitte <levitte@openssl.org>
Date: Tue, 6 Mar 2018 20:05:16 +0000 (+0100)
Subject: util/dofile.pl: only quote stuff that actually needs quoting
X-Git-Tag: OpenSSL_1_1_1-pre3~177
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49cd47eaababc8c57871b929080fc1357e2ad7b8;p=oweals%2Fopenssl.git

util/dofile.pl: only quote stuff that actually needs quoting

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

diff --git a/util/dofile.pl b/util/dofile.pl
index 0f2e8f0b53..2ea54e3099 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 = shift @_;
+    my $s = my $orig = shift @_;
     $s =~ s/([\$\@\\"'])/\\$1/g;
-    '"'.$s.'"';
+    $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
 }
 
 # quotify_l LIST