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

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 4acd1730..3d374e1f 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -4,10 +4,7 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 
-static void restorer()
-{
-	syscall0(__NR_rt_sigreturn);
-}
+void __restore(), __restore_rt();
 
 int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
 {
@@ -20,13 +17,13 @@ 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))
+	if (syscall(SYS_rt_sigaction, sig, pksa, pkold, 8))
 		return -1;
 	if (old) {
 		old->sa_handler = kold.handler;