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

diff --git a/src/process/posix_spawn.c b/src/process/posix_spawn.c
index e8557487..5eb516b0 100644
--- a/src/process/posix_spawn.c
+++ b/src/process/posix_spawn.c
@@ -19,7 +19,7 @@ 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 *),
+	int (*exec)(const char *, char *const *, char *const *),
 	const posix_spawn_file_actions_t *fa,
 	const posix_spawnattr_t *restrict attr,
 	char *const argv[restrict], char *const envp[restrict])
@@ -35,9 +35,9 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path,
 
 	__acquire_ptc();
 	pid = __vfork();
-	__release_ptc();
 
 	if (pid) {
+		__release_ptc();
 		sigprocmask(SIG_SETMASK, &oldmask, 0);
 		if (pid < 0) return -pid;
 		*res = pid;
@@ -95,8 +95,7 @@ int __posix_spawnx(pid_t *restrict res, const char *restrict path,
 	sigprocmask(SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
 		? &attr->__mask : &oldmask, 0);
 
-	if (envp) environ = (char **)envp;
-	exec(path, argv);
+	exec(path, argv, envp ? envp : environ);
 	_exit(127);
 
 	return 0;
@@ -107,5 +106,5 @@ int posix_spawn(pid_t *restrict res, const char *restrict path,
 	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);
 }