X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fsignal%2Fsigaction.c;h=5499bd181c37c06978f4c0a55d9571078b9faffd;hb=63b9cc777323488da3474e8bc53e0ac4d3521382;hp=7a72a44b13fec0ca83eae4f4241258e2da8c3876;hpb=c6d441e3a246370d9c459396ec22b096db93850e;p=musl

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 7a72a44b..5499bd18 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -12,23 +12,37 @@ void __restore(), __restore_rt();
 static pthread_t dummy(void) { return 0; }
 weak_alias(dummy, __pthread_self_def);
 
+static unsigned long handler_set[_NSIG/(8*sizeof(long))];
+
+void __get_handler_set(sigset_t *set)
+{
+	memcpy(set, handler_set, sizeof handler_set);
+}
+
 int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
-	struct k_sigaction ksa;
+	struct k_sigaction ksa, ksa_old;
+	if (sig >= (unsigned)_NSIG) {
+		errno = EINVAL;
+		return -1;
+	}
 	if (sa) {
-		if ((uintptr_t)sa->sa_handler > 1UL)
+		if ((uintptr_t)sa->sa_handler > 1UL) {
+			a_or_l(handler_set+(sig-1)/(8*sizeof(long)),
+				1UL<<(sig-1)%(8*sizeof(long)));
 			__pthread_self_def();
+		}
 		ksa.handler = sa->sa_handler;
 		ksa.flags = sa->sa_flags | SA_RESTORER;
 		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
 		memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
 	}
-	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask))
+	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
 		return -1;
 	if (old) {
-		old->sa_handler = ksa.handler;
-		old->sa_flags = ksa.flags;
-		memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask);
+		old->sa_handler = ksa_old.handler;
+		old->sa_flags = ksa_old.flags;
+		memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
 	}
 	return 0;
 }