BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / kern / kern_sig.c

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 67904f4..3dcff92 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,77 +1,110 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)kern_sig.c  7.32 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)kern_sig.c  8.7 (Berkeley) 4/18/94

  */
 
 #define        SIGPROP         /* include signal properties table */
  */
 
 #define        SIGPROP         /* include signal properties table */

-#include "param.h"
-#include "signalvar.h"
-#include "resourcevar.h"
-#include "namei.h"
-#include "vnode.h"
-#include "proc.h"
-#include "systm.h"
-#include "timeb.h"
-#include "times.h"
-#include "buf.h"
-#include "seg.h"
-#include "acct.h"
-#include "file.h"
-#include "kernel.h"
-#include "wait.h"
-#include "ktrace.h"
-
-#include "machine/cpu.h"
-
-#include "vm/vm.h"
-#include "kinfo_proc.h"
-#include "user.h"              /* for coredump */
+#include <sys/param.h>
+#include <sys/signalvar.h>
+#include <sys/resourcevar.h>
+#include <sys/namei.h>
+#include <sys/vnode.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+#include <sys/timeb.h>
+#include <sys/times.h>
+#include <sys/buf.h>
+#include <sys/acct.h>
+#include <sys/file.h>
+#include <sys/kernel.h>
+#include <sys/wait.h>
+#include <sys/ktrace.h>
+#include <sys/syslog.h>
+#include <sys/stat.h>
+
+#include <machine/cpu.h>
+
+#include <vm/vm.h>
+#include <sys/user.h>          /* for coredump */

 
 /*
 
 /*

- * Can process p, with pcred pc, send the signal signo to process q?
+ * Can process p, with pcred pc, send the signal signum to process q?

  */
  */

-#define CANSIGNAL(p, pc, q, signo) \
+#define CANSIGNAL(p, pc, q, signum) \

        ((pc)->pc_ucred->cr_uid == 0 || \
            (pc)->p_ruid == (q)->p_cred->p_ruid || \
            (pc)->pc_ucred->cr_uid == (q)->p_cred->p_ruid || \
            (pc)->p_ruid == (q)->p_ucred->cr_uid || \
            (pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid || \
        ((pc)->pc_ucred->cr_uid == 0 || \
            (pc)->p_ruid == (q)->p_cred->p_ruid || \
            (pc)->pc_ucred->cr_uid == (q)->p_cred->p_ruid || \
            (pc)->p_ruid == (q)->p_ucred->cr_uid || \
            (pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid || \

-           ((signo) == SIGCONT && (q)->p_session == (p)->p_session))
+           ((signum) == SIGCONT && (q)->p_session == (p)->p_session))

 
 

+struct sigaction_args {
+       int     signum;
+       struct  sigaction *nsa;
+       struct  sigaction *osa;
+};

 /* ARGSUSED */
 sigaction(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 sigaction(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     signo;
-               struct  sigaction *nsa;
-               struct  sigaction *osa;
-       } *uap;
+       register struct sigaction_args *uap;

        int *retval;
 {
        struct sigaction vec;
        register struct sigaction *sa;
        register struct sigacts *ps = p->p_sigacts;
        int *retval;
 {
        struct sigaction vec;
        register struct sigaction *sa;
        register struct sigacts *ps = p->p_sigacts;

-       register int sig;
+       register int signum;

        int bit, error;
 
        int bit, error;
 

-       sig = uap->signo;
-       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+       signum = uap->signum;
+       if (signum <= 0 || signum >= NSIG ||
+           signum == SIGKILL || signum == SIGSTOP)

                return (EINVAL);
        sa = &vec;
        if (uap->osa) {
                return (EINVAL);
        sa = &vec;
        if (uap->osa) {

-               sa->sa_handler = ps->ps_sigact[sig];
-               sa->sa_mask = ps->ps_catchmask[sig];
-               bit = sigmask(sig);
+               sa->sa_handler = ps->ps_sigact[signum];
+               sa->sa_mask = ps->ps_catchmask[signum];
+               bit = sigmask(signum);

                sa->sa_flags = 0;
                if ((ps->ps_sigonstack & bit) != 0)
                        sa->sa_flags |= SA_ONSTACK;
                if ((ps->ps_sigintr & bit) == 0)
                        sa->sa_flags |= SA_RESTART;
                sa->sa_flags = 0;
                if ((ps->ps_sigonstack & bit) != 0)
                        sa->sa_flags |= SA_ONSTACK;
                if ((ps->ps_sigintr & bit) == 0)
                        sa->sa_flags |= SA_RESTART;

-               if (p->p_flag & SNOCLDSTOP)
+               if (p->p_flag & P_NOCLDSTOP)

                        sa->sa_flags |= SA_NOCLDSTOP;
                if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
                    sizeof (vec)))
                        sa->sa_flags |= SA_NOCLDSTOP;
                if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
                    sizeof (vec)))


@@ -81,26 +114,26 @@ sigaction(p, uap, retval)
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))
                        return (error);
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))
                        return (error);

-               setsigvec(p, sig, sa);
+               setsigvec(p, signum, sa);

        }
        return (0);
 }
 
        }
        return (0);
 }
 

-setsigvec(p, sig, sa)
+setsigvec(p, signum, sa)

        register struct proc *p;
        register struct proc *p;

