[inseparable changes from match from perl-5.003_96 to perl-5.003_97]

[perl5.git] / lib / Cwd.pm

diff --git a/lib/Cwd.pm b/lib/Cwd.pm
index 2636fd2..f924a59 100644 (file)
--- a/lib/Cwd.pm
+++ b/lib/Cwd.pm
@@ -1,11 +1,6 @@
 package Cwd;
 require 5.000;
 require Exporter;
-require Config;
-
-# Use osname for portability switches (doubled to cheaply avoid -w warning)
-my $osname = $Config::Config{'osname'} || $Config::Config{'osname'};
-
 
 =head1 NAME
 
@@ -31,7 +26,7 @@ getcwd - get pathname of current working directory
 The getcwd() function re-implements the getcwd(3) (or getwd(3)) functions
 in Perl.
 
-The fastgetcwd() function looks the same as getcwd(), but runs faster.
+The fastcwd() function looks the same as getcwd(), but runs faster.
 It's also more dangerous because you might conceivably chdir() out of a
 directory that you can't chdir() back into.
 
@@ -43,13 +38,13 @@ the trailing line terminator). It is recommended that cwd (or another
 
 If you ask to override your chdir() built-in function, then your PWD
 environment variable will be kept up to date.  (See
-L<perlsub/Overriding builtin functions>.) Note that it will only be
-kept up to date it all packages which use chdir import it from Cwd.
+L<perlsub/Overriding Builtin Functions>.) Note that it will only be
+kept up to date if all packages which use chdir import it from Cwd.
 
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(cwd getcwd fastcwd);
+@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
 @EXPORT_OK = qw(chdir);
 
 # use strict;
@@ -113,7 +108,7 @@ sub getcwd
                }
                unless (@tst = lstat("$dotdots/$dir"))
                {
-                   warn "lstat($dotdots/$dir): $!";
+                   # warn "lstat($dotdots/$dir): $!";
                    # Just because you can't lstat this directory
                    # doesn't mean you'll never find the right one.
                    # closedir(PARENT);
@@ -126,7 +121,7 @@ sub getcwd
        $cwd = "$dir/$cwd";
        closedir(PARENT);
     } while ($dir);
-    chop($cwd); # drop the trailing /
+    chop($cwd) unless $cwd eq '/'; # drop the trailing /
     $cwd;
 }
 
@@ -177,7 +172,7 @@ sub fastcwd {
 my $chdir_init = 0;
 
 sub chdir_init {
-    if ($ENV{'PWD'} and $osname ne 'os2') {
+    if ($ENV{'PWD'} and $^O ne 'os2' and $^O ne 'msdos') {
        my($dd,$di) = stat('.');
        my($pd,$pi) = stat($ENV{'PWD'});
        if (!defined $dd or !defined $pd or $di != $pi or $dd != $pd) {
@@ -203,7 +198,7 @@ sub chdir {
     $newdir =~ s|///*|/|g;
     chdir_init() unless $chdir_init;
     return 0 unless CORE::chdir $newdir;
-    if ($osname eq 'VMS') { return $ENV{'PWD'} = $ENV{'DEFAULT'} }
+    if ($^O eq 'VMS') { return $ENV{'PWD'} = $ENV{'DEFAULT'} }
 
     if ($newdir =~ m#^/#) {
        $ENV{'PWD'} = $newdir;
@@ -225,21 +220,17 @@ sub chdir {
 # --- PORTING SECTION ---
 
 # VMS: $ENV{'DEFAULT'} points to default directory at all times
-# 08-Dec-1994  Charles Bailey  bailey@genetics.upenn.edu
-# Note: Use of Cwd::getcwd() or Cwd::chdir() (but not Cwd::fastcwd())
-#   causes the logical name PWD to be defined in the process 
-#   logical name table as the default device and directory 
+# 06-Mar-1996  Charles Bailey  bailey@genetics.upenn.edu
+# Note: Use of Cwd::chdir() causes the logical name PWD to be defined
+#   in the process logical name table as the default device and directory 
 #   seen by Perl. This may not be the same as the default device 
 #   and directory seen by DCL after Perl exits, since the effects
 #   the CRTL chdir() function persist only until Perl exits.
-# This does not apply to other systems (where only chdir() sets PWD).
 
 sub _vms_cwd {
     return $ENV{'DEFAULT'}
 }
-sub _vms_pwd {
-    return $ENV{'PWD'} = $ENV{'DEFAULT'}
-}
+
 sub _os2_cwd {
     $ENV{'PWD'} = `cmd /c cd`;
     chop $ENV{'PWD'};
@@ -247,22 +238,44 @@ sub _os2_cwd {
     return $ENV{'PWD'};
 }
 
-if ($osname eq 'VMS') {
+*_NT_cwd = \&_os2_cwd unless defined &_NT_cwd;
 
-    *cwd        = \&_vms_pwd;
-    *getcwd     = \&_vms_pwd;
-    *fastgetcwd = \&_vms_cwd;
+sub _msdos_cwd {
+    $ENV{'PWD'} = `command /c cd`;
+    chop $ENV{'PWD'};
+    $ENV{'PWD'} =~ s:\\:/:g ;
+    return $ENV{'PWD'};
 }
-elsif ($osname eq 'NT') {
 
-    *getcwd     = \&cwd;
-    *fastgetcwd = \&cwd;
-}
-elsif ($osname eq 'os2') {
-    *cwd     = \&_os2_cwd;
-    *getcwd     = \&_os2_cwd;
-    *fastgetcwd = \&_os2_cwd;
-    *fastcwd = \&_os2_cwd;
+{
+    local $^W = 0;     # assignments trigger 'subroutine redefined' warning
+
+    if ($^O eq 'VMS') {
+        *cwd        = \&_vms_cwd;
+        *getcwd     = \&_vms_cwd;
+        *fastcwd    = \&_vms_cwd;
+        *fastgetcwd = \&_vms_cwd;
+    }
+    elsif ($^O eq 'NT' or $^O eq 'MSWin32') {
+        # We assume that &_NT_cwd is defined as an XSUB or in the core.
+        *cwd        = \&_NT_cwd;
+        *getcwd     = \&_NT_cwd;
+        *fastcwd    = \&_NT_cwd;
+        *fastgetcwd = \&_NT_cwd;
+    }
+    elsif ($^O eq 'os2') {
+        # sys_cwd may keep the builtin command
+        *cwd    = defined &sys_cwd ? \&sys_cwd : \&_os2_cwd;
+        *getcwd         = defined &sys_cwd ? \&sys_cwd : \&_os2_cwd;
+        *fastgetcwd     = defined &sys_cwd ? \&sys_cwd : \&_os2_cwd;
+        *fastcwd        = defined &sys_cwd ? \&sys_cwd : \&_os2_cwd;
+    }
+    elsif ($^O eq 'msdos') {
+        *cwd     = \&_msdos_cwd;
+        *getcwd     = \&_msdos_cwd;
+        *fastgetcwd = \&_msdos_cwd;
+        *fastcwd = \&_msdos_cwd;
+    }
 }
 
 # package main; eval join('',<DATA>) || die $@;        # quick test