X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fprocess%2Ffork.c;h=11286ef44e3bd5fd1069087f8741e5e0ff3fdcf0;hb=224d938c5e538ac37f84c6e9a01bd2095aa7081a;hp=fb8a430add8505e175fd643409258164d5505fa6;hpb=c6d441e3a246370d9c459396ec22b096db93850e;p=musl

diff --git a/src/process/fork.c b/src/process/fork.c
index fb8a430a..11286ef4 100644
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,5 +1,6 @@
 #include <unistd.h>
 #include <string.h>
+#include <signal.h>
 #include "syscall.h"
 #include "libc.h"
 #include "pthread_impl.h"
@@ -13,15 +14,23 @@ weak_alias(dummy, __fork_handler);
 pid_t fork(void)
 {
 	pid_t ret;
+	sigset_t set;
 	__fork_handler(-1);
-	ret = syscall(SYS_fork);
-	if (libc.main_thread && !ret) {
+	__block_all_sigs(&set);
+#ifdef SYS_fork
+	ret = __syscall(SYS_fork);
+#else
+	ret = __syscall(SYS_clone, SIGCHLD, 0);
+#endif
+	if (!ret) {
 		pthread_t self = __pthread_self();
-		self->tid = self->pid = syscall(SYS_getpid);
-		memset(&self->robust_list, 0, sizeof self->robust_list);
+		self->tid = __syscall(SYS_gettid);
+		self->robust_list.off = 0;
+		self->robust_list.pending = 0;
+		self->next = self->prev = self;
 		libc.threads_minus_1 = 0;
-		libc.main_thread = self;
 	}
+	__restore_sigs(&set);
 	__fork_handler(!ret);
-	return ret;
+	return __syscall_ret(ret);
 }