diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2015-10-17 18:43:23 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2015-10-17 18:43:23 +0000 |
| commit | 82b6401d0f574dcd8b94ed4dca99bb132584c524 (patch) | |
| tree | 3a00063758fabdbb0a4982b8682b96299833ee43 | |
| parent | 49628163b2edd8dc83096406209d7988fc051839 (diff) | |
Drop two useless defines.
ok nicm@
| -rw-r--r-- | bin/ksh/exec.c | 6 | ||||
| -rw-r--r-- | bin/ksh/sh.h | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/bin/ksh/exec.c b/bin/ksh/exec.c index 09f64af1b18..3f933ac55c2 100644 --- a/bin/ksh/exec.c +++ b/bin/ksh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.58 2015/10/17 18:26:24 mmcc Exp $ */ +/* $OpenBSD: exec.c,v 1.59 2015/10/17 18:43:22 mmcc Exp $ */ /* * execute command tree @@ -689,11 +689,11 @@ scriptexec(struct op *tp, char **ap) { char *shell; - shell = str_val(global(EXECSHELL_STR)); + shell = str_val(global("EXECSHELL")); if (shell && *shell) shell = search(shell, path, X_OK, NULL); if (!shell || !*shell) - shell = EXECSHELL; + shell = _PATH_BSHELL; *tp->args-- = tp->str; *tp->args = shell; diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h index 7d19db64202..208a4223345 100644 --- a/bin/ksh/sh.h +++ b/bin/ksh/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.38 2015/10/17 18:26:24 mmcc Exp $ */ +/* $OpenBSD: sh.h,v 1.39 2015/10/17 18:43:22 mmcc Exp $ */ /* * Public Domain Bourne/Korn shell @@ -37,9 +37,6 @@ # define EXTERN_DEFINED #endif -#define EXECSHELL _PATH_BSHELL -#define EXECSHELL_STR "EXECSHELL" - #define NELEM(a) (sizeof(a) / sizeof((a)[0])) #define sizeofN(type, n) (sizeof(type) * (n)) #define BIT(i) (1<<(i)) /* define bit in flag */ |