Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/popen.c,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libc/gen/popen.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.23 retrieving revision 1.34 diff -u -p -r1.23 -r1.34 --- src/lib/libc/gen/popen.c 1999/09/16 11:45:02 1.23 +++ src/lib/libc/gen/popen.c 2015/01/20 18:31:25 1.34 @@ -1,4 +1,4 @@ -/* $NetBSD: popen.c,v 1.23 1999/09/16 11:45:02 lukem Exp $ */ +/* $NetBSD: popen.c,v 1.34 2015/01/20 18:31:25 christos Exp $ */ /* * Copyright (c) 1988, 1993 @@ -15,11 +15,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -41,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: popen.c,v 1.23 1999/09/16 11:45:02 lukem Exp $"); +__RCSID("$NetBSD: popen.c,v 1.34 2015/01/20 18:31:25 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -58,104 +54,104 @@ __RCSID("$NetBSD: popen.c,v 1.23 1999/09 #include #include #include +#include + +#include "env.h" #ifdef __weak_alias -__weak_alias(popen,_popen); -__weak_alias(pclose,_pclose); +__weak_alias(popen,_popen) +__weak_alias(pclose,_pclose) #endif static struct pid { struct pid *next; FILE *fp; +#ifdef _REENTRANT + int fd; +#endif pid_t pid; } *pidlist; -FILE * -popen(command, type) - const char *command, *type; -{ - struct pid *cur, *old; - FILE *iop; - int pdes[2], pid, twoway, serrno; - - _DIAGASSERT(command != NULL); - _DIAGASSERT(type != NULL); -#ifdef _DIAGNOSTIC - if (command == NULL || type == NULL) { - errno = EFAULT; - return (NULL); - } -#endif - -#ifdef __GNUC__ - /* This outrageous construct just to shut up a GCC warning. */ - (void) &cur; (void) &twoway; (void) &type; +#ifdef _REENTRANT +static rwlock_t pidlist_lock = RWLOCK_INITIALIZER; #endif - if (strchr(type, '+')) { - twoway = 1; - type = "r+"; - if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pdes) < 0) - return (NULL); +static struct pid * +pdes_get(int *pdes, const char **type) +{ + struct pid *cur; + int flags = strchr(*type, 'e') ? O_CLOEXEC : 0; + int serrno; + + if (strchr(*type, '+')) { + int stype = flags ? (SOCK_STREAM | SOCK_CLOEXEC) : SOCK_STREAM; + *type = "r+"; + if (socketpair(AF_LOCAL, stype, 0, pdes) < 0) + return NULL; } else { - twoway = 0; - if ((*type != 'r' && *type != 'w') || type[1] || - (pipe(pdes) < 0)) { - errno = EINVAL; - return (NULL); - } + *type = strrchr(*type, 'r') ? "r" : "w"; + if (pipe2(pdes, flags) == -1) + return NULL; } - if ((cur = malloc(sizeof(struct pid))) == NULL) { - (void)close(pdes[0]); - (void)close(pdes[1]); - errno = ENOMEM; - return (NULL); - } + if ((cur = malloc(sizeof(*cur))) != NULL) + return cur; + serrno = errno; + (void)close(pdes[0]); + (void)close(pdes[1]); + errno = serrno; + return NULL; +} - switch (pid = vfork()) { - case -1: /* Error. */ - serrno = errno; - free(cur); +static void +pdes_child(int *pdes, const char *type) +{ + struct pid *old; + + /* POSIX.2 B.3.2.2 "popen() shall ensure that any streams + from previous popen() calls that remain open in the + parent process are closed in the new child process. */ + for (old = pidlist; old; old = old->next) +#ifdef _REENTRANT + (void)close(old->fd); /* don't allow a flush */ +#else + (void)close(fileno(old->fp)); /* don't allow a flush */ +#endif + + if (type[0] == 'r') { (void)close(pdes[0]); + if (pdes[1] != STDOUT_FILENO) { + (void)dup2(pdes[1], STDOUT_FILENO); + (void)close(pdes[1]); + } + if (type[1] == '+') + (void)dup2(STDOUT_FILENO, STDIN_FILENO); + } else { (void)close(pdes[1]); - errno = serrno; - return (NULL); - /* NOTREACHED */ - case 0: /* Child. */ - /* POSIX.2 B.3.2.2 "popen() shall ensure that any streams - from previous popen() calls that remain open in the - parent process are closed in the new child process. */ - for (old = pidlist; old; old = old->next) - close(fileno(old->fp)); /* don't allow a flush */ - - if (*type == 'r') { + if (pdes[0] != STDIN_FILENO) { + (void)dup2(pdes[0], STDIN_FILENO); (void)close(pdes[0]); - if (pdes[1] != STDOUT_FILENO) { - (void)dup2(pdes[1], STDOUT_FILENO); - (void)close(pdes[1]); - } - if (twoway) - (void)dup2(STDOUT_FILENO, STDIN_FILENO); - } else { - (void)close(pdes[1]); - if (pdes[0] != STDIN_FILENO) { - (void)dup2(pdes[0], STDIN_FILENO); - (void)close(pdes[0]); - } } - - execl(_PATH_BSHELL, "sh", "-c", command, NULL); - _exit(127); - /* NOTREACHED */ } +} + +static void +pdes_parent(int *pdes, struct pid *cur, pid_t pid, const char *type) +{ + FILE *iop; /* Parent; assume fdopen can't fail. */ if (*type == 'r') { iop = fdopen(pdes[0], type); +#ifdef _REENTRANT + cur->fd = pdes[0]; +#endif (void)close(pdes[1]); } else { iop = fdopen(pdes[1], type); +#ifdef _REENTRANT + cur->fd = pdes[1]; +#endif (void)close(pdes[0]); } @@ -164,8 +160,100 @@ popen(command, type) cur->pid = pid; cur->next = pidlist; pidlist = cur; +} - return (iop); +static void +pdes_error(int *pdes, struct pid *cur) +{ + free(cur); + (void)close(pdes[0]); + (void)close(pdes[1]); +} + +FILE * +popen(const char *cmd, const char *type) +{ + struct pid *cur; + int pdes[2], serrno; + pid_t pid; + + _DIAGASSERT(cmd != NULL); + _DIAGASSERT(type != NULL); + + if ((cur = pdes_get(pdes, &type)) == NULL) + return NULL; + +#ifdef _REENTRANT + (void)rwlock_rdlock(&pidlist_lock); +#endif + (void)__readlockenv(); + switch (pid = vfork()) { + case -1: /* Error. */ + serrno = errno; + (void)__unlockenv(); +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + errno = serrno; + return NULL; + /* NOTREACHED */ + case 0: /* Child. */ + pdes_child(pdes, type); + execl(_PATH_BSHELL, "sh", "-c", cmd, NULL); + _exit(127); + /* NOTREACHED */ + } + (void)__unlockenv(); + + pdes_parent(pdes, cur, pid, type); + +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + + return cur->fp; +} + +FILE * +popenve(const char *cmd, char *const *argv, char *const *envp, const char *type) +{ + struct pid *cur; + int pdes[2], serrno; + pid_t pid; + + _DIAGASSERT(cmd != NULL); + _DIAGASSERT(type != NULL); + + if ((cur = pdes_get(pdes, &type)) == NULL) + return NULL; + +#ifdef _REENTRANT + (void)rwlock_rdlock(&pidlist_lock); +#endif + switch (pid = vfork()) { + case -1: /* Error. */ + serrno = errno; +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + pdes_error(pdes, cur); + errno = serrno; + return NULL; + /* NOTREACHED */ + case 0: /* Child. */ + pdes_child(pdes, type); + execve(cmd, argv, envp); + _exit(127); + /* NOTREACHED */ + } + + pdes_parent(pdes, cur, pid, type); + +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + + return cur->fp; } /* @@ -174,40 +262,47 @@ popen(command, type) * if already `pclosed', or waitpid returns an error. */ int -pclose(iop) - FILE *iop; +pclose(FILE *iop) { struct pid *cur, *last; int pstat; pid_t pid; _DIAGASSERT(iop != NULL); -#ifdef _DIAGNOSTIC - if (iop == NULL) { - errno = EBADF; - return (-1); - } + +#ifdef _REENTRANT + rwlock_wrlock(&pidlist_lock); #endif /* Find the appropriate file pointer. */ for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next) if (cur->fp == iop) break; - if (cur == NULL) - return (-1); + if (cur == NULL) { +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + errno = ESRCH; + return -1; + } (void)fclose(iop); - do { - pid = waitpid(cur->pid, &pstat, 0); - } while (pid == -1 && errno == EINTR); - /* Remove the entry from the linked list. */ if (last == NULL) pidlist = cur->next; else last->next = cur->next; + +#ifdef _REENTRANT + (void)rwlock_unlock(&pidlist_lock); +#endif + + do { + pid = waitpid(cur->pid, &pstat, 0); + } while (pid == -1 && errno == EINTR); + free(cur); - - return (pid == -1 ? -1 : pstat); + + return pid == -1 ? -1 : pstat; }