projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stupid bug in updating of O_ACCMODE for O_SEARCH support
[musl]
/
src
/
signal
/
sigaction.c
diff --git
a/src/signal/sigaction.c
b/src/signal/sigaction.c
index
b1603b9
..
2331dc9
100644
(file)
--- a/
src/signal/sigaction.c
+++ b/
src/signal/sigaction.c
@@
-3,39
+3,37
@@
#include <errno.h>
#include "syscall.h"
#include "pthread_impl.h"
#include <errno.h>
#include "syscall.h"
#include "pthread_impl.h"
+#include "libc.h"
+#include "ksigaction.h"
void __restore(), __restore_rt();
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) {
ksa.handler = sa->sa_handler;
ksa.flags = sa->sa_flags | SA_RESTORER;
ksa.restorer = (sa->sa_flags & SA_SIGINFO) ? __restore_rt : __restore;
if (sa) {
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
4(__NR_rt_sigaction, sig, pksa, pkold, 8
))
+
__pthread_self_def()
;
+ if (syscall
(SYS_rt_sigaction, sig, sa?&ksa:0, old?&ksa:0, sizeof ksa.mask
))
return -1;
if (old) {
return -1;
if (old) {
- old->sa_handler = k
old
.handler;
- old->sa_flags = k
old
.flags;
-
old->sa_mask = kold.mask
;
+ old->sa_handler = k
sa
.handler;
+ old->sa_flags = k
sa
.flags;
+
memcpy(&old->sa_mask, &ksa.mask, sizeof ksa.mask)
;
}
return 0;
}
}
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;
}
errno = EINVAL;
return -1;
}