summaryrefslogtreecommitdiff
path: root/libc/signal
diff options
context:
space:
mode:
Diffstat (limited to 'libc/signal')
-rw-r--r--libc/signal/sighold.c5
-rw-r--r--libc/signal/sigintr.c7
-rw-r--r--libc/signal/sigpause.c8
-rw-r--r--libc/signal/sigrelse.c5
4 files changed, 9 insertions, 16 deletions
diff --git a/libc/signal/sighold.c b/libc/signal/sighold.c
index f8003d60f..fde0a0c2a 100644
--- a/libc/signal/sighold.c
+++ b/libc/signal/sighold.c
@@ -30,10 +30,9 @@ int sighold (int sig)
sigset_t set;
/* Retrieve current signal set. */
- if (sigprocmask (SIG_SETMASK, NULL, &set) < 0)
- return -1;
+ sigprocmask (SIG_SETMASK, NULL, &set); /* can't fail */
- /* Add the specified signal. */
+ /* Bound-check sig, add it to the set. */
if (sigaddset (&set, sig) < 0)
return -1;
diff --git a/libc/signal/sigintr.c b/libc/signal/sigintr.c
index 351c82b75..23f87e199 100644
--- a/libc/signal/sigintr.c
+++ b/libc/signal/sigintr.c
@@ -34,7 +34,7 @@ int siginterrupt (int sig, int interrupt)
#ifdef SA_RESTART
struct sigaction action;
- if (sigaction (sig, (struct sigaction *) NULL, &action) < 0)
+ if (sigaction (sig, NULL, &action) < 0)
return -1;
if (interrupt)
@@ -48,10 +48,7 @@ int siginterrupt (int sig, int interrupt)
action.sa_flags |= SA_RESTART;
}
- if (sigaction (sig, &action, (struct sigaction *) NULL) < 0)
- return -1;
-
- return 0;
+ return sigaction (sig, &action, NULL);
#else
__set_errno (ENOSYS);
return -1;
diff --git a/libc/signal/sigpause.c b/libc/signal/sigpause.c
index 96dd93368..152f9ca32 100644
--- a/libc/signal/sigpause.c
+++ b/libc/signal/sigpause.c
@@ -40,12 +40,10 @@ int __sigpause (int sig_or_mask, int is_sig)
if (is_sig)
{
-//TODO: error check for sig_or_mask = BIGNUM?
-
/* The modern X/Open implementation is requested. */
- if (sigprocmask (0, NULL, &set) < 0
- /* Yes, we call `sigdelset' and not `__sigdelset'. */
- || sigdelset (&set, sig_or_mask) < 0)
+ sigprocmask (SIG_BLOCK, NULL, &set);
+ /* Bound-check sig_or_mask, remove it from the set. */
+ if (sigdelset (&set, sig_or_mask) < 0)
return -1;
}
else
diff --git a/libc/signal/sigrelse.c b/libc/signal/sigrelse.c
index f5ee6fedc..1a7141ac5 100644
--- a/libc/signal/sigrelse.c
+++ b/libc/signal/sigrelse.c
@@ -30,10 +30,9 @@ int sigrelse (int sig)
sigset_t set;
/* Retrieve current signal set. */
- if (sigprocmask (SIG_SETMASK, NULL, &set) < 0)
- return -1;
+ sigprocmask (SIG_SETMASK, NULL, &set); /* can't fail */
- /* Remove the specified signal. */
+ /* Bound-check sig, remove it from the set. */
if (sigdelset (&set, sig) < 0)
return -1;