From 9cd30c20120888ce08276ed00a11e858e44ff3f4 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Sat, 22 Dec 2007 18:25:43 +0000 Subject: [PATCH] Use getcwd() to get the directory, which works even if one of the directory components doesn't have read permission set. --- tests/httpsserver.pl | 4 ++-- tests/runtests.pl | 4 ++-- tests/sshserver.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/httpsserver.pl b/tests/httpsserver.pl index 3cc6c1ea9..95ba10317 100644 --- a/tests/httpsserver.pl +++ b/tests/httpsserver.pl @@ -6,6 +6,7 @@ # It is actually just a layer that runs stunnel properly. use strict; +use Cwd; my $stunnel = "stunnel"; @@ -21,8 +22,7 @@ my $verbose=0; # set to 1 for debugging my $port = 8991; # just our default, weird enough my $target_port = 8999; # default test http-server port -my $path = `pwd`; -chomp $path; +my $path = getcwd(); my $srcdir=$path; diff --git a/tests/runtests.pl b/tests/runtests.pl index b1258d08f..9a7e14b9f 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -59,6 +59,7 @@ use strict; #use Time::HiRes qw( gettimeofday ); #use warnings; +use Cwd; @INC=(@INC, $ENV{'srcdir'}, "."); @@ -133,8 +134,7 @@ my $memdump="$LOGDIR/memdump"; # the path to the script that analyzes the memory debug output file: my $memanalyze="$perl $srcdir/memanalyze.pl"; -my $pwd; # current working directory -chomp($pwd = `pwd`); +my $pwd = getcwd(); # current working directory my $start; my $forkserver=0; diff --git a/tests/sshserver.pl b/tests/sshserver.pl index 8cad2248b..dafa60e24 100644 --- a/tests/sshserver.pl +++ b/tests/sshserver.pl @@ -11,6 +11,7 @@ use strict; use File::Spec; +use Cwd; my $verbose=1; # set to 1 for debugging my $showfiles=0; @@ -22,8 +23,7 @@ my $conffile="curl_sshd_config"; # sshd configuration data my $conffile_ssh="curl_ssh_config"; # ssh configuration data my $knownhostsfile="curl_client_knownhosts"; # ssh knownhosts file -my $path = `pwd`; -chomp $path; +my $path = getcwd(); my $exeext; if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys' || $^O eq 'dos' || $^O eq 'os2') {