X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fprocess%2Ffork.c;h=fb8a430add8505e175fd643409258164d5505fa6;hp=012b7ca59c0bb681df3715ff9c6a587870f18a1c;hb=3df0b66ee95c837496ae434ba7a2282d97ca71ef;hpb=aa398f56fa398f2202b04e82c67f822f3233786f

diff --git a/src/process/fork.c b/src/process/fork.c
index 012b7ca5..fb8a430a 100644
--- a/src/process/fork.c
+++ b/src/process/fork.c
@@ -1,19 +1,27 @@
 #include <unistd.h>
+#include <string.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);
+	__fork_handler(-1);
 	ret = syscall(SYS_fork);
-	if (libc.lock && !ret) {
+	if (libc.main_thread && !ret) {
 		pthread_t self = __pthread_self();
-		self->pid = syscall(SYS_getpid);
-		self->tid = syscall(SYS_gettid);
+		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;
 	}
-	if (libc.fork_handler) libc.fork_handler(!ret);
+	__fork_handler(!ret);
 	return ret;
 }