Fri Jun 10 02:19:10 2011 UTC ()

Support $OLDPWD.  (christos@ will update the manual.)

Reviewd By:	christos


(uebayasi)

diff -r1.41 -r1.42 src/bin/sh/cd.c

--- src/bin/sh/cd.c 2011/02/17 15:13:49	1.41
+++ src/bin/sh/cd.c 2011/06/10 02:19:10	1.42

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cd.c,v 1.41 2011/02/17 15:13:49 pooka Exp $	*/
+/*	$NetBSD: cd.c,v 1.42 2011/06/10 02:19:10 uebayasi Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: cd.c,v 1.41 2011/02/17 15:13:49 pooka Exp $");
+__RCSID("$NetBSD: cd.c,v 1.42 2011/06/10 02:19:10 uebayasi Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 /*
  * The cd and pwd commands.
  */
 @@ -254,29 +254,30 @@ updatepwd(const char *dir)
 	/*
 	 * If our argument is NULL, we don't know the current directory
 	 * any more because we traversed a symbolic link or something
 	 * we couldn't stat().
 	 */
 	if (dir == NULL || curdir == NULL)  {
 		if (prevdir)
 			ckfree(prevdir);
 		INTOFF;
 		prevdir = curdir;
 		curdir = NULL;
 		getpwd(1);
 		INTON;
-		if (curdir)
+		if (curdir) {
 			setvar("OLDPWD", prevdir, VEXPORT);
 			setvar("PWD", curdir, VEXPORT);
-		else
+		} else
 			unsetvar("PWD", 0);
 		return;
+	}
 	cdcomppath = stalloc(strlen(dir) + 1);
 	scopy(dir, cdcomppath);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		p = curdir;
 		while (*p)
 			STPUTC(*p++, new);
 		if (p[-1] == '/')
 			STUNPUTC(new);
+	}
 @@ -287,26 +288,27 @@ updatepwd(const char *dir)
 			STPUTC('/', new);
 			while (*p)
 				STPUTC(*p++, new);
+		}
+	}
 	if (new == stackblock())
 		STPUTC('/', new);
 	STACKSTRNUL(new);
 	INTOFF;
 	if (prevdir)
 		ckfree(prevdir);
 	prevdir = curdir;
 	curdir = savestr(stackblock());
 	setvar("OLDPWD", prevdir, VEXPORT);
 	setvar("PWD", curdir, VEXPORT);
 	INTON;
+}
 /*
  * Posix says the default should be 'pwd -L' (as below), however
  * the 'cd' command (above) does something much nearer to the
  * posix 'cd -P' (not the posix default of 'cd -L').
  * If 'cd' is changed to support -P/L then the default here
  * needs to be revisited if the historic behaviour is to be kept.
  */
 int
 @@ -315,26 +317,27 @@ pwdcmd(int argc, char **argv)
 	int i;
 	char opt = 'L';
 	while ((i = nextopt("LP")) != '\0')
 		opt = i;
 	if (*argptr)
 		error("unexpected argument");
 	if (opt == 'L')
 		getpwd(0);
 	else
 		find_curdir(0);
 	setvar("OLDPWD", prevdir, VEXPORT);
 	setvar("PWD", curdir, VEXPORT);
 	out1str(curdir);
 	out1c('\n');
 	return 0;
+}
 void
 initpwd(void)
+{
 	getpwd(1);
 	if (curdir)