summaryrefslogtreecommitdiff
path: root/tests/sshhelp.pm
diff options
context:
space:
mode:
authorMarc Hoersken <info@marc-hoersken.de>2014-12-21 02:42:29 +0100
committerMarc Hoersken <info@marc-hoersken.de>2014-12-21 03:52:36 +0100
commit011488945600f6ddc53d2a8d2c6c3c1122e8d7fb (patch)
tree75462eaaceecc25915454ff1bddf68040d7d9a7c /tests/sshhelp.pm
parent2c7f099253a582545d06fc6b3a4ff017d09c30a9 (diff)
downloadcurl-011488945600f6ddc53d2a8d2c6c3c1122e8d7fb.tar.gz
tests: support spaces in paths to SSH, SSHD and SFTP binaries
First patch to enable Windows support using Cygwin-based OpenSSH.
Diffstat (limited to 'tests/sshhelp.pm')
-rw-r--r--tests/sshhelp.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/sshhelp.pm b/tests/sshhelp.pm
index ced9a01d1..914879b4c 100644
--- a/tests/sshhelp.pm
+++ b/tests/sshhelp.pm
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -417,7 +417,7 @@ sub sshversioninfo {
$error = "Error: cannot read or execute $sshbin";
}
else {
- my $cmd = ($sshbin =~ /$sshdexe$/) ? "$sshbin -?" : "$sshbin -V";
+ my $cmd = ($sshbin =~ /$sshdexe$/) ? "\"$sshbin\" -?" : "\"$sshbin\" -V";
$error = "$cmd\n";
foreach my $tmpstr (qx($cmd 2>&1)) {
if($tmpstr =~ /OpenSSH[_-](\d+)\.(\d+)(\.(\d+))*/i) {