X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fprocess%2Ffork.c;h=43c52bc4c0c8e9d28455611697e686b714ccf23e;hb=c0ed5a201b2bdb6d1896064bec0020c9973db0a1;hp=7530ff9376ce6689c9b34f6dd68c2cd5c3cc88bb;hpb=4ec07e1f60128cdac63bd98e7091240d6e5d888c;p=musl

diff --git a/src/process/fork.c b/src/process/fork.c
index 7530ff93..43c52bc4 100644
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,20 +1,34 @@
 #include <unistd.h>
+#include <string.h>
+#include <signal.h>
 #include "syscall.h"
 #include "libc.h"
 #include "pthread_impl.h"
 
+static void dummy(int x)
+{
+}
+
+weak_alias(dummy, __fork_handler);
+
 pid_t fork(void)
 {
 	pid_t ret;
-	if (libc.fork_handler) libc.fork_handler(-1);
+	sigset_t set;
+	__fork_handler(-1);
+	__block_all_sigs(&set);
+#ifdef SYS_fork
 	ret = syscall(SYS_fork);
-	if (libc.main_thread && !ret) {
+#else
+	ret = syscall(SYS_clone, SIGCHLD, 0);
+#endif
+	if (libc.has_thread_pointer && !ret) {
 		pthread_t self = __pthread_self();
-		self->tid = self->pid = syscall(SYS_getpid);
+		self->tid = __syscall(SYS_gettid);
 		memset(&self->robust_list, 0, sizeof self->robust_list);
 		libc.threads_minus_1 = 0;
-		libc.main_thread = self;
 	}
-	if (libc.fork_handler) libc.fork_handler(!ret);
+	__restore_sigs(&set);
+	__fork_handler(!ret);
 	return ret;
 }