diff options
| -rw-r--r-- | bin/csh/csh.c | 12 | ||||
| -rw-r--r-- | bin/csh/csh.h | 4 | ||||
| -rw-r--r-- | bin/csh/exec.c | 6 |
3 files changed, 3 insertions, 19 deletions
diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 4839de79306..4d9001a47dd 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.34 2015/10/26 22:03:06 naddy Exp $ */ +/* $OpenBSD: csh.c,v 1.35 2015/10/28 22:18:53 naddy Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -109,12 +109,8 @@ main(int argc, char *argv[]) /* * Initialize non constant strings */ -#ifdef _PATH_BSHELL STR_BSHELL = SAVE(_PATH_BSHELL); -#endif -#ifdef _PATH_CSHELL STR_SHELLPATH = SAVE(_PATH_CSHELL); -#endif STR_environ = blk2short(environ); environ = short2blk(STR_environ); /* So that we can free it */ STR_WORD_CHARS = SAVE(WORD_CHARS); @@ -499,15 +495,11 @@ notty: setintr = 0; parintr = SIG_IGN; /* Disable onintr */ -#ifdef _PATH_DOTCSHRC (void) srcfile(_PATH_DOTCSHRC, 0, 0); -#endif if (!fast && !arginp && !onelflg) dohash(NULL, NULL); -#ifdef _PATH_DOTLOGIN if (loginsh) (void) srcfile(_PATH_DOTLOGIN, 0, 0); -#endif sigprocmask(SIG_SETMASK, &osigset, NULL); setintr = osetintr; parintr = oparintr; @@ -806,9 +798,7 @@ goodbye(void) setintr = 0; /* No interrupts after "logout" */ if (!(adrof(STRlogout))) set(STRlogout, STRnormal); -#ifdef _PATH_DOTLOGOUT (void) srcfile(_PATH_DOTLOGOUT, 0, 0); -#endif if (adrof(STRhome)) (void) srccat(value(STRhome), STRsldtlogout); } diff --git a/bin/csh/csh.h b/bin/csh/csh.h index e80c9701078..b928c8871c3 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.h,v 1.26 2015/10/26 21:57:42 naddy Exp $ */ +/* $OpenBSD: csh.h,v 1.27 2015/10/28 22:18:53 naddy Exp $ */ /* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */ /*- @@ -478,8 +478,6 @@ Char *word_chars; Char *STR_SHELLPATH; #include <paths.h> -#ifdef _PATH_BSHELL Char *STR_BSHELL; -#endif Char *STR_WORD_CHARS; Char **STR_environ; diff --git a/bin/csh/exec.c b/bin/csh/exec.c index 37074e099e5..f9436f1433d 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.17 2015/02/08 05:51:37 tedu Exp $ */ +/* $OpenBSD: exec.c,v 1.18 2015/10/28 22:18:53 naddy Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -288,10 +288,8 @@ texec(Char *sf, Char **st) stderror(ERR_ARCH, f, strerror(errno)); } } -#ifdef _PATH_BSHELL else c = '#'; -#endif (void) close(fd); } /* @@ -304,10 +302,8 @@ texec(Char *sf, Char **st) vp = lastsh; vp[0] = adrof(STRshell) ? value(STRshell) : STR_SHELLPATH; vp[1] = NULL; -#ifdef _PATH_BSHELL if (fd != -1 && c != '#') vp[0] = STR_BSHELL; -#endif } else vp = v->vec; |