From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 23 Oct 2000 12:39:52 +0000 (+0000)
Subject: Undo the basename() part of #7412 since the lib/basename
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=61c85163db9a7831d8b654984e5e5d55ad75124d;p=p5sagit%2Fp5-mst-13.2.git

Undo the basename() part of #7412 since the lib/basename
tests would need upgrading too.

p4raw-id: //depot/perl@7414
---

diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm
index 2795036..4581e7e 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) ) {