mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-03 08:00:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle spaces in OpenSSL install location for MSVC

Browse Source 
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 2e8b6bfa90
commit ad7595b890
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

@ -132,7 +132,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

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