From: Richard Levitte <levitte@openssl.org>
Date: Wed, 28 Mar 2018 12:46:27 +0000 (+0200)
Subject: Revert "util/dofile.pl: only quote stuff that actually needs quoting"
X-Git-Tag: OpenSSL_1_1_1-pre4~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00701e5ea84861b74d9d624f21a6b3fcb12e8acd;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5773)
---

diff --git a/util/dofile.pl b/util/dofile.pl
index 955224df7d..b0e20681dd 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