X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancel_impl.c;h=0d80885f1959afdc5c9b908deccfa0232a97c8ed;hb=aed707f679cce80afd929f0efaf080f1e8481330;hp=28dc84dc497fd6176481d32178be63b49de8c8ea;hpb=e74664016b025ea9718da59e680555961444ee4d;p=musl

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 28dc84dc..0d80885f 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -3,6 +3,7 @@
 void __cancel()
 {
 	pthread_t self = __pthread_self();
+	self->cp_sp = 0;
 	self->canceldisable = 1;
 	self->cancelasync = 0;
 	pthread_exit(PTHREAD_CANCELED);
@@ -16,7 +17,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	uintptr_t old_sp, old_ip;
 	long r;
 
-	if (!libc.lock || (self = __pthread_self())->canceldisable)
+	if (!libc.threaded || (self = __pthread_self())->canceldisable)
 		return __syscall(nr, u, v, w, x, y, z);
 
 	old_sp = self->cp_sp;
@@ -24,9 +25,9 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	self->cp_sp = 0;
 	self->cp_ip = 0;
 	r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
-	self->cp_sp = old_sp;
 	self->cp_ip = old_ip;
-	if (r == -EINTR && self->cancel) __cancel();
+	self->cp_sp = old_sp;
+	if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
 	return r;
 }
 
@@ -71,8 +72,11 @@ static void init_cancellation()
 
 int pthread_cancel(pthread_t t)
 {
-	static pthread_once_t once;
-	pthread_once(&once, init_cancellation);
+	static int init;
+	if (!init) {
+		init_cancellation();
+		init = 1;
+	}
 	a_store(&t->cancel, 1);
 	return pthread_kill(t, SIGCANCEL);
 }