X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FFindBin.pm;h=0dbe5506203607b4d51a2722ade5bae9d1a45e62;hb=7b9ef14019d3c4d1aa14641dbd421c81c2cd18a4;hp=cd1871f54b2f2b799bf86ef451e57b8b3e241336;hpb=d5e6d479963de089122e954c00ec89b003ac06e4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/FindBin.pm b/lib/FindBin.pm index cd1871f..0dbe550 100644 --- a/lib/FindBin.pm +++ b/lib/FindBin.pm @@ -24,9 +24,9 @@ Locates the full path to the script bin directory to allow the use of paths relative to the bin directory. This allows a user to setup a directory tree for some software with -directories ErootE/bin and ErootE/lib and then the above example will allow -the use of modules in the lib directory without knowing where the software -tree is installed. +directories C<< /bin >> and C<< /lib >>, and then the above +example will allow the use of modules in the lib directory without knowing +where the software tree is installed. If perl is invoked using the B<-e> option or the perl script is read from C then FindBin sets both C<$Bin> and C<$RealBin> to the current @@ -39,15 +39,36 @@ directory. $RealBin - $Bin with all links resolved $RealScript - $Script with all links resolved +=head1 KNOWN ISSUES + +If there are two modules using C from different directories +under the same interpreter, this won't work. Since C uses a +C block, it'll be executed only once, and only the first caller +will get it right. This is a problem under mod_perl and other persistent +Perl environments, where you shouldn't use this module. Which also means +that you should avoid using C in modules that you plan to put +on CPAN. To make sure that C will work is to call the C +function: + + use FindBin; + FindBin::again(); # or FindBin->again; + +In former versions of FindBin there was no C function. The +workaround was to force the C block to be executed again: + + delete $INC{'FindBin.pm'}; + require FindBin; + =head1 KNOWN BUGS -if perl is invoked as +If perl is invoked as perl filename -and I does not have executable rights and a program called I -exists in the users C<$ENV{PATH}> which satisfies both B<-x> and B<-T> then FindBin -assumes that it was invoked via the C<$ENV{PATH}>. +and I does not have executable rights and a program called +I exists in the users C<$ENV{PATH}> which satisfies both B<-x> +and B<-T> then FindBin assumes that it was invoked via the +C<$ENV{PATH}>. Workaround is to invoke perl as @@ -55,7 +76,11 @@ Workaround is to invoke perl as =head1 AUTHORS -Graham Barr EFE +FindBin is supported as part of the core perl distribution. Please send bug +reports to EFE using the perlbug program +included with perl. + +Graham Barr EFE Nick Ing-Simmons EFE =head1 COPYRIGHT @@ -64,46 +89,32 @@ Copyright (c) 1995 Graham Barr & Nick Ing-Simmons. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. -=head1 REVISION - -$Revision: 1.4 $ - =cut package FindBin; use Carp; require 5.000; require Exporter; -use Cwd qw(getcwd abs_path); +use Cwd qw(getcwd cwd abs_path); use Config; use File::Basename; +use File::Spec; @EXPORT_OK = qw($Bin $Script $RealBin $RealScript $Dir $RealDir); %EXPORT_TAGS = (ALL => [qw($Bin $Script $RealBin $RealScript $Dir $RealDir)]); @ISA = qw(Exporter); -$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.41 $ =~ /(\d+)\.(\d+)/); +$VERSION = "1.47"; -sub is_abs_path -{ - local $_ = shift if (@_); - if ($^O eq 'MSWin32' || $^O eq 'dos') - { - return m#^([a-z]:[\\/]|\\\\)#i; - } - elsif ($^O eq 'VMS') - { - # If it's a logical name, expand it. - $_ = $ENV{$_} while /^[\w\$\-]+$/ and $ENV{$_}; - return m!^/! or m![<\[][^.\-\]>]! or /:[^<\[]/; - } - else - { - return m#^/#; - } +sub cwd2 { + my $cwd = getcwd(); + # getcwd might fail if it hasn't access to the current directory. + # try harder. + defined $cwd or $cwd = cwd(); + $cwd; } -BEGIN +sub init { *Dir = \$Bin; *RealDir = \$RealBin; @@ -111,9 +122,8 @@ BEGIN if($0 eq '-e' || $0 eq '-') { # perl invoked with -e or script is on C - $Script = $RealScript = $0; - $Bin = $RealBin = getcwd(); + $Bin = $RealBin = cwd2(); } else { @@ -121,23 +131,22 @@ BEGIN if ($^O eq 'VMS') { - ($Bin,$Script) = VMS::Filespec::rmsexpand($0) =~ /(.*\])(.*)/; + ($Bin,$Script) = VMS::Filespec::rmsexpand($0) =~ /(.*\])(.*)/s; ($RealBin,$RealScript) = ($Bin,$Script); } else { - my $IsWin32 = $^O eq 'MSWin32'; - unless(($script =~ m#/# || ($IsWin32 && $script =~ m#\\#)) + my $dosish = ($^O eq 'MSWin32' or $^O eq 'os2'); + unless(($script =~ m#/# || ($dosish && $script =~ m#\\#)) && -f $script) { my $dir; - my $pathvar = 'PATH'; - - foreach $dir (split(/$Config{'path_sep'}/,$ENV{$pathvar})) + foreach $dir (File::Spec->path) { - if(-r "$dir/$script" && (!$IsWin32 || -x _)) + my $scr = File::Spec->catfile($dir, $script); + if(-r $scr && (!$dosish || -x _)) { - $script = "$dir/$script"; + $script = $scr; if (-f $0) { @@ -158,9 +167,10 @@ BEGIN croak("Cannot find current script '$0'") unless(-f $script); - # Ensure $script contains the complete path incase we C + # Ensure $script contains the complete path in case we C - $script = getcwd() . "/" . $script unless is_abs_path($script); + $script = File::Spec->catfile(cwd2(), $script) + unless File::Spec->file_name_is_absolute($script); ($Script,$Bin) = fileparse($script); @@ -172,17 +182,24 @@ BEGIN ($RealScript,$RealBin) = fileparse($script); last unless defined $linktext; - $script = (is_abs_path($linktext)) + $script = (File::Spec->file_name_is_absolute($linktext)) ? $linktext - : $RealBin . "/" . $linktext; + : File::Spec->catfile($RealBin, $linktext); } # Get absolute paths to directories - $Bin = abs_path($Bin) if($Bin); + if ($Bin) { + my $BinOld = $Bin; + $Bin = abs_path($Bin); + defined $Bin or $Bin = File::Spec->canonpath($BinOld); + } $RealBin = abs_path($RealBin) if($RealBin); } } } -1; # Keep require happy +BEGIN { init } +*again = \&init; + +1; # Keep require happy