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

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 0d80885f..cf5082d3 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -27,10 +27,17 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
 	self->cp_ip = old_ip;
 	self->cp_sp = old_sp;
-	if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
+	if (r==-EINTR && nr!=SYS_close && self->cancel && !self->canceldisable)
+		__cancel();
 	return r;
 }
 
+static void _sigaddset(sigset_t *set, int sig)
+{
+	unsigned s = sig-1;
+	set->__bits[s/8/sizeof *set->__bits] |= 1UL<<(s&8*sizeof *set->__bits-1);
+}
+
 static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 {
 	pthread_t self = __pthread_self();
@@ -40,7 +47,7 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 
 	if (!self->cancel || self->canceldisable) return;
 
-	sigaddset(&uc->uc_sigmask, SIGCANCEL);
+	_sigaddset(&uc->uc_sigmask, SIGCANCEL);
 
 	if (self->cancelasync || sp == self->cp_sp && ip <= self->cp_ip) {
 		self->canceldisable = 1;
@@ -52,9 +59,9 @@ static void cancel_handler(int sig, siginfo_t *si, void *ctx)
 		__syscall(SYS_tgkill, self->pid, self->tid, SIGCANCEL);
 }
 
-static void testcancel()
+void __testcancel()
 {
-	pthread_t self = __pthread_self();
+	pthread_t self = pthread_self();
 	if (self->cancel && !self->canceldisable)
 		__cancel();
 }
@@ -67,7 +74,6 @@ static void init_cancellation()
 	};
 	sigfillset(&sa.sa_mask);
 	__libc_sigaction(SIGCANCEL, &sa, 0);
-	libc.testcancel = testcancel;
 }
 
 int pthread_cancel(pthread_t t)