From 1c7ddb37901fc37ef4e9ee39da9ce4ecbbab096d Mon Sep 17 00:00:00 2001 From: "Roger A. Faulkner" Date: Mon, 10 Nov 2008 18:56:48 -0800 Subject: 6597729 RFE: Alternative ksh93 version of libc::wordexp() should use posix_spawn() Contributed by Roland Mainz --- usr/src/lib/libc/port/regex/wordexp.c | 277 +++++++++++++++++++++------------- 1 file changed, 170 insertions(+), 107 deletions(-) (limited to 'usr/src/lib/libc/port/regex') diff --git a/usr/src/lib/libc/port/regex/wordexp.c b/usr/src/lib/libc/port/regex/wordexp.c index 9c834b2b54..cbf9295fdb 100644 --- a/usr/src/lib/libc/port/regex/wordexp.c +++ b/usr/src/lib/libc/port/regex/wordexp.c @@ -40,11 +40,8 @@ * * Copyright 1985, 1992 by Mortice Kern Systems Inc. All rights reserved. * Modified by Roland Mainz to support ksh93. - * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _wordexp = wordexp #pragma weak _wordfree = wordfree @@ -75,6 +72,12 @@ #define INITIAL 8 /* initial pathv allocation */ #define BUFSZ 256 /* allocation unit of the line buffer */ +/* + * Needs no locking if fetched only once. + * See getenv()/putenv()/setenv(). + */ +extern const char **_environ; + /* Local prototypes */ static int append(wordexp_t *, char *); @@ -97,25 +100,37 @@ mystpcpy(char *s1, const char *s2) /* * Do word expansion. - * We built a mini-script in |buff| which takes care of all details, + * We build a mini-script in |buff| which takes care of all details, * including stdin/stdout/stderr redirection, WRDE_NOCMD mode and * the word expansion itself. */ int wordexp(const char *word, wordexp_t *wp, int flags) { - char *args[10]; + const char *path = "/usr/bin/ksh93"; wordexp_t wptmp; size_t si; - int i; pid_t pid; - char *line, *eob, *cp; /* word from shell */ + char *line, *eob, *cp; /* word from shell */ int rv = WRDE_ERRNO; int status; - int pv[2]; /* pipe from shell stdout */ - FILE *fp; /* pipe read stream */ - int serrno, tmpalloc; + int pv[2]; /* pipe from shell stdout */ + FILE *fp; /* pipe read stream */ + int tmpalloc; + char *wd = NULL; + const char **env = NULL; + const char **envp; + const char *ev; + int n; + posix_spawnattr_t attr; + posix_spawn_file_actions_t fact; + int error; int cancel_state; + size_t bufflen; /* Length of |buff| */ + char *buff; + char *currbuffp; /* Current position of '\0' in |buff| */ + char *args[10]; + int i; /* * Do absolute minimum necessary for the REUSE flag. Eventually @@ -137,7 +152,7 @@ wordexp(const char *word, wordexp_t *wp, int flags) /* * Man page says: * 2. All of the calls must set WRDE_DOOFFS, or all must not - * set it. + * set it. * Therefore, if it's not set, we_offs will always be reset. */ if ((flags & WRDE_DOOFFS) == 0) @@ -145,14 +160,13 @@ wordexp(const char *word, wordexp_t *wp, int flags) /* * If we get APPEND|REUSE, how should we do? - * We allocate the buffer anyway to avoid segfault. + * allocating buffer anyway to avoid segfault. */ tmpalloc = 0; if ((flags & WRDE_APPEND) == 0 || (flags & WRDE_REUSE)) { wptmp.we_wordc = 0; wptmp.we_wordn = wptmp.we_offs + INITIAL; - wptmp.we_wordv = (char **)malloc( - sizeof (char *) * wptmp.we_wordn); + wptmp.we_wordv = malloc(sizeof (char *) * wptmp.we_wordn); if (wptmp.we_wordv == NULL) return (WRDE_NOSPACE); wptmp.we_wordp = wptmp.we_wordv + wptmp.we_offs; @@ -163,98 +177,139 @@ wordexp(const char *word, wordexp_t *wp, int flags) /* * The UNIX98 Posix conformance test suite requires - * wordexp() to not be a cancellation point. + * |wordexp()| to not be a cancellation point. */ (void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state); /* - * Set up pipe from shell stdout to "fp" for us + * Make sure PWD is in the environment. */ - if (pipe(pv) < 0) - goto cleanup; + if ((envp = _environ) == NULL) { + /* can happen when processing a SunOS 4.x AOUT file */ + ev = NULL; + n = 0; + } else { + for (n = 0; (ev = envp[n]) != NULL; n++) { + if (*ev == 'P' && strncmp(ev, "PWD=", 4) == 0) + break; + } + } + if (ev == NULL) { /* PWD missing from the environment */ + /* allocate a new environment */ + if ((env = malloc((n + 2) * sizeof (char *))) == NULL || + (wd = malloc(PATH_MAX + 4)) == NULL) + goto cleanup; + for (i = 0; i < n; i++) + env[i] = envp[i]; + (void) strcpy(wd, "PWD="); + if (getcwd(&wd[4], PATH_MAX) == NULL) + (void) strcpy(&wd[4], "/"); + env[i] = wd; + env[i + 1] = NULL; + envp = env; + } /* - * Fork/exec shell + * Calculate size of required buffer (which is size of the + * input string (|word|) plus all string literals below; + * this value MUST be adjusted each time the literals are + * changed!!). */ + bufflen = 165 + strlen(word); + buff = alloca(bufflen); + i = 0; - if ((pid = fork()) == -1) { - serrno = errno; - (void) close(pv[0]); - (void) close(pv[1]); - errno = serrno; - goto cleanup; - } + /* Start filling the buffer */ + buff[0] = '\0'; + currbuffp = buff; - if (pid == 0) { /* child */ + if (flags & WRDE_UNDEF) + currbuffp = mystpcpy(currbuffp, "set -o nounset\n"); + if ((flags & WRDE_SHOWERR) == 0) { /* - * Calculate size of required buffer (which is size of the - * input string (|word|) plus all string literals below; - * this value MUST be adjusted each time the literals are - * changed!!!!). + * The newline ('\n') is neccesary to make sure that + * the redirection to /dev/null is already active in + * the case the printf below contains a syntax + * error... */ - size_t bufflen = 124+strlen(word); /* Length of |buff| */ - char *buff = alloca(bufflen); - char *currbuffp; /* Current position of '\0' in |buff| */ - int i; - const char *path; - - (void) dup2(pv[1], 1); - (void) close(pv[0]); - (void) close(pv[1]); - - path = "/usr/bin/ksh93"; - i = 0; - - /* Start filling the buffer */ - buff[0] = '\0'; - currbuffp = buff; - - if (flags & WRDE_UNDEF) - currbuffp = mystpcpy(currbuffp, "set -o nounset ; "); - if ((flags & WRDE_SHOWERR) == 0) { - /* - * The newline ('\n') is neccesary to make sure that - * the redirection to /dev/null is already active in - * the case the printf below contains a syntax - * error... - */ - currbuffp = mystpcpy(currbuffp, "exec 2>/dev/null\n"); - } - /* Squish stdin */ - currbuffp = mystpcpy(currbuffp, "exec 0/dev/null\n"); + } + /* Squish stdin */ + currbuffp = mystpcpy(currbuffp, "exec 0