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

Closes #675
This commit is contained in:
Karlson2k 2016-02-22 10:06:53 +03:00 committed by Daniel Stenberg
parent 4c5d5e5e55
commit 50129e6a96

View File

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