X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/9385eb3d10ebe5eb398c52040ec3dbfba9b0cdcf..2acb89982f71719aec26ca16705bd2c0400a9550:/stdlib/FreeBSD/system.c?ds=sidebyside

diff --git a/stdlib/FreeBSD/system.c b/stdlib/FreeBSD/system.c
index fd2cc2a..3e99468 100644
--- a/stdlib/FreeBSD/system.c
+++ b/stdlib/FreeBSD/system.c
@@ -10,10 +10,6 @@
  * 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
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,7 +31,7 @@
 static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.10 2002/03/22 21:53:10 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.11 2007/01/09 00:28:10 imp Exp $");
 
 #include "namespace.h"
 #include <sys/types.h>
@@ -44,23 +40,58 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.10 2002/03/22 21:53:10 obri
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
+#include <spawn.h>
 #include <paths.h>
 #include <errno.h>
 #include "un-namespace.h"
 #include "libc_private.h"
 
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+
+#if __DARWIN_UNIX03
+#include <pthread.h>
+
+static pthread_mutex_t __systemfn_mutex = PTHREAD_MUTEX_INITIALIZER;
+extern int __unix_conforming;
+#endif /* __DARWIN_UNIX03 */
+
 int
 __system(command)
 	const char *command;
 {
 	pid_t pid, savedpid;
-	int pstat;
+	int pstat, err;
 	struct sigaction ign, intact, quitact;
-	sigset_t newsigblock, oldsigblock;
+	sigset_t newsigblock, oldsigblock, defaultsig;
+	posix_spawnattr_t attr;
+	short flags = POSIX_SPAWN_SETSIGMASK;
+	const char *argv[] = {"sh", "-c", command, NULL};
+
+#if __DARWIN_UNIX03
+	if (__unix_conforming == 0)
+		__unix_conforming = 1;
+#ifdef VARIANT_CANCELABLE
+	pthread_testcancel();
+#endif /* VARIANT_CANCELABLE */
+#endif /* __DARWIN_UNIX03 */
+
+	if (!command) {		/* just checking... */
+		if (access(_PATH_BSHELL, F_OK) == -1)	/* if no sh or no access */
+			return(0);
+		else
+			return(1);
+	}
 
-	if (!command)		/* just checking... */
-		return(1);
+	if ((err = posix_spawnattr_init(&attr)) != 0) {
+		errno = err;
+		return -1;
+	}
+	(void)sigemptyset(&defaultsig);
 
+#if __DARWIN_UNIX03
+	pthread_mutex_lock(&__systemfn_mutex);
+#endif /* __DARWIN_UNIX03 */
 	/*
 	 * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save
 	 * existing signal dispositions.
@@ -69,33 +100,45 @@ __system(command)
 	(void)sigemptyset(&ign.sa_mask);
 	ign.sa_flags = 0;
 	(void)_sigaction(SIGINT, &ign, &intact);
+	if (intact.sa_handler != SIG_IGN) {
+		sigaddset(&defaultsig, SIGINT);
+		flags |= POSIX_SPAWN_SETSIGDEF;
+	}
 	(void)_sigaction(SIGQUIT, &ign, &quitact);
+	if (quitact.sa_handler != SIG_IGN) {
+		sigaddset(&defaultsig, SIGQUIT);
+		flags |= POSIX_SPAWN_SETSIGDEF;
+	}
 	(void)sigemptyset(&newsigblock);
 	(void)sigaddset(&newsigblock, SIGCHLD);
 	(void)_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
-	switch(pid = fork()) {
-	case -1:			/* error */
-		break;
-	case 0:				/* child */
-		/*
-		 * Restore original signal dispositions and exec the command.
-		 */
-		(void)_sigaction(SIGINT, &intact, NULL);
-		(void)_sigaction(SIGQUIT,  &quitact, NULL);
-		(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL);
-		_exit(127);
-	default:			/* parent */
+	(void)posix_spawnattr_setsigmask(&attr, &oldsigblock);
+	if (flags & POSIX_SPAWN_SETSIGDEF) {
+		(void)posix_spawnattr_setsigdefault(&attr, &defaultsig);
+	}
+	(void)posix_spawnattr_setflags(&attr, flags);
+
+	err = posix_spawn(&pid, _PATH_BSHELL, NULL, &attr, (char *const *)argv, environ);
+	(void)posix_spawnattr_destroy(&attr);
+	if (err == 0) {
 		savedpid = pid;
 		do {
 			pid = _wait4(savedpid, &pstat, 0, (struct rusage *)0);
 		} while (pid == -1 && errno == EINTR);
-		break;
+		if (pid == -1) pstat = -1;
+	} else if (err == ENOMEM || err == EAGAIN) { /* as if fork failed */
+		pstat = -1;
+	} else {
+		pstat = W_EXITCODE(127, 0); /* couldn't exec shell */
 	}
+
 	(void)_sigaction(SIGINT, &intact, NULL);
 	(void)_sigaction(SIGQUIT,  &quitact, NULL);
 	(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-	return(pid == -1 ? -1 : pstat);
+#if __DARWIN_UNIX03
+	pthread_mutex_unlock(&__systemfn_mutex);
+#endif /* __DARWIN_UNIX03 */
+	return(pstat);
 }
 
 __weak_reference(__system, system);