X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fprocess%2Fposix_spawn.c;h=5eb516b0f4e561e869601427650bad0ad0defe75;hp=b1a9fbde52c9aafc8fe8a8725bc4439b3018a311;hb=599f97360389911c293e0ca4c5eb49e007377fba;hpb=f48832ee15027763826c8a7ff9eeed3fc06bb499

diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c
index b1a9fbde..5eb516b0 100644
--- a/src/process/posix_spawn.c
+++ b/src/process/posix_spawn.c
@@ -4,14 +4,25 @@
 #include <stdint.h>
 #include <fcntl.h>
 #include "syscall.h"
+#include "pthread_impl.h"
 #include "fdop.h"
+#include "libc.h"
 
 extern char **environ;
 
-int __posix_spawnx(pid_t *res, const char *path,
-	int (*exec)(const char *, char *const *),
+static void dummy_0()
+{
+}
+weak_alias(dummy_0, __acquire_ptc);
+weak_alias(dummy_0, __release_ptc);
+
+pid_t __vfork(void);
+
+int __posix_spawnx(pid_t *restrict res, const char *restrict path,
+	int (*exec)(const char *, char *const *, char *const *),
 	const posix_spawn_file_actions_t *fa,
-	const posix_spawnattr_t *attr, char **argv, char **envp)
+	const posix_spawnattr_t *restrict attr,
+	char *const argv[restrict], char *const envp[restrict])
 {
 	pid_t pid;
 	sigset_t oldmask;
@@ -20,24 +31,27 @@ int __posix_spawnx(pid_t *res, const char *path,
 
 	if (!attr) attr = &dummy_attr;
 
-	sigprocmask(SIG_BLOCK, (void *)(uint64_t []){-1}, &oldmask);
-	pid = __syscall(SYS_fork);
+	sigprocmask(SIG_BLOCK, SIGALL_SET, &oldmask);
+
+	__acquire_ptc();
+	pid = __vfork();
 
 	if (pid) {
+		__release_ptc();
 		sigprocmask(SIG_SETMASK, &oldmask, 0);
 		if (pid < 0) return -pid;
 		*res = pid;
 		return 0;
 	}
 
-	for (i=1; i<=64; i++) {
+	for (i=1; i<=8*__SYSCALL_SSLEN; i++) {
 		struct sigaction sa;
-		sigaction(i, 0, &sa);
-		if (sa.sa_handler!=SIG_IGN ||
+		__libc_sigaction(i, 0, &sa);
+		if (sa.sa_handler!=SIG_DFL && (sa.sa_handler!=SIG_IGN ||
 		    ((attr->__flags & POSIX_SPAWN_SETSIGDEF)
-		     && sigismember(&attr->__def, i) )) {
+		     && sigismember(&attr->__def, i) ))) {
 			sa.sa_handler = SIG_DFL;
-			sigaction(i, &sa, 0);
+			__libc_sigaction(i, &sa, 0);
 		}
 	}
 
@@ -81,16 +95,16 @@ int __posix_spawnx(pid_t *res, const char *path,
 	sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
 		? &attr->__mask : &oldmask, 0);
 
-	if (envp) environ = envp;
-	exec(path, argv);
+	exec(path, argv, envp ? envp : environ);
 	_exit(127);
 
 	return 0;
 }
 
-int posix_spawn(pid_t *res, const char *path,
+int posix_spawn(pid_t *restrict res, const char *restrict path,
 	const posix_spawn_file_actions_t *fa,
-	const posix_spawnattr_t *attr, char **argv, char **envp)
+	const posix_spawnattr_t *restrict attr,
+	char *const argv[restrict], char *const envp[restrict])
 {
-	return __posix_spawnx(res, path, execv, fa, attr, argv, envp);
+	return __posix_spawnx(res, path, execve, fa, attr, argv, envp);
 }