about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-08-02 19:59:56 -0400
committerRich Felker <dalias@aerifal.cx>2011-08-02 19:59:56 -0400
commit344ea148852ed02f280cb92f8fc1611529d60448 (patch)
tree2aa1c07a04a6178517ab492cc36f3e22d1a4b847
parent88c4e720317845a8e01aee03f142ba82674cd23d (diff)
downloadmusl-344ea148852ed02f280cb92f8fc1611529d60448.tar.gz
musl-344ea148852ed02f280cb92f8fc1611529d60448.tar.xz
musl-344ea148852ed02f280cb92f8fc1611529d60448.zip
fix breakage in cancellation due to signal functions overhaul
sigaddset was not accepting SIGCANCEL as a valid signal number.
-rw-r--r--src/thread/cancel_impl.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 0d80885f..9a02e1a1 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -31,6 +31,12 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	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;