X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FPod%2FFind.pm;h=c1aaac47ab708b600f875d6b64b492c5e86b43e1;hb=be0036e4fe8f594c35442537fa361e9306bb2431;hp=516a624fce5077a71bce18bf9a7febd0a3e18aa5;hpb=16be52b8fb809cc375006ad8517483286dc5be74;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/Pod/Find.pm b/lib/Pod/Find.pm index 516a624..c1aaac4 100644 --- a/lib/Pod/Find.pm +++ b/lib/Pod/Find.pm @@ -13,7 +13,7 @@ package Pod::Find; use vars qw($VERSION); -$VERSION = 0.21; ## Current version of this package +$VERSION = 0.22; ## Current version of this package require 5.005; ## requires this Perl version or later use Carp; @@ -145,7 +145,7 @@ sub pod_find # * remove e.g. 5.00503 # * remove pod/ if followed by *.pod (e.g. in pod/perlfunc.pod) $SIMPLIFY_RX = - qq!^(?i:site_perl/|\Q$Config::Config{archname}\E/|\\d+\\.\\d+([_.]?\\d+)?/|pod/(?=.*?\\.pod\\z))*!; + qq!^(?i:site(_perl)?/|\Q$Config::Config{archname}\E/|\\d+\\.\\d+([_.]?\\d+)?/|pod/(?=.*?\\.pod\\z))*!; } @@ -163,6 +163,7 @@ sub pod_find # on VMS canonpath will vmsify:[the.path], but File::Find::find # wants /unixy/paths $try = File::Spec->canonpath($try) if ($^O ne 'VMS'); + $try = VMS::Filespec::unixify($try) if ($^O eq 'VMS'); my $name; if(-f $try) { if($name = _check_and_extract_name($try, $opts{-verbose})) { @@ -242,7 +243,7 @@ sub _check_and_extract_name { The function B is equivalent to B, but also strips Perl-like extensions (.pm, .pl, .pod) and extensions like -F<.bat>, F<.cmd> on Win32 and OS/2, respectively. +F<.bat>, F<.cmd> on Win32 and OS/2, or F<.com> on VMS, respectively. =cut @@ -261,7 +262,9 @@ sub _simplify { # strip Perl's own extensions $_[0] =~ s/\.(pod|pm|plx?)\z//i; # strip meaningless extensions on Win32 and OS/2 - $_[0] =~ s/\.(bat|exe|cmd)\z//i if($^O =~ /win|os2/i); + $_[0] =~ s/\.(bat|exe|cmd)\z//i if($^O =~ /mswin|os2/i); + # strip meaningless extensions on VMS + $_[0] =~ s/\.(com)\z//i if($^O eq 'VMS'); } # contribution from Tim Jenness