Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitad7595b

Browse files
committed
Handle spaces in OpenSSL install location for MSVC
First, make sure that the .exe name is quoted when trying to get theversion number. Also, don't quote the lib name for using in the projectfiles if it's already been quoted. This second change applies to alllibraries, not just OpenSSL.This has clearly been broken forever, so backpatch to all live branches.
1 parent2e8b6bf commitad7595b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

‎src/tools/msvc/Project.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ sub AddLibrary
132132
{
133133
my ($self,$lib,$dbgsuffix) =@_;
134134

135-
if ($lib =~m/\s/)
135+
# quote lib name if it has spaces and isn't already quoted
136+
if ($lib =~m/\s/ &&$lib !~m/^[&]quot;/)
136137
{
137138
$lib ='"' .$lib .""";
138139
}

‎src/tools/msvc/Solution.pm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,9 @@ sub GetOpenSSLVersion
125125

126126
# Attempt to get OpenSSL version and location. This assumes that
127127
# openssl.exe is in the specified directory.
128+
# Quote the .exe name in case it has spaces
128129
my$opensslcmd =
129-
$self->{options}->{openssl} ."\\bin\\openssl.exe version 2>&1";
130+
qq("$self->{options}->{openssl}\\bin\\openssl.exe" version 2>&1);
130131
my$sslout =`$opensslcmd`;
131132

132133
$? >> 8 == 0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp