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.15 retrieving revision 1.30 diff -u -p -r1.15 -r1.30 --- src/lib/libc/gen/popen.c 1997/09/16 00:35:47 1.15 +++ src/lib/libc/gen/popen.c 2010/11/14 18:11:42 1.30 @@ -1,4 +1,4 @@ -/* $NetBSD: popen.c,v 1.15 1997/09/16 00:35:47 thorpej Exp $ */ +/* $NetBSD: popen.c,v 1.30 2010/11/14 18:11:42 tron 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,99 +35,138 @@ #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.15 1997/09/16 00:35:47 thorpej Exp $"); +__RCSID("$NetBSD: popen.c,v 1.30 2010/11/14 18:11:42 tron 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 "env.h" +#include "reentrant.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; +#ifdef _REENTRANT +static rwlock_t pidlist_lock = RWLOCK_INITIALIZER; +#endif + FILE * -popen(program, type) - const char *program; - const char *type; +popen(const char *command, const char *type) { struct pid *cur, *old; FILE *iop; - int pdes[2], pid; -#ifdef __GNUC__ - (void) &cur; -#endif - - if ((*type != 'r' && *type != 'w') || type[1]) { - errno = EINVAL; - return (NULL); + const char * volatile xtype = type; + int pdes[2], pid, serrno; + volatile int twoway; + + _DIAGASSERT(command != NULL); + _DIAGASSERT(xtype != NULL); + + if (strchr(xtype, '+')) { + twoway = 1; + type = "r+"; + if (socketpair(AF_LOCAL, SOCK_STREAM, 0, pdes) < 0) + return (NULL); + } else { + twoway = 0; + if ((*xtype != 'r' && *xtype != 'w') || xtype[1] || + (pipe(pdes) < 0)) { + errno = EINVAL; + return (NULL); + } } - if ((cur = malloc(sizeof(struct pid))) == NULL) - return (NULL); - - if (pipe(pdes) < 0) { - free(cur); + if ((cur = malloc(sizeof(struct pid))) == NULL) { + (void)close(pdes[0]); + (void)close(pdes[1]); + errno = ENOMEM; return (NULL); } + (void)rwlock_rdlock(&pidlist_lock); + (void)__readlockenv(); switch (pid = vfork()) { case -1: /* Error. */ + serrno = errno; + (void)__unlockenv(); + (void)rwlock_unlock(&pidlist_lock); + free(cur); (void)close(pdes[0]); (void)close(pdes[1]); - free(cur); + errno = serrno; return (NULL); /* NOTREACHED */ case 0: /* Child. */ - if (*type == 'r') { + /* 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 + close(old->fd); /* don't allow a flush */ +#else + close(fileno(old->fp)); /* don't allow a flush */ +#endif + + if (*xtype == 'r') { + (void)close(pdes[0]); if (pdes[1] != STDOUT_FILENO) { (void)dup2(pdes[1], STDOUT_FILENO); (void)close(pdes[1]); } - (void) close(pdes[0]); + 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]); } - (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 (old = pidlist; old; old = old->next) - close(fileno(old->fp)); - - execl(_PATH_BSHELL, "sh", "-c", program, NULL); + execl(_PATH_BSHELL, "sh", "-c", command, NULL); _exit(127); /* NOTREACHED */ } + (void)__unlockenv(); /* Parent; assume fdopen can't fail. */ - if (*type == 'r') { - iop = fdopen(pdes[0], type); + if (*xtype == 'r') { + iop = fdopen(pdes[0], xtype); +#ifdef _REENTRANT + cur->fd = pdes[0]; +#endif (void)close(pdes[1]); } else { - iop = fdopen(pdes[1], type); + iop = fdopen(pdes[1], xtype); +#ifdef _REENTRANT + cur->fd = pdes[1]; +#endif (void)close(pdes[0]); } @@ -140,6 +175,7 @@ popen(program, type) cur->pid = pid; cur->next = pidlist; pidlist = cur; + (void)rwlock_unlock(&pidlist_lock); return (iop); } @@ -153,29 +189,38 @@ int pclose(iop) FILE *iop; { - register struct pid *cur, *last; + struct pid *cur, *last; int pstat; pid_t pid; - (void)fclose(iop); + _DIAGASSERT(iop != NULL); + + rwlock_wrlock(&pidlist_lock); /* Find the appropriate file pointer. */ for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next) if (cur->fp == iop) break; - if (cur == NULL) + if (cur == NULL) { + (void)rwlock_unlock(&pidlist_lock); 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; + + (void)rwlock_unlock(&pidlist_lock); + + do { + pid = waitpid(cur->pid, &pstat, 0); + } while (pid == -1 && errno == EINTR); + free(cur); - + return (pid == -1 ? -1 : pstat); }