diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-10-23 12:39:52 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-10-23 12:39:52 +0000 |
| commit | 61c85163db9a7831d8b654984e5e5d55ad75124d (patch) | |
| tree | eaf4b9a8b53cea5da42c62794502a485be547bd4 /lib | |
| parent | ae1d639420c89b56841c04313f3b89c84e8ea279 (diff) | |
| download | perl-61c85163db9a7831d8b654984e5e5d55ad75124d.tar.gz | |
Undo the basename() part of #7412 since the lib/basename
tests would need upgrading too.
p4raw-id: //depot/perl@7414
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/File/Basename.pm | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm index 279503680a..4581e7e93c 100644 --- a/lib/File/Basename.pm +++ b/lib/File/Basename.pm @@ -236,14 +236,7 @@ sub dirname { if ($_[0] =~ m#/#) { $fstype = '' } else { return $dirname || $ENV{DEFAULT} } } - if ($fstype =~ /MacOS/i) { - $dirname =~ s/([^:]):\z/$1/s; - unless( length($basename) ) { - local($File::Basename::Fileparse_fstype) = $fstype; - ($basename,$dirname) = fileparse $dirname; - $dirname =~ s/([^:]):\z/$1/s; - } - } + if ($fstype =~ /MacOS/i) { return $dirname } elsif ($fstype =~ /MSDOS/i) { $dirname =~ s/([^:])[\\\/]*\z/$1/; unless( length($basename) ) { |