From: Edward Wang <edward@ucbvax.Berkeley.EDU>
Date: Thu, 17 Jan 1985 02:29:03 +0000 (-0800)
Subject: can't use environ SHELL as variable shell
X-Git-Tag: BSD-4_3-Snapshot-Development~9020
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/ccf0e0f5ff8e2fcd6b311ffee73494493fe8df40

can't use environ SHELL as variable shell

SCCS-vsn: bin/csh/csh.c 4.21
---

diff --git a/usr/src/bin/csh/csh.c b/usr/src/bin/csh/csh.c
index 33d290a9fd..35b974711e 100644
--- a/usr/src/bin/csh/csh.c
+++ b/usr/src/bin/csh/csh.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static	char *sccsid = "@(#)csh.c	4.20 (Berkeley) %G%";
+static	char *sccsid = "@(#)csh.c	4.21 (Berkeley) %G%";
 #endif
 
 #include "sh.h"
@@ -82,9 +82,7 @@ main(c, av)
 		set1("path", saveblk(pathlist), &shvhed);
 	else
 		importpath(cp);
-	if ((cp = getenv("SHELL")) == NOSTR)
-		cp = SHELLPATH;
-	set("shell", savestr(cp));
+	set("shell", SHELLPATH);
 
 	doldol = putn(getpid());		/* For $$ */
 	shtemp = strspl("/tmp/sh", doldol);	/* For << */