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 33d290a..35b9747 100644 (file)
--- a/usr/src/bin/csh/csh.c
+++ b/usr/src/bin/csh/csh.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)csh.c       4.20 (Berkeley) %G%";
+static char *sccsid = "@(#)csh.c       4.21 (Berkeley) %G%";

 #endif
 
 #include "sh.h"
 #endif
 
 #include "sh.h"


@@ -82,9 +82,7 @@ main(c, av)
                set1("path", saveblk(pathlist), &shvhed);
        else
                importpath(cp);
                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 << */
 
        doldol = putn(getpid());                /* For $$ */
        shtemp = strspl("/tmp/sh", doldol);     /* For << */