-       int sig;
+       int signum;

        register struct sigaction *sa;
 {
        register struct sigacts *ps = p->p_sigacts;
        register int bit;
 
        register struct sigaction *sa;
 {
        register struct sigacts *ps = p->p_sigacts;
        register int bit;
 

-       bit = sigmask(sig);
+       bit = sigmask(signum);

        /*
         * Change setting atomically.
         */
        (void) splhigh();
        /*
         * Change setting atomically.
         */
        (void) splhigh();

-       ps->ps_sigact[sig] = sa->sa_handler;
-       ps->ps_catchmask[sig] = sa->sa_mask &~ sigcantmask;
+       ps->ps_sigact[signum] = sa->sa_handler;
+       ps->ps_catchmask[signum] = sa->sa_mask &~ sigcantmask;

        if ((sa->sa_flags & SA_RESTART) == 0)
                ps->ps_sigintr |= bit;
        else
        if ((sa->sa_flags & SA_RESTART) == 0)
                ps->ps_sigintr |= bit;
        else


@@ -109,11 +142,17 @@ setsigvec(p, sig, sa)
                ps->ps_sigonstack |= bit;
        else
                ps->ps_sigonstack &= ~bit;
                ps->ps_sigonstack |= bit;
        else
                ps->ps_sigonstack &= ~bit;

-       if (sig == SIGCHLD) {
+#ifdef COMPAT_SUNOS
+       if (sa->sa_flags & SA_USERTRAMP)
+               ps->ps_usertramp |= bit;
+       else
+               ps->ps_usertramp &= ~bit;
+#endif
+       if (signum == SIGCHLD) {

                if (sa->sa_flags & SA_NOCLDSTOP)
                if (sa->sa_flags & SA_NOCLDSTOP)

-                       p->p_flag |= SNOCLDSTOP;
+                       p->p_flag |= P_NOCLDSTOP;

                else
                else

-                       p->p_flag &= ~SNOCLDSTOP;
+                       p->p_flag &= ~P_NOCLDSTOP;

        }
        /*
         * Set bit in p_sigignore for signals that are set to SIG_IGN,
        }
        /*
         * Set bit in p_sigignore for signals that are set to SIG_IGN,


@@ -122,9 +161,9 @@ setsigvec(p, sig, sa)
         * as we have to restart the process.
         */
        if (sa->sa_handler == SIG_IGN ||
         * as we have to restart the process.
         */
        if (sa->sa_handler == SIG_IGN ||

-           (sigprop[sig] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
-               p->p_sig &= ~bit;               /* never to be seen again */
-               if (sig != SIGCONT)
+           (sigprop[signum] & SA_IGNORE && sa->sa_handler == SIG_DFL)) {
+               p->p_siglist &= ~bit;           /* never to be seen again */
+               if (signum != SIGCONT)

                        p->p_sigignore |= bit;  /* easier in psignal */
                p->p_sigcatch &= ~bit;
        } else {
                        p->p_sigignore |= bit;  /* easier in psignal */
                p->p_sigcatch &= ~bit;
        } else {


@@ -174,7 +213,7 @@ execsigs(p)
                if (sigprop[nc] & SA_IGNORE) {
                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;
                if (sigprop[nc] & SA_IGNORE) {
                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;

-                       p->p_sig &= ~mask;
+                       p->p_siglist &= ~mask;

                }
                ps->ps_sigact[nc] = SIG_DFL;
        }
                }
                ps->ps_sigact[nc] = SIG_DFL;
        }


@@ -182,9 +221,10 @@ execsigs(p)
         * Reset stack state to the user stack.
         * Clear set of signals caught on the signal stack.
         */
         * Reset stack state to the user stack.
         * Clear set of signals caught on the signal stack.
         */

-       ps->ps_onstack = 0;
-       ps->ps_sigsp = 0;
-       ps->ps_sigonstack = 0;
+       ps->ps_sigstk.ss_flags = SA_DISABLE;
+       ps->ps_sigstk.ss_size = 0;
+       ps->ps_sigstk.ss_base = 0;
+       ps->ps_flags = 0;

 }
 
 /*
 }
 
 /*


@@ -193,12 +233,13 @@ execsigs(p)
  * and return old mask as return value;
  * the library stub does the rest.
  */
  * and return old mask as return value;
  * the library stub does the rest.
  */

+struct sigprocmask_args {
+       int     how;
+       sigset_t mask;
+};

 sigprocmask(p, uap, retval)
        register struct proc *p;
 sigprocmask(p, uap, retval)
        register struct proc *p;

-       struct args {
-               int     how;
-               sigset_t mask;
-       } *uap;
+       struct sigprocmask_args *uap;

        int *retval;
 {
        int error = 0;
        int *retval;
 {
        int error = 0;


@@ -227,52 +268,59 @@ sigprocmask(p, uap, retval)
        return (error);
 }
 
        return (error);
 }
 

+struct sigpending_args {
+       int     dummy;
+};

 /* ARGSUSED */
 sigpending(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 sigpending(p, uap, retval)
        struct proc *p;

-       void *uap;
+       struct sigpending_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 

-       *retval = p->p_sig;
+       *retval = p->p_siglist;

        return (0);
 }
 
        return (0);
 }
 

-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)

 /*
  * Generalized interface signal handler, 4.3-compatible.
  */
 /*
  * Generalized interface signal handler, 4.3-compatible.
  */

+struct osigvec_args {
+       int     signum;
+       struct  sigvec *nsv;
+       struct  sigvec *osv;
+};

 /* ARGSUSED */
 osigvec(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 osigvec(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     signo;
-               struct  sigvec *nsv;
-               struct  sigvec *osv;
-       } *uap;
+       register struct osigvec_args *uap;

        int *retval;
 {
        struct sigvec vec;
        register struct sigacts *ps = p->p_sigacts;
        register struct sigvec *sv;
        int *retval;
 {
        struct sigvec vec;
        register struct sigacts *ps = p->p_sigacts;
        register struct sigvec *sv;

-       register int sig;
+       register int signum;

        int bit, error;
 
        int bit, error;
 

-       sig = uap->signo;
-       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+       signum = uap->signum;
+       if (signum <= 0 || signum >= NSIG ||
+           signum == SIGKILL || signum == SIGSTOP)

                return (EINVAL);
        sv = &vec;
        if (uap->osv) {
                return (EINVAL);
        sv = &vec;
        if (uap->osv) {

-               *(sig_t *)&sv->sv_handler = ps->ps_sigact[sig];
-               sv->sv_mask = ps->ps_catchmask[sig];
-               bit = sigmask(sig);
+               *(sig_t *)&sv->sv_handler = ps->ps_sigact[signum];
+               sv->sv_mask = ps->ps_catchmask[signum];
+               bit = sigmask(signum);

                sv->sv_flags = 0;
                if ((ps->ps_sigonstack & bit) != 0)
                        sv->sv_flags |= SV_ONSTACK;
                if ((ps->ps_sigintr & bit) != 0)
                        sv->sv_flags |= SV_INTERRUPT;
                sv->sv_flags = 0;
                if ((ps->ps_sigonstack & bit) != 0)
                        sv->sv_flags |= SV_ONSTACK;
                if ((ps->ps_sigintr & bit) != 0)
                        sv->sv_flags |= SV_INTERRUPT;

-               if (p->p_flag & SNOCLDSTOP)
+#ifndef COMPAT_SUNOS
+               if (p->p_flag & P_NOCLDSTOP)

                        sv->sv_flags |= SA_NOCLDSTOP;
                        sv->sv_flags |= SA_NOCLDSTOP;

+#endif

                if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
                    sizeof (vec)))
                        return (error);
                if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
                    sizeof (vec)))
                        return (error);


@@ -281,17 +329,28 @@ osigvec(p, uap, retval)
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))
                        return (error);
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))
                        return (error);

+#ifdef COMPAT_SUNOS
+               /*
+                * SunOS uses this bit (4, aka SA_DISABLE) as SV_RESETHAND,
+                * `reset to SIG_DFL on delivery'. We have no such option
+                * now or ever!
+                */
+               if (sv->sv_flags & SA_DISABLE)
+                       return (EINVAL);
+               sv->sv_flags |= SA_USERTRAMP;
+#endif

                sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */
                sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */

-               setsigvec(p, sig, (struct sigaction *)sv);
+               setsigvec(p, signum, (struct sigaction *)sv);

        }
        return (0);
 }
 
        }
        return (0);
 }
 

+struct osigblock_args {
+       int     mask;
+};

 osigblock(p, uap, retval)
        register struct proc *p;
 osigblock(p, uap, retval)
        register struct proc *p;

-       struct args {
-               int     mask;
-       } *uap;
+       struct osigblock_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 


@@ -302,11 +361,12 @@ osigblock(p, uap, retval)
        return (0);
 }
 
        return (0);
 }
 

