From: Karlson2k <k2k@narod.ru>
Date: Mon, 22 Feb 2016 07:06:53 +0000 (+0300)
Subject: tests: Use 'pathhelp' for paths conversions in secureserver.pl
X-Git-Tag: curl-7_49_0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50129e6a964612e682ba0d240b232617bf617be3;p=thirdparty%2Fcurl.git

tests: Use 'pathhelp' for paths conversions in secureserver.pl

Closes #675
---

diff --git a/tests/secureserver.pl b/tests/secureserver.pl
index c770fa5a75..3a7443c403 100755
--- a/tests/secureserver.pl
+++ b/tests/secureserver.pl
@@ -40,6 +40,8 @@ use serverhelp qw(
     server_logfilename
     );
 
+use pathhelp;
+
 my $stunnel = "stunnel";
 
 my $verbose=0; # set to 1 for debugging
@@ -229,9 +231,9 @@ if($stunnel_version < 310) {
 if($stunnel =~ /tstunnel(\.exe)?"?$/) {
     $tstunnel_windows = 1;
 
-    # replace Cygwin and MinGW drives within paths
-    $capath =~ s/^(\/cygdrive)?\/(\w)\//$2\:\//;
-    $certfile =~ s/^(\/cygdrive)?\/(\w)\//$2\:\//;
+    # convert Cygwin/MinGW paths to Win32 format
+    $capath = pathhelp::sys_native_abs_path($capath);
+    $certfile = pathhelp::sys_native_abs_path($certfile);
 }
 
 #***************************************************************************