summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCharles Bailey <bailey@newman.upenn.edu>2000-03-17 04:23:35 +0000
committerbailey <bailey@newman.upenn.edu>2000-03-17 04:23:35 +0000
commit099f76bb8eab859fbb7b90260152c1ead1bf3022 (patch)
tree8dd2fd905ee115fcb3481a9fadcca05a3992a85a /lib
parentaaace9be53f792ed8e6d12b1ab7005b74f5d5d26 (diff)
downloadperl-099f76bb8eab859fbb7b90260152c1ead1bf3022.tar.gz
Quick pre-release fixes: clean up results in File::Spec::VMS and
switch dir test order in taint.t to accomodate DECCRTL extension. p4raw-id: //depot/vmsperl@5778
Diffstat (limited to 'lib')
-rw-r--r--lib/File/Spec/VMS.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
index 28c1050576..a2ac8cac0b 100644
--- a/lib/File/Spec/VMS.pm
+++ b/lib/File/Spec/VMS.pm
@@ -144,7 +144,7 @@ sub canonpath {
else {
$path =~ s-\]\[--g; $path =~ s/><//g; # foo.][bar ==> foo.bar
$path =~ s/([\[<])000000\./$1/; # [000000.foo ==> foo
- 1 while $path =~ s{-\.-}{--}; # -.- ==> --
+ 1 while $path =~ s{([\[<-])\.-}{$1-}; # [.-.- ==> [--
$path =~ s/\.[^\[<\.]+\.-([\]\>])/$1/; # bar.foo.-] ==> bar]
$path =~ s/([\[<])(-+)/$1 . "\cx" x length($2)/e; # encode leading '-'s
$path =~ s/([\[<\.])([^\[<\.\cx]+)\.-\.?/$1/g; # bar.-.foo ==> foo
@@ -184,7 +184,7 @@ sub catdir {
elsif ($dir =~ /^\$\([^\)]+\)\z/s) { $rslt = $dir; }
else { $rslt = vmspath($dir); }
}
- return $rslt;
+ return $self->canonpath($rslt);
}
=item catfile
@@ -212,7 +212,7 @@ sub catfile {
}
}
else { $rslt = (defined($file) && length($file)) ? vmsify($file) : ''; }
- return $rslt;
+ return $self->canonpath($rslt);
}