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.13 retrieving revision 1.33 diff -u -p -r1.13 -r1.33 --- src/lib/libc/gen/popen.c 1997/07/13 19:16:07 1.13 +++ src/lib/libc/gen/popen.c 2015/01/20 17:28:00 1.33 @@ -1,4 +1,4 @@ -/* $NetBSD: popen.c,v 1.13 1997/07/13 19:16:07 christos Exp $ */ +/* $NetBSD: popen.c,v 1.33 2015/01/20 17:28:00 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. * @@ -39,93 +35,124 @@ #include #if defined(LIBC_SCCS) && !defined(lint) #if 0 -static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/4/93"; +static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95"; #else -__RCSID("$NetBSD: popen.c,v 1.13 1997/07/13 19:16:07 christos Exp $"); +__RCSID("$NetBSD: popen.c,v 1.33 2015/01/20 17:28:00 christos Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#include "namespace.h" #include #include +#include -#include +#include #include -#include +#include +#include #include #include #include -#include +#include +#include + +#include "env.h" +#include "reentrant.h" + +#ifdef __weak_alias +__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(program, type) - const char *program; - const char *type; +#ifdef _REENTRANT +static rwlock_t pidlist_lock = RWLOCK_INITIALIZER; +#endif + +static struct pid * +pdes_get(int *pdes, const char **type) { struct pid *cur; - FILE *iop; - int pdes[2], pid; -#ifdef __GNUC__ - (void) &cur; -#endif + int flags = strchr(*type, 'e') ? O_CLOEXEC : 0; + int serrno; - if ((*type != 'r' && *type != 'w') || type[1]) { - errno = EINVAL; - return (NULL); + 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 { + *type = strrchr(*type, 'r') ? "r" : "w"; + if (pipe2(pdes, flags) == -1) + return NULL; } - if ((cur = malloc(sizeof(struct pid))) == NULL) - return (NULL); + if ((cur = malloc(sizeof(*cur))) != NULL) + return cur; + serrno = errno; + (void)close(pdes[0]); + (void)close(pdes[1]); + errno = serrno; + return NULL; +} - if (pipe(pdes) < 0) { - free(cur); - return (NULL); - } +static void +pdes_child(int *pdes, const char *type) +{ + struct pid *old; - switch (pid = vfork()) { - case -1: /* Error. */ + /* 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]); - (void)close(pdes[1]); - free(cur); - return (NULL); - /* NOTREACHED */ - case 0: /* Child. */ - if (*type == 'r') { - if (pdes[1] != STDOUT_FILENO) { - (void)dup2(pdes[1], STDOUT_FILENO); - (void)close(pdes[1]); - } - (void) close(pdes[0]); - } else { - 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]); } - - /* 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 (cur = pidlist; cur; cur = cur->next) - close(fileno(cur->fp)); - - execl(_PATH_BSHELL, "sh", "-c", program, NULL); - _exit(127); - /* NOTREACHED */ + if (type[1] == '+') + (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]); + } } +} + +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]); } @@ -134,8 +161,100 @@ popen(program, 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; } /* @@ -144,32 +263,47 @@ popen(program, type) * if already `pclosed', or waitpid returns an error. */ int -pclose(iop) - FILE *iop; +pclose(FILE *iop) { - register struct pid *cur, *last; + struct pid *cur, *last; int pstat; pid_t pid; - (void)fclose(iop); + _DIAGASSERT(iop != NULL); + +#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; + } - do { - pid = waitpid(cur->pid, &pstat, 0); - } while (pid == -1 && errno == EINTR); + (void)fclose(iop); /* 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; }