fix breakage in cancellation due to signal functions overhaul

[musl] / src / thread / cancel_impl.c

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 2d2bb57..9a02e1a 100644 (file)
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -17,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;
@@ -27,10 +27,16 @@ 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) __cancel();
+       if (r == -EINTR && 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 +46,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;