X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fprocess%2Ffork.c;h=a8bdbe0b03833cd763a0ad661de90d6d8d295dd2;hb=2c1cd2399a237db968a521cdaef3d47a3fb2c2e9;hp=0638ed67db74df731bdfab80f4e4d05e12be7981;hpb=e9417fffb39c299e556c5ad0c1545f0c02618e3c;p=musl

diff --git a/src/process/fork.c b/src/process/fork.c
index 0638ed67..a8bdbe0b 100644
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,12 +1,26 @@
 #include <unistd.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);
-	ret = syscall0(__NR_fork);
-	if (libc.fork_handler) libc.fork_handler(!ret);
+	__fork_handler(-1);
+	ret = syscall(SYS_fork);
+	if (libc.main_thread && !ret) {
+		pthread_t self = __pthread_self();
+		self->tid = self->pid = syscall(SYS_getpid);
+		memset(&self->robust_list, 0, sizeof self->robust_list);
+		libc.threads_minus_1 = 0;
+		libc.main_thread = self;
+	}
+	__fork_handler(!ret);
 	return ret;
 }