diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1995-11-18 10:01:38 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1995-11-18 10:01:38 +0000 |
| commit | 7bcb7905fd197edeb646975b67fcba87cbb09a6d (patch) | |
| tree | 3c50874e2707589046f0d47ea0ab81eea7e8010a /sys/kern/kern_sig.c | |
| parent | 27413a9eef9bc6743d1dfa5ceaf83efc093e8339 (diff) | |
| download | src-7bcb7905fd197edeb646975b67fcba87cbb09a6d.tar.gz src-7bcb7905fd197edeb646975b67fcba87cbb09a6d.zip | |
Cleaned up SA_NODEFER changes.
Added prototypes.
Notes
Notes:
svn path=/head/; revision=12368
Diffstat (limited to 'sys/kern/kern_sig.c')
| -rw-r--r-- | sys/kern/kern_sig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 6be1f2295e8e..c46d56c96df2 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id: kern_sig.c,v 1.12 1995/10/19 19:15:23 swallace Exp $ + * $Id: kern_sig.c,v 1.13 1995/11/12 06:43:00 bde Exp $ */ #define SIGPROP /* include signal properties table */ @@ -64,8 +64,9 @@ #include <vm/vm.h> #include <sys/user.h> /* for coredump */ -void setsigvec __P((struct proc *, int, struct sigaction *)); -void stop __P((struct proc *)); +extern int killpg1 __P((struct proc *cp, int signum, int pgid, int all)); +extern void killproc __P((struct proc *p, char *why)); +extern void stop __P((struct proc *)); /* * Can process p, with pcred pc, send the signal signum to process q? @@ -683,9 +684,8 @@ trapsignal(p, signum, code) p->p_sigmask, code); #endif sendsig(ps->ps_sigact[signum], signum, p->p_sigmask, code); - p->p_sigmask |= ps->ps_catchmask[signum]; p->p_sigmask |= ps->ps_catchmask[signum] | - (mask & ~ps->ps_nodefer); + (mask & ~ps->ps_nodefer); } else { ps->ps_code = code; /* XXX for core dump/debugger */ psignal(p, signum); @@ -1120,7 +1120,7 @@ postsig(signum) } else returnmask = p->p_sigmask; p->p_sigmask |= ps->ps_catchmask[signum] | - (mask & ~ps->ps_nodefer); + (mask & ~ps->ps_nodefer); (void) spl0(); p->p_stats->p_ru.ru_nsignals++; if (ps->ps_sig != signum) { |