diff options
Diffstat (limited to 'libc/sysdeps/linux/avr32/sigaction.c')
| -rw-r--r-- | libc/sysdeps/linux/avr32/sigaction.c | 42 |
1 files changed, 9 insertions, 33 deletions
diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c index 8113c9ca6..61530912e 100644 --- a/libc/sysdeps/linux/avr32/sigaction.c +++ b/libc/sysdeps/linux/avr32/sigaction.c @@ -14,54 +14,30 @@ #define SA_RESTORER 0x04000000 extern void __default_rt_sa_restorer(void); -/* Experimentally off - libc_hidden_proto(memcpy) */ - extern __typeof(sigaction) __libc_sigaction; /* * If act is not NULL, change the action for sig to *act. * If oact is not NULL, put the old action for sig in *oact. */ -int __libc_sigaction(int signum, const struct sigaction *act, - struct sigaction *oldact) +int __libc_sigaction(int sig, const struct sigaction *act, + struct sigaction *oact) { - struct kernel_sigaction kact, koact; - int result; - enum { - SIGSET_MIN_SIZE = sizeof(kact.sa_mask) < sizeof(act->sa_mask) - ? sizeof(kact.sa_mask) : sizeof(act->sa_mask) - }; + struct sigaction kact; - if (act) { - kact.k_sa_handler = act->sa_handler; - memcpy(&kact.sa_mask, &act->sa_mask, SIGSET_MIN_SIZE); - kact.sa_flags = act->sa_flags; - if (kact.sa_flags & SA_RESTORER) - kact.sa_restorer = act->sa_restorer; - else - kact.sa_restorer = __default_rt_sa_restorer; + if (act && !(act->sa_flags & SA_RESTORER)) { + memcpy(&kact, act, sizeof(kact)); + kact.sa_restorer = __default_rt_sa_restorer; kact.sa_flags |= SA_RESTORER; + act = &kact; } /* NB: kernel (as of 2.6.25) will return EINVAL - * if sizeof(kact.sa_mask) does not match kernel's sizeof(sigset_t) */ - result = __syscall_rt_sigaction(signum, - act ? &kact : NULL, - oldact ? &koact : NULL, - sizeof(kact.sa_mask)); - - if (oldact && result >= 0) { - oldact->sa_handler = koact.k_sa_handler; - memcpy(&oldact->sa_mask, &koact.sa_mask, SIGSET_MIN_SIZE); - oldact->sa_flags = koact.sa_flags; - oldact->sa_restorer = koact.sa_restorer; - } - - return result; + * if sizeof(act->sa_mask) does not match kernel's sizeof(sigset_t) */ + return __syscall_rt_sigaction(sig, act, oact, sizeof(act->sa_mask)); } #ifndef LIBC_SIGACTION -/* libc_hidden_proto(sigaction) */ weak_alias(__libc_sigaction, sigaction) libc_hidden_weak(sigaction) #endif |