X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancel_impl.c;h=01f52b82c7a20575e6162cedd958e071059f4b51;hb=3f72cdac73030761120cf32aeef44e7d03e2f1fa;hp=9a02e1a10fbdfdc9b69f32db021a8d8e9e5ef4c4;hpb=344ea148852ed02f280cb92f8fc1611529d60448;p=musl

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 9a02e1a1..01f52b82 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -27,7 +27,8 @@ 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;
 }
 
@@ -58,7 +59,7 @@ 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();
 	if (self->cancel && !self->canceldisable)
@@ -73,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)