Handle spaces in OpenSSL install location for MSVC

adunstan · adunstan · commit 62d2caed6234 · 2019-10-04T15:39:12.000-04:00
First, make sure that the .exe name is quoted when trying to get the
version number. Also, don't quote the lib name for using in the project
files if it's already been quoted. This second change applies to all
libraries, not just OpenSSL.

This has clearly been broken forever, so backpatch to all live branches.
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
@@ -126,7 +126,8 @@ sub AddLibrary
 {
 	my ($self, $lib, $dbgsuffix) = @_;
 
-	if ($lib =~ m/\s/)
+	# quote lib name if it has spaces and isn't already quoted
+	if ($lib =~ m/\s/ && $lib !~ m/^[&]quot;/)
 	{
 		$lib = '&quot;' . $lib . "&quot;";
 	}
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -124,8 +124,9 @@ sub GetOpenSSLVersion
 
 	# Attempt to get OpenSSL version and location.  This assumes that
 	# openssl.exe is in the specified directory.
+	# Quote the .exe name in case it has spaces
 	my $opensslcmd =
-	  $self->{options}->{openssl} . "\\bin\\openssl.exe version 2>&1";
+	  qq("$self->{options}->{openssl}\\bin\\openssl.exe" version 2>&1);
 	my $sslout = `$opensslcmd`;
 
 	$? >> 8 == 0

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,8 @@ sub AddLibrary`
`126`	`126`	`{`
`127`	`127`	`my ($self, $lib, $dbgsuffix) = @_;`
`128`	`128`
`129`		`- if ($lib =~ m/\s/)`
	`129`	`+ # quote lib name if it has spaces and isn't already quoted`
	`130`	`+ if ($lib =~ m/\s/ && $lib !~ m/^[&]quot;/)`
`130`	`131`	`{`
`131`	`132`	`$lib = '"' . $lib . """;`
`132`	`133`	`}`