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

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 3d374e1f..7a72a44b 100644
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -1,41 +1,41 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.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 == SIGCANCEL || sig == SIGSYSCALL) {
+	if (sig-32U < 3) {
 		errno = EINVAL;
 		return -1;
 	}