adapt res_msend DNS query core for working with multiple sockets

[musl] / src / signal / sigaction.c

diff --git a/src/signal/sigaction.c b/src/signal/sigaction.c
index 6eca06f..2203471 100644 (file)
--- a/src/signal/sigaction.c
+++ b/src/signal/sigaction.c
@@ -4,6 +4,7 @@
 #include "syscall.h"
 #include "pthread_impl.h"
 #include "libc.h"
+#include "lock.h"
 #include "ksigaction.h"
 
 static int unmask_done;
@@ -14,6 +15,8 @@ void __get_handler_set(sigset_t *set)
        memcpy(set, handler_set, sizeof handler_set);
 }
 
+volatile int __eintr_valid_flag;
+
 int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
        struct k_sigaction ksa, ksa_old;
@@ -35,29 +38,47 @@ int __libc_sigaction(int sig, const struct sigaction *restrict sa, struct sigact
                                        SIGPT_SET, 0, _NSIG/8);
                                unmask_done = 1;
                        }
+
+                       if (!(sa->sa_flags & SA_RESTART)) {
+                               a_store(&__eintr_valid_flag, 1);
+                       }
                }
                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);
+               memcpy(&ksa.mask, &sa->sa_mask, _NSIG/8);
        }
-       if (syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, sizeof ksa.mask))
-               return -1;
-       if (old) {
+       int r = __syscall(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa_old:0, _NSIG/8);
+       if (old && !r) {
                old->sa_handler = ksa_old.handler;
                old->sa_flags = ksa_old.flags;
-               memcpy(&old->sa_mask, &ksa_old.mask, sizeof ksa_old.mask);
+               memcpy(&old->sa_mask, &ksa_old.mask, _NSIG/8);
        }
-       return 0;
+       return __syscall_ret(r);
 }
 
 int __sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
 {
+       unsigned long set[_NSIG/(8*sizeof(long))];
+
        if (sig-32U < 3 || sig-1U >= _NSIG-1) {
                errno = EINVAL;
                return -1;
        }
-       return __libc_sigaction(sig, sa, old);
+
+       /* Doing anything with the disposition of SIGABRT requires a lock,
+        * so that it cannot be changed while abort is terminating the
+        * process and so any change made by abort can't be observed. */
+       if (sig == SIGABRT) {
+               __block_all_sigs(&set);
+               LOCK(__abort_lock);
+       }
+       int r = __libc_sigaction(sig, sa, old);
+       if (sig == SIGABRT) {
+               UNLOCK(__abort_lock);
+               __restore_sigs(&set);
+       }
+       return r;
 }
 
 weak_alias(__sigaction, sigaction);