diff options
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/cron/at.c | 7 | ||||
| -rw-r--r-- | usr/src/cmd/ed/ed.c | 19 |
2 files changed, 5 insertions, 21 deletions
diff --git a/usr/src/cmd/cron/at.c b/usr/src/cmd/cron/at.c index c441b019e6..d6730beec5 100644 --- a/usr/src/cmd/cron/at.c +++ b/usr/src/cmd/cron/at.c @@ -48,6 +48,7 @@ #include <libintl.h> #include <tzfile.h> #include <project.h> +#include <paths.h> #include "cron.h" @@ -606,11 +607,7 @@ copy(char *jobfile, FILE *inputfile, int when) ulimit_flag = 1; } else { /* SHELL is NULL or unset, therefore use default */ -#ifdef XPG4 - Shell = shell = "/usr/xpg4/bin/sh"; -#else - Shell = shell = "/bin/sh"; -#endif /* XPG4 */ + Shell = shell = _PATH_BSHELL; ulimit_flag = 1; } diff --git a/usr/src/cmd/ed/ed.c b/usr/src/cmd/ed/ed.c index 06dde94ba2..e8a12eea0c 100644 --- a/usr/src/cmd/ed/ed.c +++ b/usr/src/cmd/ed/ed.c @@ -39,6 +39,7 @@ #include <regexpr.h> #include <regex.h> #include <errno.h> +#include <paths.h> static const char *msgtab[] = { @@ -263,8 +264,6 @@ static int save28 = 0; /* Flag whether buffer empty at start of read */ static long savtime; static char *name = "SHELL"; static char *rshell = "/usr/lib/rsh"; -static char *shpath; /* pointer to correct shell for execution */ - /* of execlp() */ static char *val; static char *home; static int nodelim; @@ -1581,13 +1580,7 @@ unixcom(void) signal(SIGHUP, oldhup); signal(SIGQUIT, oldquit); close(tfile); - if (__xpg4 == 0) { /* not XPG4 */ - shpath = "/usr/bin/sh"; - } else { - /* XPG4 */ - shpath = "/usr/xpg4/bin/sh"; - } - execlp((const char *)shpath, "sh", "-c", curcmd, (char *)0); + execlp(_PATH_BSHELL, "sh", "-c", curcmd, (char *)0); exit(0100); } savint = signal(SIGINT, SIG_IGN); @@ -2697,13 +2690,7 @@ xerr: (void) error(0); close(w_or_r(0, 1)); dup(w_or_r(pf[0], pf[1])); close(w_or_r(pf[0], pf[1])); - if (__xpg4 == 0) { /* not XPG4 */ - shpath = "/usr/bin/sh"; - } else { - /* XPG4 */ - shpath = "/usr/xpg4/bin/sh"; - } - execlp((const char *)shpath, "sh", "-c", string, (char *)0); + execlp(_PATH_BSHELL, "sh", "-c", string, (char *)0); exit(1); } if (i == (pid_t)-1) |