Undo the basename() part of #7412 since the lib/basename
authorJarkko Hietaniemi <jhi@iki.fi>
Mon, 23 Oct 2000 12:39:52 +0000 (12:39 +0000)
committerJarkko Hietaniemi <jhi@iki.fi>
Mon, 23 Oct 2000 12:39:52 +0000 (12:39 +0000)
tests would need upgrading too.

p4raw-id: //depot/perl@7414

lib/File/Basename.pm

index 2795036..4581e7e 100644 (file)
@@ -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) ) {