diff options
| author |   tedu <tedu@openbsd.org> | 2013-06-01 04:05:26 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2013-06-01 04:05:26 +0000 |
| commit | 5636a1d2ee0e01a2d804948f1756be75737d3371 (patch) | |
| tree | 6f968fb9a11b6b62cd50e5234c65da6a41502092 /sys/kern/kern_sig.c | |
| parent | Make mutexes that get used in interrupts IPL_TTY instead of IPL_NONE. (diff) | |
| download | wireguard-openbsd-5636a1d2ee0e01a2d804948f1756be75737d3371.tar.xz wireguard-openbsd-5636a1d2ee0e01a2d804948f1756be75737d3371.zip | |
some small style changes that are distracting me from seeing a real bug
Diffstat (limited to '')
| -rw-r--r-- | sys/kern/kern_sig.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fb7e0ee95f7..ad10883575e 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.151 2013/04/29 17:06:20 matthew Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.152 2013/06/01 04:05:26 tedu Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -863,11 +863,11 @@ ptsignal(struct proc *p, int signum, enum signal_type type) */ if (p->p_sigacts->ps_sigignore & mask) return; - if (p->p_sigmask & mask) + if (p->p_sigmask & mask) { action = SIG_HOLD; - else if (p->p_sigacts->ps_sigcatch & mask) + } else if (p->p_sigacts->ps_sigcatch & mask) { action = SIG_CATCH; - else { + } else { action = SIG_DFL; if (prop & SA_KILL && pr->ps_nice > NZERO) @@ -886,9 +886,8 @@ ptsignal(struct proc *p, int signum, enum signal_type type) atomic_setbits_int(&p->p_siglist, mask); } - if (prop & SA_CONT) { + if (prop & SA_CONT) atomic_clearbits_int(&p->p_siglist, stopsigmask); - } if (prop & SA_STOP) { atomic_clearbits_int(&p->p_siglist, contsigmask); @@ -898,12 +897,10 @@ ptsignal(struct proc *p, int signum, enum signal_type type) /* * XXX delay processing of SA_STOP signals unless action == SIG_DFL? */ - if (prop & (SA_CONT | SA_STOP) && type != SPROPAGATED) { - TAILQ_FOREACH(q, &pr->ps_threads, p_thr_link) { + if (prop & (SA_CONT | SA_STOP) && type != SPROPAGATED) + TAILQ_FOREACH(q, &pr->ps_threads, p_thr_link) if (q != p) ptsignal(q, signum, SPROPAGATED); - } - } /* * Defer further processing for signals which are held, @@ -1137,7 +1134,6 @@ issignal(struct proc *p) * to clear it from the pending mask. */ switch ((long)p->p_sigacts->ps_sigact[signum]) { - case (long)SIG_DFL: /* * Don't take default actions on system processes. @@ -1181,7 +1177,6 @@ issignal(struct proc *p) } else goto keep; /*NOTREACHED*/ - case (long)SIG_IGN: /* * Masking above should prevent us ever trying @@ -1192,7 +1187,6 @@ issignal(struct proc *p) (pr->ps_flags & PS_TRACED) == 0) printf("issignal\n"); break; /* == ignore */ - default: /* * This signal has an action, let @@ -1337,8 +1331,9 @@ postsig(int signum) if (p->p_flag & P_SIGSUSPEND) { atomic_clearbits_int(&p->p_flag, P_SIGSUSPEND); returnmask = p->p_oldmask; - } else + } else { returnmask = p->p_sigmask; + } p->p_sigmask |= ps->ps_catchmask[signum]; if ((ps->ps_sigreset & mask) != 0) { ps->ps_sigcatch &= ~mask; @@ -1564,7 +1559,7 @@ coredump_write(void *cookie, enum uio_seg segflg, const void *data, size_t len) " at %lld failed: %d\n", io->io_proc->p_pid, io->io_proc->p_comm, segflg == UIO_USERSPACE ? "user" : "system", - len, data, (long long) io->io_offset, error); + len, data, (long long)io->io_offset, error); return (error); } |