close should not be cancellable after "failing" with EINTR

[musl] / src / thread / cancel_impl.c

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 9a02e1a..01f52b8 100644 (file)
--- 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)