+struct osigsetmask_args {
+       int     mask;
+};

 osigsetmask(p, uap, retval)
        struct proc *p;
 osigsetmask(p, uap, retval)
        struct proc *p;

-       struct args {
-               int     mask;
-       } *uap;
+       struct osigsetmask_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 


@@ -316,19 +376,20 @@ osigsetmask(p, uap, retval)
        (void) spl0();
        return (0);
 }
        (void) spl0();
        return (0);
 }

-#endif
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /*
  * Suspend process until signal, providing mask to be set
  * in the meantime.  Note nonstandard calling convention:
  * libc stub passes mask, not pointer, to save a copyin.
  */
 
 /*
  * Suspend process until signal, providing mask to be set
  * in the meantime.  Note nonstandard calling convention:
  * libc stub passes mask, not pointer, to save a copyin.
  */

+struct sigsuspend_args {
+       sigset_t mask;
+};

 /* ARGSUSED */
 sigsuspend(p, uap, retval)
        register struct proc *p;
 /* ARGSUSED */
 sigsuspend(p, uap, retval)
        register struct proc *p;

-       struct args {
-               sigset_t mask;
-       } *uap;
+       struct sigsuspend_args *uap;

        int *retval;
 {
        register struct sigacts *ps = p->p_sigacts;
        int *retval;
 {
        register struct sigacts *ps = p->p_sigacts;


@@ -337,98 +398,149 @@ sigsuspend(p, uap, retval)
         * When returning from sigpause, we want
         * the old mask to be restored after the
         * signal handler has finished.  Thus, we
         * When returning from sigpause, we want
         * the old mask to be restored after the
         * signal handler has finished.  Thus, we

-        * save it here and mark the proc structure
-        * to indicate this (should be in sigacts).
+        * save it here and mark the sigacts structure
+        * to indicate this.

         */
        ps->ps_oldmask = p->p_sigmask;
         */
        ps->ps_oldmask = p->p_sigmask;

-       ps->ps_flags |= SA_OLDMASK;
+       ps->ps_flags |= SAS_OLDMASK;

        p->p_sigmask = uap->mask &~ sigcantmask;
        p->p_sigmask = uap->mask &~ sigcantmask;

-       (void) tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0);
+       while (tsleep((caddr_t) ps, PPAUSE|PCATCH, "pause", 0) == 0)
+               /* void */;

        /* always return EINTR rather than ERESTART... */
        return (EINTR);
 }
 
        /* always return EINTR rather than ERESTART... */
        return (EINTR);
 }
 

+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct osigstack_args {
+       struct  sigstack *nss;
+       struct  sigstack *oss;
+};

 /* ARGSUSED */
 /* ARGSUSED */

-sigstack(p, uap, retval)
+osigstack(p, uap, retval)

        struct proc *p;
        struct proc *p;

-       register struct args {
-               struct  sigstack *nss;
-               struct  sigstack *oss;
-       } *uap;
+       register struct osigstack_args *uap;

        int *retval;
 {
        struct sigstack ss;
        int *retval;
 {
        struct sigstack ss;

+       struct sigacts *psp;

        int error = 0;
 
        int error = 0;
 

-       if (uap->oss && (error = copyout((caddr_t)&p->p_sigacts->ps_sigstack,
-           (caddr_t)uap->oss, sizeof (struct sigstack))))
+       psp = p->p_sigacts;
+       ss.ss_sp = psp->ps_sigstk.ss_base;
+       ss.ss_onstack = psp->ps_sigstk.ss_flags & SA_ONSTACK;
+       if (uap->oss && (error = copyout((caddr_t)&ss, (caddr_t)uap->oss,
+           sizeof (struct sigstack))))

                return (error);
        if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
                return (error);
        if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,

-           sizeof (ss))) == 0)
-               p->p_sigacts->ps_sigstack = ss;
+           sizeof (ss))) == 0) {
+               psp->ps_sigstk.ss_base = ss.ss_sp;
+               psp->ps_sigstk.ss_size = 0;
+               psp->ps_sigstk.ss_flags |= ss.ss_onstack & SA_ONSTACK;
+               psp->ps_flags |= SAS_ALTSTACK;
+       }

        return (error);
 }
        return (error);
 }

+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 

+struct sigaltstack_args {
+       struct  sigaltstack *nss;
+       struct  sigaltstack *oss;
+};
+/* ARGSUSED */
+sigaltstack(p, uap, retval)
+       struct proc *p;
+       register struct sigaltstack_args *uap;
+       int *retval;
+{
+       struct sigacts *psp;
+       struct sigaltstack ss;
+       int error;
+
+       psp = p->p_sigacts;
+       if ((psp->ps_flags & SAS_ALTSTACK) == 0)
+               psp->ps_sigstk.ss_flags |= SA_DISABLE;
+       if (uap->oss && (error = copyout((caddr_t)&psp->ps_sigstk,
+           (caddr_t)uap->oss, sizeof (struct sigaltstack))))
+               return (error);
+       if (uap->nss == 0)
+               return (0);
+       if (error = copyin((caddr_t)uap->nss, (caddr_t)&ss, sizeof (ss)))
+               return (error);
+       if (ss.ss_flags & SA_DISABLE) {
+               if (psp->ps_sigstk.ss_flags & SA_ONSTACK)
+                       return (EINVAL);
+               psp->ps_flags &= ~SAS_ALTSTACK;
+               psp->ps_sigstk.ss_flags = ss.ss_flags;
+               return (0);
+       }
+       if (ss.ss_size < MINSIGSTKSZ)
+               return (ENOMEM);
+       psp->ps_flags |= SAS_ALTSTACK;
+       psp->ps_sigstk= ss;
+       return (0);
+}
+
+struct kill_args {
+       int     pid;
+       int     signum;
+};

 /* ARGSUSED */
 kill(cp, uap, retval)
        register struct proc *cp;
 /* ARGSUSED */
 kill(cp, uap, retval)
        register struct proc *cp;

-       register struct args {
-               int     pid;
-               int     signo;
-       } *uap;
+       register struct kill_args *uap;

        int *retval;
 {
        register struct proc *p;
        register struct pcred *pc = cp->p_cred;
 
        int *retval;
 {
        register struct proc *p;
        register struct pcred *pc = cp->p_cred;
 

-       if ((unsigned) uap->signo >= NSIG)
+       if ((u_int)uap->signum >= NSIG)

                return (EINVAL);
        if (uap->pid > 0) {
                /* kill single process */
                return (EINVAL);
        if (uap->pid > 0) {
                /* kill single process */

-               p = pfind(uap->pid);
-               if (p == 0)
+               if ((p = pfind(uap->pid)) == NULL)

                        return (ESRCH);
                        return (ESRCH);

-               if (!CANSIGNAL(cp, pc, p, uap->signo))
+               if (!CANSIGNAL(cp, pc, p, uap->signum))

                        return (EPERM);
                        return (EPERM);

-               if (uap->signo)
-                       psignal(p, uap->signo);
+               if (uap->signum)
+                       psignal(p, uap->signum);

                return (0);
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */
                return (0);
        }
        switch (uap->pid) {
        case -1:                /* broadcast signal */

-               return (killpg1(cp, uap->signo, 0, 1));
+               return (killpg1(cp, uap->signum, 0, 1));

        case 0:                 /* signal own process group */
        case 0:                 /* signal own process group */

-               return (killpg1(cp, uap->signo, 0, 0));
+               return (killpg1(cp, uap->signum, 0, 0));

        default:                /* negative explicit process group */
        default:                /* negative explicit process group */

-               return (killpg1(cp, uap->signo, -uap->pid, 0));
+               return (killpg1(cp, uap->signum, -uap->pid, 0));

        }
        /* NOTREACHED */
 }
 
        }
        /* NOTREACHED */
 }
 

