diff options
Diffstat (limited to 'lib/File/Basename.pm')
-rw-r--r-- | lib/File/Basename.pm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm index 3ceb10e6c1..e4863f8911 100644 --- a/lib/File/Basename.pm +++ b/lib/File/Basename.pm @@ -162,7 +162,7 @@ sub fileparse { ($dirpath,$basename) = ($fullname =~ /^(.*[:>\]])?(.*)/); } } - if ($fstype =~ /^MSDOS/i) { + if ($fstype =~ /^MS(DOS|Win32)/i) { ($dirpath,$basename) = ($fullname =~ /^((?:.*[:\\\/])?)(.*)/); $dirpath .= '.\\' unless $dirpath =~ /[\\\/]$/; } @@ -173,10 +173,6 @@ sub fileparse { ($dirpath,$basename) = ($fullname =~ /(.*[:\/])?(.*)/); $dirpath = './' unless $dirpath; } - elsif ($fstype =~ /^MSWin32/i) { - ($dirpath,$basename) = ($fullname =~ /^(.*[:\\\/])?(.*)/); - $dirpath .= ".\\" unless $dirpath =~ /[\\\/]$/; - } elsif ($fstype !~ /^VMS/i) { # default to Unix ($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#); $dirpath = './' unless $dirpath; |