X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fsignal%2Fsigaction.c;h=5bc9383b66f34ed6f57e6d1f6a56bc57b8a8dc3c;hb=1af8c255040b3e1ba4913fd935d117490bfe8774;hp=4acd1730bd8dd17c9951c4f0db4295fa0b123321;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 4acd1730..5bc9383b 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -3,11 +3,12 @@
 #include <errno.h>
 #include "syscall.h"
 #include "pthread_impl.h"
+#include "libc.h"
 
-static void restorer()
-{
-	syscall0(__NR_rt_sigreturn);
-}
+void __restore(), __restore_rt();
+
+static pthread_t dummy(void) { return 0; }
+weak_alias(dummy, __pthread_self_def);
 
 int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 {
@@ -20,13 +21,14 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 	long pksa=0, pkold=0;
 	if (sa) {
 		ksa.handler = sa->sa_handler;
-		ksa.flags = sa->sa_flags;
-		ksa.restorer = restorer;
+		ksa.flags = sa->sa_flags | SA_RESTORER;
+		ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
 		ksa.mask = sa->sa_mask;
 		pksa = (long)&ksa;
 	}
 	if (old) pkold = (long)&kold;
-	if (syscall4(__NR_rt_sigaction, sig, pksa, pkold, 8))
+	__pthread_self_def();
+	if (syscall(SYS_rt_sigaction, sig, pksa, pkold, 8))
 		return -1;
 	if (old) {
 		old->sa_handler = kold.handler;
@@ -38,7 +40,7 @@ int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 
 int __sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 {
-	if (sig == SIGCANCEL || sig == SIGSYSCALL) {
+	if (sig-32U < 3) {
 		errno = EINVAL;
 		return -1;
 	}