mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle spaces in OpenSSL install location for MSVC 

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.
This commit is contained in:
Andrew Dunstan 2019-10-04 15:34:40 -04:00
parent 8b77f783b7
commit 6ca51b1552
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/msvc/Project.pm
View File

@ -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 = '"' . $lib . """;
}

3
src/tools/msvc/Solution.pm
View File

@ -130,8 +130,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