-#ifdef COMPAT_43
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct okillpg_args {
+       int     pgid;
+       int     signum;
+};

 /* ARGSUSED */
 okillpg(p, uap, retval)
        struct proc *p;
 /* ARGSUSED */
 okillpg(p, uap, retval)
        struct proc *p;

-       register struct args {
-               int     pgid;
-               int     signo;
-       } *uap;
+       register struct okillpg_args *uap;

        int *retval;
 {
 
        int *retval;
 {
 

-       if ((unsigned) uap->signo >= NSIG)
+       if ((u_int)uap->signum >= NSIG)

                return (EINVAL);
                return (EINVAL);

-       return (killpg1(p, uap->signo, uap->pgid, 0));
+       return (killpg1(p, uap->signum, uap->pgid, 0));

 }
 }

-#endif
+#endif /* COMPAT_43 || COMPAT_SUNOS */

 
 /*
  * Common code for kill process group/broadcast kill.
  * cp is calling process.
  */
 
 /*
  * Common code for kill process group/broadcast kill.
  * cp is calling process.
  */

-killpg1(cp, signo, pgid, all)
+killpg1(cp, signum, pgid, all)

        register struct proc *cp;
        register struct proc *cp;

-       int signo, pgid, all;
+       int signum, pgid, all;

 {
        register struct proc *p;
        register struct pcred *pc = cp->p_cred;
 {
        register struct proc *p;
        register struct pcred *pc = cp->p_cred;


@@ -439,13 +551,13 @@ killpg1(cp, signo, pgid, all)
                /* 
                 * broadcast 
                 */
                /* 
                 * broadcast 
                 */

-               for (p = allproc; p != NULL; p = p->p_nxt) {
-                       if (p->p_pid <= 1 || p->p_flag&SSYS || 
-                           p == cp || !CANSIGNAL(cp, pc, p, signo))
+               for (p = (struct proc *)allproc; p != NULL; p = p->p_next) {
+                       if (p->p_pid <= 1 || p->p_flag & P_SYSTEM || 
+                           p == cp || !CANSIGNAL(cp, pc, p, signum))

                                continue;
                        nfound++;
                                continue;
                        nfound++;

-                       if (signo)
-                               psignal(p, signo);
+                       if (signum)
+                               psignal(p, signum);

                }
        else {
                if (pgid == 0)          
                }
        else {
                if (pgid == 0)          


@@ -459,48 +571,46 @@ killpg1(cp, signo, pgid, all)
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {

-                       if (p->p_pid <= 1 || p->p_flag&SSYS ||
-                           !CANSIGNAL(cp, pc, p, signo))
+                       if (p->p_pid <= 1 || p->p_flag & P_SYSTEM ||
+                           p->p_stat == SZOMB ||
+                           !CANSIGNAL(cp, pc, p, signum))

                                continue;
                        nfound++;
                                continue;
                        nfound++;

-                       if (signo)
-                               psignal(p, signo);
+                       if (signum)
+                               psignal(p, signum);

                }
        }
        return (nfound ? 0 : ESRCH);
 }
 
 /*
                }
        }
        return (nfound ? 0 : ESRCH);
 }
 
 /*

- * Send the specified signal to
- * all processes with 'pgid' as
- * process group.
+ * Send a signal to a process group.

  */
 void
  */
 void

-gsignal(pgid, sig)
-       int pgid, sig;
+gsignal(pgid, signum)
+       int pgid, signum;

 {
        struct pgrp *pgrp;
 
        if (pgid && (pgrp = pgfind(pgid)))
 {
        struct pgrp *pgrp;
 
        if (pgid && (pgrp = pgfind(pgid)))

-               pgsignal(pgrp, sig, 0);
+               pgsignal(pgrp, signum, 0);

 }
 
 /*
 }
 
 /*

- * Send sig to every member of a process group.
- * If checktty is 1, limit to members which have a controlling
- * terminal.
+ * Send a signal to a  process group.  If checktty is 1,
+ * limit to members which have a controlling terminal.

  */
 void
  */
 void

-pgsignal(pgrp, sig, checkctty)
+pgsignal(pgrp, signum, checkctty)

        struct pgrp *pgrp;
        struct pgrp *pgrp;

-       int sig, checkctty;
+       int signum, checkctty;

 {
        register struct proc *p;
 
        if (pgrp)
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)
 {
        register struct proc *p;
 
        if (pgrp)
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)

-                       if (checkctty == 0 || p->p_flag&SCTTY)
-                               psignal(p, sig);
+                       if (checkctty == 0 || p->p_flag & P_CONTROLT)
+                               psignal(p, signum);

 }
 
 /*
 }
 
 /*


@@ -509,61 +619,62 @@ pgsignal(pgrp, sig, checkctty)
  * Otherwise, post it normally.
  */
 void
  * Otherwise, post it normally.
  */
 void

-trapsignal(p, sig, code)
+trapsignal(p, signum, code)

        struct proc *p;
        struct proc *p;

-       register int sig;
-       unsigned code;
+       register int signum;
+       u_int code;

 {
        register struct sigacts *ps = p->p_sigacts;
        int mask;
 
 {
        register struct sigacts *ps = p->p_sigacts;
        int mask;
 

-       mask = sigmask(sig);
-       if ((p->p_flag & STRC) == 0 && (p->p_sigcatch & mask) != 0 &&
+       mask = sigmask(signum);
+       if ((p->p_flag & P_TRACED) == 0 && (p->p_sigcatch & mask) != 0 &&

            (p->p_sigmask & mask) == 0) {
                p->p_stats->p_ru.ru_nsignals++;
 #ifdef KTRACE
                if (KTRPOINT(p, KTR_PSIG))
            (p->p_sigmask & mask) == 0) {
                p->p_stats->p_ru.ru_nsignals++;
 #ifdef KTRACE
                if (KTRPOINT(p, KTR_PSIG))

-                       ktrpsig(p->p_tracep, sig, ps->ps_sigact[sig], 
+                       ktrpsig(p->p_tracep, signum, ps->ps_sigact[signum], 

                                p->p_sigmask, code);
 #endif
                                p->p_sigmask, code);
 #endif

-               sendsig(ps->ps_sigact[sig], sig, p->p_sigmask, code);
-               p->p_sigmask |= ps->ps_catchmask[sig] | mask;
+               sendsig(ps->ps_sigact[signum], signum, p->p_sigmask, code);
+               p->p_sigmask |= ps->ps_catchmask[signum] | mask;

        } else {
                ps->ps_code = code;     /* XXX for core dump/debugger */
        } else {
                ps->ps_code = code;     /* XXX for core dump/debugger */

-               psignal(p, sig);
+               psignal(p, signum);

        }
 }
 
 /*
        }
 }
 
 /*

- * Send the specified signal to the specified process.
- * If the signal has an action, the action is usually performed
- * by the target process rather than the caller; we simply add
+ * Send the signal to the process.  If the signal has an action, the action
+ * is usually performed by the target process rather than the caller; we add

  * the signal to the set of pending signals for the process.
  * the signal to the set of pending signals for the process.

+ *

  * Exceptions:
  * Exceptions:

- *   o When a stop signal is sent to a sleeping process that takes the default
- *     action, the process is stopped without awakening it.
+ *   o When a stop signal is sent to a sleeping process that takes the
+ *     default action, the process is stopped without awakening it.

  *   o SIGCONT restarts stopped processes (or puts them back to sleep)
  *     regardless of the signal action (eg, blocked or ignored).
  *   o SIGCONT restarts stopped processes (or puts them back to sleep)
  *     regardless of the signal action (eg, blocked or ignored).

+ *

  * Other ignored signals are discarded immediately.
  */
 void
  * Other ignored signals are discarded immediately.
  */
 void

-psignal(p, sig)
+psignal(p, signum)

        register struct proc *p;
        register struct proc *p;

-       register int sig;
+       register int signum;

 {
        register int s, prop;
        register sig_t action;
        int mask;
 
 {
        register int s, prop;
        register sig_t action;
        int mask;
 

-       if ((unsigned)sig >= NSIG || sig == 0)
-               panic("psignal sig");
-       mask = sigmask(sig);
-       prop = sigprop[sig];
+       if ((u_int)signum >= NSIG || signum == 0)
+               panic("psignal signal number");
+       mask = sigmask(signum);
+       prop = sigprop[signum];

 
        /*
         * If proc is traced, always give parent a chance.
         */
 
        /*
         * If proc is traced, always give parent a chance.
         */

-       if (p->p_flag & STRC)
+       if (p->p_flag & P_TRACED)

                action = SIG_DFL;
        else {
                /*
                action = SIG_DFL;
        else {
                /*


@@ -583,12 +694,12 @@ psignal(p, sig)
                        action = SIG_DFL;
        }
 
                        action = SIG_DFL;
        }
 

-       if (p->p_nice > NZERO && (sig == SIGKILL ||
-           sig == SIGTERM && (p->p_flag&STRC || action != SIG_DFL)))
+       if (p->p_nice > NZERO && action == SIG_DFL && (prop & SA_KILL) &&
+           (p->p_flag & P_TRACED) == 0)

                p->p_nice = NZERO;
 
        if (prop & SA_CONT)
                p->p_nice = NZERO;
 
        if (prop & SA_CONT)

-               p->p_sig &= ~stopsigmask;
+               p->p_siglist &= ~stopsigmask;

 
        if (prop & SA_STOP) {
                /*
 
        if (prop & SA_STOP) {
                /*


@@ -600,9 +711,9 @@ psignal(p, sig)
                if (prop & SA_TTYSTOP && p->p_pgrp->pg_jobc == 0 &&
                    action == SIG_DFL)
                        return;
                if (prop & SA_TTYSTOP && p->p_pgrp->pg_jobc == 0 &&
                    action == SIG_DFL)
                        return;

-               p->p_sig &= ~contsigmask;
+               p->p_siglist &= ~contsigmask;

        }
        }

-       p->p_sig |= mask;
+       p->p_siglist |= mask;

 
        /*
         * Defer further processing for signals which are held,
 
        /*
         * Defer further processing for signals which are held,


@@ -620,15 +731,24 @@ psignal(p, sig)
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */

-               if ((p->p_flag & SSINTR) == 0)
+               if ((p->p_flag & P_SINTR) == 0)

                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable

-                * so it can discover the signal in issig() and stop
+                * so it can discover the signal in issignal() and stop

                 * for the parent.
                 */
                 * for the parent.
                 */

-               if (p->p_flag&STRC)
+               if (p->p_flag & P_TRACED)

                        goto run;
                        goto run;

+               /*
+                * If SIGCONT is default (or ignored) and process is
+                * asleep, we are finished; the process should not
+                * be awakened.
+                */
+               if ((prop & SA_CONT) && action == SIG_DFL) {
+                       p->p_siglist &= ~mask;
+                       goto out;
+               }

                /*
                 * When a sleeping process receives a stop
                 * signal, process immediately if possible.
                /*
                 * When a sleeping process receives a stop
                 * signal, process immediately if possible.


@@ -642,11 +762,11 @@ psignal(p, sig)
                         * If a child holding parent blocked,
                         * stopping could cause deadlock.
                         */
                         * If a child holding parent blocked,
                         * stopping could cause deadlock.
                         */

-                       if (p->p_flag&SPPWAIT)
+                       if (p->p_flag & P_PPWAIT)

                                goto out;
                                goto out;

-                       p->p_sig &= ~mask;
-                       p->p_xstat = sig;
-                       if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                       p->p_siglist &= ~mask;
+                       p->p_xstat = signum;
+                       if ((p->p_pptr->p_flag & P_NOCLDSTOP) == 0)

                                psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        goto out;
                                psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        goto out;


@@ -659,28 +779,28 @@ psignal(p, sig)
                 * If traced process is already stopped,
                 * then no further action is necessary.
                 */
                 * If traced process is already stopped,
                 * then no further action is necessary.
                 */

-               if (p->p_flag&STRC)
+               if (p->p_flag & P_TRACED)

                        goto out;
 
                /*
                 * Kill signal always sets processes running.
                 */
                        goto out;
 
                /*
                 * Kill signal always sets processes running.
                 */

-               if (sig == SIGKILL)
+               if (signum == SIGKILL)

                        goto runfast;
 
                if (prop & SA_CONT) {
                        /*
                        goto runfast;
 
                if (prop & SA_CONT) {
                        /*

-                        * If SIGCONT is default (or ignored), we continue
-                        * the process but don't leave the signal in p_sig,
-                        * as it has no further action.  If SIGCONT is held,
-                        * continue the process and leave the signal in p_sig.
-                        * If the process catches SIGCONT, let it handle
-                        * the signal itself.  If it isn't waiting on
+                        * If SIGCONT is default (or ignored), we continue the
+                        * process but don't leave the signal in p_siglist, as
+                        * it has no further action.  If SIGCONT is held, we
+                        * continue the process and leave the signal in
+                        * p_siglist.  If the process catches SIGCONT, let it
+                        * handle the signal itself.  If it isn't waiting on

                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */
                        if (action == SIG_DFL)
                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */
                        if (action == SIG_DFL)

-                               p->p_sig &= ~mask;
+                               p->p_siglist &= ~mask;

                        if (action == SIG_CATCH)
                                goto runfast;
                        if (p->p_wchan == 0)
                        if (action == SIG_CATCH)
                                goto runfast;
                        if (p->p_wchan == 0)


@@ -694,17 +814,17 @@ psignal(p, sig)
                         * Already stopped, don't need to stop again.
                         * (If we did the shell could get confused.)
                         */
                         * Already stopped, don't need to stop again.
                         * (If we did the shell could get confused.)
                         */

-                       p->p_sig &= ~mask;              /* take it away */
+                       p->p_siglist &= ~mask;          /* take it away */

                        goto out;
                }
 
                /*
                        goto out;
                }
 
                /*

-                * If process is sleeping interruptibly, then
-                * simulate a wakeup so that when it is continued,
-                * it will be made runnable and can look at the signal.
-                * But don't setrun the process, leave it stopped.
+                * If process is sleeping interruptibly, then simulate a
+                * wakeup so that when it is continued, it will be made
+                * runnable and can look at the signal.  But don't make
+                * the process runnable, leave it stopped.

                 */
                 */

-               if (p->p_wchan && p->p_flag & SSINTR)
+               if (p->p_wchan && p->p_flag & P_SINTR)

                        unsleep(p);
                goto out;
 
                        unsleep(p);
                goto out;
 


@@ -724,68 +844,66 @@ runfast:
        /*
         * Raise priority to at least PUSER.
         */
        /*
         * Raise priority to at least PUSER.
         */

-       if (p->p_pri > PUSER)
-               p->p_pri = PUSER;
+       if (p->p_priority > PUSER)
+               p->p_priority = PUSER;

 run:
 run:

-       setrun(p);
+       setrunnable(p);

 out:
        splx(s);
 }
 
 /*
 out:
        splx(s);
 }
 
 /*

- * If the current process has a signal to process (should be caught
- * or cause termination, should interrupt current syscall),
- * return the signal number.  Stop signals with default action
- * are processed immediately, then cleared; they aren't returned.
- * This is checked after each entry to the system for a syscall
- * or trap (though this can usually be done without actually calling
- * issig by checking the pending signal masks in the CURSIG macro.)
- * The normal call sequence is
+ * If the current process has received a signal (should be caught or cause
+ * termination, should interrupt current syscall), return the signal number.
+ * Stop signals with default action are processed immediately, then cleared;
+ * they aren't returned.  This is checked after each entry to the system for
+ * a syscall or trap (though this can usually be done without calling issignal
+ * by checking the pending signal masks in the CURSIG macro.) The normal call
+ * sequence is

  *
  *

- *     while (sig = CURSIG(curproc))
- *             psig(sig);
+ *     while (signum = CURSIG(curproc))
+ *             postsig(signum);

  */
  */

-issig(p)
+issignal(p)

        register struct proc *p;
 {
        register struct proc *p;
 {

-       register int sig, mask, prop;
+       register int signum, mask, prop;

 
        for (;;) {
 
        for (;;) {

-               mask = p->p_sig &~ p->p_sigmask;
-               if (p->p_flag&SPPWAIT)
+               mask = p->p_siglist & ~p->p_sigmask;
+               if (p->p_flag & P_PPWAIT)

                        mask &= ~stopsigmask;
                if (mask == 0)          /* no signal to send */
                        return (0);
                        mask &= ~stopsigmask;
                if (mask == 0)          /* no signal to send */
                        return (0);

-               sig = ffs((long)mask);
-               mask = sigmask(sig);
-               prop = sigprop[sig];
+               signum = ffs((long)mask);
+               mask = sigmask(signum);
+               prop = sigprop[signum];

                /*
                 * We should see pending but ignored signals
                /*
                 * We should see pending but ignored signals

-                * only if STRC was on when they were posted.
+                * only if P_TRACED was on when they were posted.

                 */
                 */

-               if (mask & p->p_sigignore && (p->p_flag&STRC) == 0) {
-                       p->p_sig &= ~mask;
+               if (mask & p->p_sigignore && (p->p_flag & P_TRACED) == 0) {
+                       p->p_siglist &= ~mask;

                        continue;
                }
                        continue;
                }

-               if (p->p_flag&STRC && (p->p_flag&SPPWAIT) == 0) {
+               if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) {

                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */
                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */

-                       p->p_xstat = sig;
+                       p->p_xstat = signum;

                        psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);
                        psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);

-                               swtch();
-                       } while (!procxmt(p) && p->p_flag&STRC);
+                               mi_switch();
+                       } while (!trace_req(p) && p->p_flag & P_TRACED);

 
                        /*
 
                        /*

-                        * If the traced bit got turned off,
-                        * go back up to the top to rescan signals.
-                        * This ensures that p_sig* and ps_sigact
-                        * are consistent.
+                        * If the traced bit got turned off, go back up
+                        * to the top to rescan signals.  This ensures
+                        * that p_sig* and ps_sigact are consistent.

                         */
                         */

-                       if ((p->p_flag&STRC) == 0)
+                       if ((p->p_flag & P_TRACED) == 0)

                                continue;
 
                        /*
                                continue;
 
                        /*


@@ -793,18 +911,17 @@ issig(p)
                         * then it will leave it in p->p_xstat;
                         * otherwise we just look for signals again.
                         */
                         * then it will leave it in p->p_xstat;
                         * otherwise we just look for signals again.
                         */

-                       p->p_sig &= ~mask;      /* clear the old signal */
-                       sig = p->p_xstat;
-                       if (sig == 0)
+                       p->p_siglist &= ~mask;  /* clear the old signal */
+                       signum = p->p_xstat;
+                       if (signum == 0)

                                continue;
 
                        /*
                                continue;
 
                        /*

-                        * Put the new signal into p_sig.
-                        * If signal is being masked,
-                        * look for other signals.
+                        * Put the new signal into p_siglist.  If the
+                        * signal is being masked, look for other signals.

                         */
                         */

-                       mask = sigmask(sig);
-                       p->p_sig |= mask;
+                       mask = sigmask(signum);
+                       p->p_siglist |= mask;

                        if (p->p_sigmask & mask)
                                continue;
                }
                        if (p->p_sigmask & mask)
                                continue;
                }


@@ -814,14 +931,23 @@ issig(p)
                 * Return the signal's number, or fall through
                 * to clear it from the pending mask.
                 */
                 * Return the signal's number, or fall through
                 * to clear it from the pending mask.
                 */

-               switch ((int)p->p_sigacts->ps_sigact[sig]) {
+               switch ((int)p->p_sigacts->ps_sigact[signum]) {

 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */
 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */

-                       if (p->p_pid <= 1)
+                       if (p->p_pid <= 1) {
+#ifdef DIAGNOSTIC
+                               /*
+                                * Are you sure you want to ignore SIGSEGV
+                                * in init? XXX
+                                */
+                               printf("Process (pid %d) got signal %d\n",
+                                       p->p_pid, signum);
+#endif

                                break;          /* == ignore */
                                break;          /* == ignore */

+                       }

                        /*
                         * If there is a pending stop signal to process
                         * with default action, stop here,
                        /*
                         * If there is a pending stop signal to process
                         * with default action, stop here,


@@ -830,15 +956,15 @@ issig(p)
                         * process group, ignore tty stop signals.
                         */
                        if (prop & SA_STOP) {
                         * process group, ignore tty stop signals.
                         */
                        if (prop & SA_STOP) {

-                               if (p->p_flag&STRC ||
+                               if (p->p_flag & P_TRACED ||

                                    (p->p_pgrp->pg_jobc == 0 &&
                                    prop & SA_TTYSTOP))
                                        break;  /* == ignore */
                                    (p->p_pgrp->pg_jobc == 0 &&
                                    prop & SA_TTYSTOP))
                                        break;  /* == ignore */

-                               p->p_xstat = sig;
+                               p->p_xstat = signum;

                                stop(p);
                                stop(p);

-                               if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                               if ((p->p_pptr->p_flag & P_NOCLDSTOP) == 0)

                                        psignal(p->p_pptr, SIGCHLD);
                                        psignal(p->p_pptr, SIGCHLD);

-                               swtch();
+                               mi_switch();

                                break;
                        } else if (prop & SA_IGNORE) {
                                /*
                                break;
                        } else if (prop & SA_IGNORE) {
                                /*


@@ -847,7 +973,7 @@ issig(p)
                                 */
                                break;          /* == ignore */
                        } else
                                 */
                                break;          /* == ignore */
                        } else

-                               return (sig);
+                               return (signum);

                        /*NOTREACHED*/
 
                case SIG_IGN:
                        /*NOTREACHED*/
 
                case SIG_IGN:


@@ -856,34 +982,34 @@ issig(p)
                         * to take action on an ignored signal other
                         * than SIGCONT, unless process is traced.
                         */
                         * to take action on an ignored signal other
                         * than SIGCONT, unless process is traced.
                         */

-                       if ((prop & SA_CONT) == 0 && (p->p_flag&STRC) == 0)
-                               printf("issig\n");
+                       if ((prop & SA_CONT) == 0 &&
+                           (p->p_flag & P_TRACED) == 0)
+                               printf("issignal\n");

                        break;          /* == ignore */
 
                default:
                        /*
                         * This signal has an action, let
                        break;          /* == ignore */
 
                default:
                        /*
                         * This signal has an action, let

-                        * psig process it.
+                        * postsig() process it.

                         */
                         */

-                       return (sig);
+                       return (signum);

                }
                }

-               p->p_sig &= ~mask;              /* take the signal! */
+               p->p_siglist &= ~mask;          /* take the signal! */

        }
        /* NOTREACHED */
 }
 
 /*
        }
        /* NOTREACHED */
 }
 
 /*

- * Put the argument process into the stopped
- * state and notify the parent via wakeup.
- * Signals are handled elsewhere.
- * The process must not be on the run queue.
+ * Put the argument process into the stopped state and notify the parent
+ * via wakeup.  Signals are handled elsewhere.  The process must not be
+ * on the run queue.

  */
 stop(p)
        register struct proc *p;
 {
 
        p->p_stat = SSTOP;
  */
 stop(p)
        register struct proc *p;
 {
 
        p->p_stat = SSTOP;

-       p->p_flag &= ~SWTED;
+       p->p_flag &= ~P_WAITED;

        wakeup((caddr_t)p->p_pptr);
 }
 
        wakeup((caddr_t)p->p_pptr);
 }
 


@@ -892,24 +1018,25 @@ stop(p)
  * from the current set of pending signals.
  */
 void
  * from the current set of pending signals.
  */
 void

-psig(sig)
-       register int sig;
+postsig(signum)
+       register int signum;

 {
        register struct proc *p = curproc;
        register struct sigacts *ps = p->p_sigacts;
        register sig_t action;
 {
        register struct proc *p = curproc;
        register struct sigacts *ps = p->p_sigacts;
        register sig_t action;

-       int mask, returnmask;
+       int code, mask, returnmask;

 
 #ifdef DIAGNOSTIC
 
 #ifdef DIAGNOSTIC

-       if (sig == 0)
-               panic("psig");
+       if (signum == 0)
+               panic("postsig");

 #endif
 #endif

-       mask = sigmask(sig);
-       p->p_sig &= ~mask;
-       action = ps->ps_sigact[sig];
+       mask = sigmask(signum);
+       p->p_siglist &= ~mask;
+       action = ps->ps_sigact[signum];

 #ifdef KTRACE
        if (KTRPOINT(p, KTR_PSIG))
 #ifdef KTRACE
        if (KTRPOINT(p, KTR_PSIG))

-               ktrpsig(p->p_tracep, sig, action, ps->ps_flags & SA_OLDMASK ?
+               ktrpsig(p->p_tracep,
+                   signum, action, ps->ps_flags & SAS_OLDMASK ?

                    ps->ps_oldmask : p->p_sigmask, 0);
 #endif
        if (action == SIG_DFL) {
                    ps->ps_oldmask : p->p_sigmask, 0);
 #endif
        if (action == SIG_DFL) {


@@ -917,7 +1044,7 @@ psig(sig)
                 * Default action, where the default is to kill
                 * the process.  (Other cases were ignored above.)
                 */
                 * Default action, where the default is to kill
                 * the process.  (Other cases were ignored above.)
                 */

-               sigexit(p, sig);
+               sigexit(p, signum);

                /* NOTREACHED */
        } else {
                /*
                /* NOTREACHED */
        } else {
                /*


@@ -925,7 +1052,7 @@ psig(sig)
                 */
 #ifdef DIAGNOSTIC
                if (action == SIG_IGN || (p->p_sigmask & mask))
                 */
 #ifdef DIAGNOSTIC
                if (action == SIG_IGN || (p->p_sigmask & mask))

-                       panic("psig action");
+                       panic("postsig action");

 #endif
                /*
                 * Set the new mask value and also defer further
 #endif
                /*
                 * Set the new mask value and also defer further


@@ -937,46 +1064,63 @@ psig(sig)
                 * restored after the signal processing is completed.
                 */
                (void) splhigh();
                 * restored after the signal processing is completed.
                 */
                (void) splhigh();

-               if (ps->ps_flags & SA_OLDMASK) {
+               if (ps->ps_flags & SAS_OLDMASK) {

                        returnmask = ps->ps_oldmask;
                        returnmask = ps->ps_oldmask;

-                       ps->ps_flags &= ~SA_OLDMASK;
+                       ps->ps_flags &= ~SAS_OLDMASK;

                } else
                        returnmask = p->p_sigmask;
                } else
                        returnmask = p->p_sigmask;

-               p->p_sigmask |= ps->ps_catchmask[sig] | mask;
+               p->p_sigmask |= ps->ps_catchmask[signum] | mask;

                (void) spl0();
                p->p_stats->p_ru.ru_nsignals++;
                (void) spl0();
                p->p_stats->p_ru.ru_nsignals++;

-               sendsig(action, sig, returnmask, 0);
+               if (ps->ps_sig != signum) {
+                       code = 0;
+               } else {
+                       code = ps->ps_code;
+                       ps->ps_code = 0;
+               }
+               sendsig(action, signum, returnmask, code);

        }
 }
 
 /*
        }
 }
 
 /*

- * Force the current process to exit with the specified
- * signal, dumping core if appropriate.  We bypass the normal
- * tests for masked and caught signals, allowing unrecoverable
- * failures to terminate the process without changing signal state.
- * Mark the accounting record with the signal termination.
- * If dumping core, save the signal number for the debugger.
- * Calls exit and does not return.
+ * Kill the current process for stated reason.

  */
  */

-sigexit(p, sig)
+killproc(p, why)
+       struct proc *p;
+       char *why;
+{
+
+       log(LOG_ERR, "pid %d was killed: %s\n", p->p_pid, why);
+       uprintf("sorry, pid %d was killed: %s\n", p->p_pid, why);
+       psignal(p, SIGKILL);
+}
+
+/*
+ * Force the current process to exit with the specified signal, dumping core
+ * if appropriate.  We bypass the normal tests for masked and caught signals,
+ * allowing unrecoverable failures to terminate the process without changing
+ * signal state.  Mark the accounting record with the signal termination.
+ * If dumping core, save the signal number for the debugger.  Calls exit and
+ * does not return.
+ */
+sigexit(p, signum)

        register struct proc *p;
        register struct proc *p;

-       int sig;
+       int signum;

 {
 
        p->p_acflag |= AXSIG;
 {
 
        p->p_acflag |= AXSIG;

-       if (sigprop[sig] & SA_CORE) {
-               p->p_sigacts->ps_sig = sig;
+       if (sigprop[signum] & SA_CORE) {
+               p->p_sigacts->ps_sig = signum;

                if (coredump(p) == 0)
                if (coredump(p) == 0)

-                       sig |= WCOREFLAG;
+                       signum |= WCOREFLAG;

        }
        }

-       exit(p, W_EXITCODE(0, sig));
+       exit1(p, W_EXITCODE(0, signum));

        /* NOTREACHED */
 }
 
 /*
        /* NOTREACHED */
 }
 
 /*

- * Create a core dump.
- * The file name is "core.progname.pid".
- * Core dumps are not created if the process is setuid.
+ * Dump core, into a file named "progname.core", unless the process was
+ * setuid/setgid.

  */
 coredump(p)
        register struct proc *p;
  */
 coredump(p)
        register struct proc *p;


@@ -985,47 +1129,37 @@ coredump(p)
        register struct pcred *pcred = p->p_cred;
        register struct ucred *cred = pcred->pc_ucred;
        register struct vmspace *vm = p->p_vmspace;
        register struct pcred *pcred = p->p_cred;
        register struct ucred *cred = pcred->pc_ucred;
        register struct vmspace *vm = p->p_vmspace;

-       struct vattr vattr;
-       int error;

        struct nameidata nd;
        struct nameidata nd;

-       char name[MAXCOMLEN+12];        /* core.progname.pid */
+       struct vattr vattr;
+       int error, error1;
+       char name[MAXCOMLEN+6];         /* progname.core */

 
 

-       if (pcred->p_svuid != pcred->p_ruid ||
-           pcred->p_svgid != pcred->p_rgid)
+       if (pcred->p_svuid != pcred->p_ruid || pcred->p_svgid != pcred->p_rgid)

                return (EFAULT);
        if (ctob(UPAGES + vm->vm_dsize + vm->vm_ssize) >=
            p->p_rlimit[RLIMIT_CORE].rlim_cur)
                return (EFAULT);
                return (EFAULT);
        if (ctob(UPAGES + vm->vm_dsize + vm->vm_ssize) >=
            p->p_rlimit[RLIMIT_CORE].rlim_cur)
                return (EFAULT);

-       sprintf(name, "core.%s.%d", p->p_comm, p->p_pid);
-       nd.ni_dirp = name;
-       nd.ni_segflg = UIO_SYSSPACE;
-       if (error = vn_open(&nd, p, O_CREAT|FWRITE, 0644))
+       sprintf(name, "%s.core", p->p_comm);
+       NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, name, p);
+       if (error = vn_open(&nd,
+           O_CREAT | FWRITE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH))

                return (error);
        vp = nd.ni_vp;
                return (error);
        vp = nd.ni_vp;

-       if (vp->v_type != VREG || VOP_GETATTR(vp, &vattr, cred, p) ||
-           vattr.va_nlink != 1) {
-               vput(vp);
-               return (EFAULT);
+
+       /* Don't dump to non-regular files or files with links. */
+       if (vp->v_type != VREG ||
+           VOP_GETATTR(vp, &vattr, cred, p) || vattr.va_nlink != 1) {
+               error = EFAULT;
+               goto out;

        }
        VATTR_NULL(&vattr);
        vattr.va_size = 0;
        }
        VATTR_NULL(&vattr);
        vattr.va_size = 0;

+       LEASE_CHECK(vp, p, cred, LEASE_WRITE);

        VOP_SETATTR(vp, &vattr, cred, p);
        p->p_acflag |= ACORE;
        bcopy(p, &p->p_addr->u_kproc.kp_proc, sizeof(struct proc));
        fill_eproc(p, &p->p_addr->u_kproc.kp_eproc);
        VOP_SETATTR(vp, &vattr, cred, p);
        p->p_acflag |= ACORE;
        bcopy(p, &p->p_addr->u_kproc.kp_proc, sizeof(struct proc));
        fill_eproc(p, &p->p_addr->u_kproc.kp_eproc);

-#ifdef HPUXCOMPAT
-       /*
-        * BLETCH!  If we loaded from an HPUX format binary file
-        * we have to dump an HPUX style user struct so that the
-        * HPUX debuggers can grok it.
-        */
-       if (p->p_addr->u_pcb.pcb_flags & PCB_HPUXBIN)
-               error = hpuxdumpu(vp, cred);
-       else
-#endif
-       error = vn_rdwr(UIO_WRITE, vp, (caddr_t) p->p_addr, ctob(UPAGES),
-           (off_t)0, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, cred, (int *) NULL,
-           p);
+       error = cpu_coredump(p, vp, cred);

        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr,
                    (int)ctob(vm->vm_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,
        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr,
                    (int)ctob(vm->vm_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,


@@ -1036,7 +1170,11 @@ coredump(p)
                    round_page(ctob(vm->vm_ssize)),
                    (off_t)ctob(UPAGES) + ctob(vm->vm_dsize), UIO_USERSPACE,
                    IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);
                    round_page(ctob(vm->vm_ssize)),
                    (off_t)ctob(UPAGES) + ctob(vm->vm_dsize), UIO_USERSPACE,
                    IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);

-       vput(vp);
+out:
+       VOP_UNLOCK(vp);
+       error1 = vn_close(vp, FWRITE, cred, p);
+       if (error == 0)
+               error = error1;

        return (error);
 }
 
        return (error);
 }
 


@@ -1044,10 +1182,13 @@ coredump(p)
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */

+struct nosys_args {
+       int     dummy;
+};

 /* ARGSUSED */
 nosys(p, args, retval)
        struct proc *p;
 /* ARGSUSED */
 nosys(p, args, retval)
        struct proc *p;

-       void *args;
+       struct nosys_args *args;

        int *retval;
 {
 
        int *retval;
 {