projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use libc-internal malloc for pthread_atfork
[musl]
/
src
/
signal
/
sigset.c
diff --git
a/src/signal/sigset.c
b/src/signal/sigset.c
index
cbe4628
..
f3e8c40
100644
(file)
--- a/
src/signal/sigset.c
+++ b/
src/signal/sigset.c
@@
-1,19
+1,18
@@
#include <signal.h>
#include <signal.h>
-#include <stddef.h>
void (*sigset(int sig, void (*handler)(int)))(int)
{
struct sigaction sa, sa_old;
void (*sigset(int sig, void (*handler)(int)))(int)
{
struct sigaction sa, sa_old;
- sigset_t mask;
+ sigset_t mask
, mask_old
;
sigemptyset(&mask);
if (sigaddset(&mask, sig) < 0)
return SIG_ERR;
if (handler == SIG_HOLD) {
sigemptyset(&mask);
if (sigaddset(&mask, sig) < 0)
return SIG_ERR;
if (handler == SIG_HOLD) {
- if (sigaction(sig,
NULL
, &sa_old) < 0)
+ if (sigaction(sig,
0
, &sa_old) < 0)
return SIG_ERR;
return SIG_ERR;
- if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0)
+ if (sigprocmask(SIG_BLOCK, &mask, &mask
_old
) < 0)
return SIG_ERR;
} else {
sa.sa_handler = handler;
return SIG_ERR;
} else {
sa.sa_handler = handler;
@@
-21,8
+20,8
@@
void (*sigset(int sig, void (*handler)(int)))(int)
sigemptyset(&sa.sa_mask);
if (sigaction(sig, &sa, &sa_old) < 0)
return SIG_ERR;
sigemptyset(&sa.sa_mask);
if (sigaction(sig, &sa, &sa_old) < 0)
return SIG_ERR;
- if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
+ if (sigprocmask(SIG_UNBLOCK, &mask, &mask
_old
) < 0)
return SIG_ERR;
}
return SIG_ERR;
}
- return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler;
+ return sigismember(&mask
_old
, sig) ? SIG_HOLD : sa_old.sa_handler;
}
}