From: Jarkko Hietaniemi Date: Wed, 10 Oct 2001 15:53:39 +0000 (+0000) Subject: VMS: reorder the elimination of 000000 in the canonpath logic, X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bcd0738c9a444b4576eed7823f5bfdff557d5a51;p=p5sagit%2Fp5-mst-13.2.git VMS: reorder the elimination of 000000 in the canonpath logic, from Charles Lane. p4raw-id: //depot/perl@12393 --- diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm index e51286b..184c827 100644 --- a/lib/File/Spec/VMS.pm +++ b/lib/File/Spec/VMS.pm @@ -156,9 +156,9 @@ sub canonpath { else { return vmsify($path); } } else { + $path =~ s/([\[<])000000\./$1/g; # [000000.foo ==> [foo + $path =~ s/([^-]+)\.000000([\]\>])/$1$2/g; # foo.000000] ==> foo] $path =~ s-\]\[--g; $path =~ s/> foo.bar - $path =~ s/([\[<])000000\./$1/; # [000000.foo ==> [foo - $path =~ s/([^-]+)\.000000([\]\>])/$1$2/; # foo.000000] ==> foo] 1 while $path =~ s{([\[<-])\.-}{$1-}; # [.-.- ==> [-- $path =~ s/\.[^\[<\.]+\.-([\]\>])/$1/; # bar.foo.-] ==> bar] $path =~ s/([\[<])(-+)/$1 . "\cx" x length($2)/e; # encode leading '-'s