Commit d615c80a authored by Richard Levitte's avatar Richard Levitte Committed by Matt Caswell
Browse files

OpenSSL::Test::quotify: put quotes around empty arguments 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5396)

(cherry picked from commit 5845f7de)
parent ed130645

util/perl/OpenSSL/Test.pm

+4 −3
Original line number Diff line number Diff line
@@ -667,12 +667,13 @@ I<This must never ever be done on VMS.> 
sub quotify {

    # Unix setup (default if nothing else is mentioned)

    my $arg_formatter =

	sub { $_ = shift; /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/ ? "'$_'" : $_ };

	sub { $_ = shift;

	      ($_ eq '' || /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/) ? "'$_'" : $_ };



    if ( $^O eq "VMS") {	# VMS setup

	$arg_formatter = sub {

	    $_ = shift;

	    if (/\s|["[:upper:]]/) {

	    if ($_ eq '' || /\s|["[:upper:]]/) {

		s/"/""/g;

		'"'.$_.'"';

	    } else {
@@ -682,7 +683,7 @@ sub quotify { 
    } elsif ( $^O eq "MSWin32") { # MSWin setup

	$arg_formatter = sub {

	    $_ = shift;

	    if (/\s|["\|\&\*\;<>]/) {

	    if ($_ eq '' || /\s|["\|\&\*\;<>]/) {

		s/(["\\])/\\$1/g;

		'"'.$_.'"';

	    } else {