X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fsignal%2Fsigaction.c;h=d9535032d89d960f170e6b457b80cf86e8d5ad62;hp=18956c6b24a84724143df86e1679fcc52a683620;hb=964e9f3c4c8776820e98c967f3a411d4ca5075a7;hpb=99b8a25e941e54537bf39ca2f265c345f393f112

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 18956c6b..d9535032 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -3,37 +3,36 @@
 #include <errno.h>
 #include "syscall.h"
 #include "pthread_impl.h"
+#include "libc.h"
+#include "ksigaction.h"
 
 void __restore(), __restore_rt();
 
-int __libc_sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+static pthread_t dummy(void) { return 0; }
+weak_alias(dummy, __pthread_self_def);
+
+int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
-	struct {
-		void *handler;
-		unsigned long flags;
-		void (*restorer)(void);
-		sigset_t mask;
-	} ksa, kold;
-	long pksa=0, pkold=0;
+	struct k_sigaction ksa;
 	if (sa) {
+		if ((uintptr_t)sa->sa_handler > 1UL)
+			__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;
-		ksa.mask = sa->sa_mask;
-		pksa = (long)&ksa;
+		memcpy(&ksa.mask, &sa->sa_mask, sizeof ksa.mask);
 	}
-	if (old) pkold = (long)&kold;
-	if (syscall(SYS_rt_sigaction, sig, pksa, pkold, 8))
+	if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask))
 		return -1;
 	if (old) {
-		old->sa_handler = kold.handler;
-		old->sa_flags = kold.flags;
-		old->sa_mask = kold.mask;
+		old->sa_handler = ksa.handler;
+		old->sa_flags = ksa.flags;
+		memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask);
 	}
 	return 0;
 }
 
-int __sigaction(int sig, const struct sigaction *sa, struct sigaction *old)
+int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
 	if (sig-32U < 3) {
 		errno = EINVAL;