X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fpwd.pl;h=beb591679e261072d8fb0bc80ee0ea6e9cc6cbfd;hb=a4f3eea9be6bcf3c1a2f99ac49d0585bf5fe8789;hp=c141e9888ee0f170e16bbe16144db03081f3415d;hpb=00bf170e31343ccc4fac7a63f6a3acf5e76c3616;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/pwd.pl b/lib/pwd.pl
index c141e98..beb5916 100644
--- a/lib/pwd.pl
+++ b/lib/pwd.pl
@@ -1,11 +1,8 @@
 ;# pwd.pl - keeps track of current working directory in PWD environment var
 ;#
-;# $Header: pwd.pl,v 3.0.1.1 90/08/09 04:01:24 lwall Locked $
+;# $RCSfile: pwd.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:11 $
 ;#
 ;# $Log:	pwd.pl,v $
-;# Revision 3.0.1.1  90/08/09  04:01:24  lwall
-;# patch19: Initial revision
-;# 
 ;#
 ;# Usage:
 ;#	require "pwd.pl";
@@ -19,13 +16,25 @@ sub main'initpwd {
     if ($ENV{'PWD'}) {
 	local($dd,$di) = stat('.');
 	local($pd,$pi) = stat($ENV{'PWD'});
-	return if $di == $pi && $dd == $pd;
+	if ($di != $pi || $dd != $pd) {
+	    chop($ENV{'PWD'} = `pwd`);
+	}
+    }
+    else {
+	chop($ENV{'PWD'} = `pwd`);
+    }
+    if ($ENV{'PWD'} =~ m|(/[^/]+(/[^/]+/[^/]+))(.*)|) {
+	local($pd,$pi) = stat($2);
+	local($dd,$di) = stat($1);
+	if ($di == $pi && $dd == $pd) {
+	    $ENV{'PWD'}="$2$3";
+	}
     }
-    chop($ENV{'PWD'} = `pwd`);
 }
 
 sub main'chdir {
     local($newdir) = shift;
+    $newdir =~ s|/{2,}|/|g;
     if (chdir $newdir) {
 	if ($newdir =~ m#^/#) {
 	    $ENV{'PWD'} = $newdir;
@@ -46,3 +55,4 @@ sub main'chdir {
     }
 }
 
+1;