X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCwd.pm;h=63a14fdcbc014a25b2b738b5caa17f9bb41f1fda;hb=2b57143f77d879f4dcd705a4df5013117f3a2929;hp=680fc3e56f47d754e0e2c2a7e58c35577f29cd06;hpb=5cf6da5fd103f762f75b820f16d955ab1ba6b47b;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/Cwd.pm b/lib/Cwd.pm index 680fc3e..63a14fd 100644 --- a/lib/Cwd.pm +++ b/lib/Cwd.pm @@ -188,8 +188,9 @@ $pwd_cmd ||= 'pwd'; # The 'natural and safe form' for UNIX (pwd may be setuid root) sub _backtick_pwd { my $cwd = `$pwd_cmd`; - # `pwd` may fail e.g. if the disk is full + # Belt-and-suspenders in case someone said "undef $/". local $/ = "\n"; + # `pwd` may fail e.g. if the disk is full chomp($cwd) if defined $cwd; $cwd; } @@ -465,12 +466,18 @@ sub _dos_cwd { } sub _qnx_cwd { + local $ENV{PATH} = ''; + local $ENV{CDPATH} = ''; + local $ENV{ENV} = ''; $ENV{'PWD'} = `/usr/bin/fullpath -t`; chop $ENV{'PWD'}; return $ENV{'PWD'}; } sub _qnx_abs_path { + local $ENV{PATH} = ''; + local $ENV{CDPATH} = ''; + local $ENV{ENV} = ''; my $path = @_ ? shift : '.'; my $realpath=`/usr/bin/fullpath -t $path`; chop $realpath;