diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdinit.c | 2 | ||||
| -rw-r--r-- | hurd/hurdsig.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 7a57031d62..c7f9d4200e 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -166,7 +166,7 @@ _hurd_new_proc_init (char **argv, while. Eventually it probably makes most sense for the exec server to mask out EXEC_SIGTRAP so the debugged program is closer to not being able to tell it's being debugged. */ - if (_hurdsig_traced + if (!__sigisemptyset (&_hurdsig_traced) #ifdef EXEC_SIGTRAP && !(_hurd_exec_flags & EXEC_SIGTRAP) #endif diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index 34b28d94da..40b570b0f8 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -588,7 +588,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, handler = ss->preemptors ? try_preemptor (ss->preemptors) : SIG_ERR; /* If no thread-specific preemptor, check for a global one. */ - if (handler == SIG_ERR && (__sigmask (signo) & _hurdsig_preempted_set)) + if (handler == SIG_ERR && __sigismember (signo, _hurdsig_preempted_set)) { __mutex_lock (&_hurd_siglock); handler = try_preemptor (_hurdsig_preemptors); @@ -689,7 +689,7 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, if (__sigmask (signo) & STOPSIGS) /* Stop signals clear a pending SIGCONT even if they are handled or ignored (but not if preempted). */ - ss->pending &= ~sigmask (SIGCONT); + __sigdelset (&ss->pending, SIGCONT); else { if (signo == SIGCONT) @@ -928,11 +928,11 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss, /* Block requested signals while running the handler. */ scp->sc_mask = ss->blocked; - ss->blocked |= ss->actions[signo].sa_mask; + __sigorset (&ss->blocked, &ss->blocked, &ss->actions[signo].sa_mask); /* Also block SIGNO unless we're asked not to. */ if (! (ss->actions[signo].sa_flags & (SA_RESETHAND | SA_NODEFER))) - ss->blocked |= __sigmask (signo); + __sigaddset (&ss->blocked, signo); /* Reset to SIG_DFL if requested. SIGILL and SIGTRAP cannot be automatically reset when delivered; the system silently |