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 12a9c41..3dcff92 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,129 +1,158 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989 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.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.14 (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

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "syscontext.h"        /* XXX */
-#include "vnode.h"
-#include "proc.h"
-#include "timeb.h"
-#include "times.h"
-#include "buf.h"
-#include "text.h"
-#include "seg.h"
-#include "vm.h"
-#include "acct.h"
-#include "uio.h"
-#include "file.h"
-#include "kernel.h"
-#include "wait.h"
-#include "ktrace.h"
-
-#include "machine/reg.h"
-#include "machine/pte.h"
-#include "machine/psl.h"
-#include "machine/mtpr.h"
-
-#define        stopsigmask     (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
-                       sigmask(SIGTTIN)|sigmask(SIGTTOU))
-#define defaultignmask (sigmask(SIGCONT)|sigmask(SIGIO)|sigmask(SIGURG)| \
-                       sigmask(SIGCHLD)|sigmask(SIGWINCH)|sigmask(SIGINFO))
+#define        SIGPROP         /* include signal properties table */
+#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 the current process (u.u_procp) send the specified signal
- * to the specified process?
+ * Can process p, with pcred pc, send the signal signum to process q?

  */
  */

-#define CANSIGNAL(p, signo) \
-       (u.u_uid == 0 || \
-           u.u_uid == (p)->p_uid || u.u_uid == (p)->p_ruid || \
-           u.u_procp->p_ruid == (p)->p_uid || \
-           u.u_procp->p_ruid == (p)->p_ruid || \
-           ((signo) == SIGCONT && (p)->p_session == u.u_procp->p_session))
-
-sigaction()
+#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 || \
+           ((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;
+       register struct sigaction_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     signo;
-               struct  sigaction *nsa;
-               struct  sigaction *osa;
-       } *uap = (struct a  *)u.u_ap;

        struct sigaction vec;
        register struct sigaction *sa;
        struct sigaction vec;
        register struct sigaction *sa;

-       register int sig;
+       register struct sigacts *ps = p->p_sigacts;
+       register int signum;

        int bit, error;
 
        int bit, error;
 

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

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

-               sa->sa_handler = u.u_signal[sig];
-               sa->sa_mask = u.u_sigmask[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;
                sa->sa_flags = 0;

-               if ((u.u_sigonstack & bit) != 0)
+               if ((ps->ps_sigonstack & bit) != 0)

                        sa->sa_flags |= SA_ONSTACK;
                        sa->sa_flags |= SA_ONSTACK;

-               if ((u.u_sigintr & bit) == 0)
+               if ((ps->ps_sigintr & bit) == 0)

                        sa->sa_flags |= SA_RESTART;
                        sa->sa_flags |= SA_RESTART;

-               if (u.u_procp->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)))

-                       RETURN (error);
+                       return (error);

        }
        if (uap->nsa) {
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))
        }
        if (uap->nsa) {
                if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
                    sizeof (vec)))

-                       RETURN (error);
-               setsigvec(sig, sa);
+                       return (error);
+               setsigvec(p, signum, sa);

        }
        }

-       RETURN (0);
+       return (0);

 }
 
 }
 

-setsigvec(sig, sa)
-       int sig;
+setsigvec(p, signum, sa)
+       register struct proc *p;
+       int signum;

        register struct sigaction *sa;
 {
        register struct sigaction *sa;
 {

-       register struct proc *p;
+       register struct sigacts *ps = p->p_sigacts;

        register int bit;
 
        register int bit;
 

-       bit = sigmask(sig);
-       p = u.u_procp;
+       bit = sigmask(signum);

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

-       u.u_signal[sig] = sa->sa_handler;
-       u.u_sigmask[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)
        if ((sa->sa_flags & SA_RESTART) == 0)

-               u.u_sigintr |= bit;
+               ps->ps_sigintr |= bit;

        else
        else

-               u.u_sigintr &= ~bit;
+               ps->ps_sigintr &= ~bit;

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

-               u.u_sigonstack |= bit;
+               ps->ps_sigonstack |= bit;

        else
        else

-               u.u_sigonstack &= ~bit;
-       if (sig == SIGCHLD) {
+               ps->ps_sigonstack &= ~bit;
+#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,


@@ -132,9 +161,9 @@ setsigvec(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 ||

-          (bit & defaultignmask && 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 {


@@ -151,19 +180,25 @@ setsigvec(sig, sa)
  * Initialize signal state for process 0;
  * set to ignore signals that are ignored by default.
  */
  * Initialize signal state for process 0;
  * set to ignore signals that are ignored by default.
  */

+void

 siginit(p)
        struct proc *p;
 {
 siginit(p)
        struct proc *p;
 {

+       register int i;

 
 

-       p->p_sigignore = defaultignmask &~ sigmask(SIGCONT);
+       for (i = 0; i < NSIG; i++)
+               if (sigprop[i] & SA_IGNORE && i != SIGCONT)
+                       p->p_sigignore |= sigmask(i);

 }
 
 /*
  * Reset signals for an exec of the specified process.
  */
 }
 
 /*
  * Reset signals for an exec of the specified process.
  */

+void

 execsigs(p)
        register struct proc *p;
 {
 execsigs(p)
        register struct proc *p;
 {

+       register struct sigacts *ps = p->p_sigacts;

        register int nc, mask;
 
        /*
        register int nc, mask;
 
        /*


@@ -175,20 +210,21 @@ execsigs(p)
                nc = ffs((long)p->p_sigcatch);
                mask = sigmask(nc);
                p->p_sigcatch &= ~mask;
                nc = ffs((long)p->p_sigcatch);
                mask = sigmask(nc);
                p->p_sigcatch &= ~mask;

-               if (mask & defaultignmask) {
+               if (sigprop[nc] & SA_IGNORE) {

                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;
                        if (nc != SIGCONT)
                                p->p_sigignore |= mask;

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

                }
                }

-               u.u_signal[nc] = SIG_DFL;
+               ps->ps_sigact[nc] = SIG_DFL;

        }
        /*
         * 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.
         */

-       u.u_onstack = 0;
-       u.u_sigsp = 0;
-       u.u_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;

 }
 
 /*
 }
 
 /*


@@ -197,16 +233,18 @@ 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.
  */

-sigprocmask()
+struct sigprocmask_args {
+       int     how;
+       sigset_t mask;
+};
+sigprocmask(p, uap, retval)
+       register struct proc *p;
+       struct sigprocmask_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     how;
-               sigset_t mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;

        int error = 0;
 
        int error = 0;
 

-       u.u_r.r_val1 = p->p_sigmask;
+       *retval = p->p_sigmask;

        (void) splhigh();
 
        switch (uap->how) {
        (void) splhigh();
 
        switch (uap->how) {


@@ -227,246 +265,352 @@ sigprocmask()
                break;
        }
        (void) spl0();
                break;
        }
        (void) spl0();

-       RETURN (error);
+       return (error);

 }
 
 }
 

-sigpending()
+struct sigpending_args {
+       int     dummy;
+};
+/* ARGSUSED */
+sigpending(p, uap, retval)
+       struct proc *p;
+       struct sigpending_args *uap;
+       int *retval;

 {
 
 {
 

-       u.u_r.r_val1 = u.u_procp->p_sig;
-       RETURN (0);
+       *retval = p->p_siglist;
+       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.
  */

-osigvec()
+struct osigvec_args {
+       int     signum;
+       struct  sigvec *nsv;
+       struct  sigvec *osv;
+};
+/* ARGSUSED */
+osigvec(p, uap, retval)
+       struct proc *p;
+       register struct osigvec_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     signo;
-               struct  sigvec *nsv;
-               struct  sigvec *osv;
-       } *uap = (struct a  *)u.u_ap;

        struct sigvec vec;
        struct sigvec vec;

+       register struct sigacts *ps = p->p_sigacts;

        register struct sigvec *sv;
        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)
-               RETURN (EINVAL);
+       signum = uap->signum;
+       if (signum <= 0 || signum >= NSIG ||
+           signum == SIGKILL || signum == SIGSTOP)
+               return (EINVAL);

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

-               *(sig_t *)&sv->sv_handler = u.u_signal[sig];
-               sv->sv_mask = u.u_sigmask[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;
                sv->sv_flags = 0;

-               if ((u.u_sigonstack & bit) != 0)
+               if ((ps->ps_sigonstack & bit) != 0)

                        sv->sv_flags |= SV_ONSTACK;
                        sv->sv_flags |= SV_ONSTACK;

-               if ((u.u_sigintr & bit) != 0)
+               if ((ps->ps_sigintr & bit) != 0)

                        sv->sv_flags |= SV_INTERRUPT;
                        sv->sv_flags |= SV_INTERRUPT;

-               if (u.u_procp->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)))
                if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
                    sizeof (vec)))

-                       RETURN (error);
+                       return (error);

        }
        if (uap->nsv) {
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))
        }
        if (uap->nsv) {
                if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
                    sizeof (vec)))

-                       RETURN (error);
+                       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(sig, sv);
+               setsigvec(p, signum, (struct sigaction *)sv);

        }
        }

-       RETURN (0);
+       return (0);

 }
 
 }
 

-osigblock()
+struct osigblock_args {
+       int     mask;
+};
+osigblock(p, uap, retval)
+       register struct proc *p;
+       struct osigblock_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;

 
        (void) splhigh();
 
        (void) splhigh();

-       u.u_r.r_val1 = p->p_sigmask;
+       *retval = p->p_sigmask;

        p->p_sigmask |= uap->mask &~ sigcantmask;
        (void) spl0();
        p->p_sigmask |= uap->mask &~ sigcantmask;
        (void) spl0();

-       RETURN (0);
+       return (0);

 }
 
 }
 

-osigsetmask()
+struct osigsetmask_args {
+       int     mask;
+};
+osigsetmask(p, uap, retval)
+       struct proc *p;
+       struct osigsetmask_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;

 
        (void) splhigh();
 
        (void) splhigh();

-       u.u_r.r_val1 = p->p_sigmask;
+       *retval = p->p_sigmask;

        p->p_sigmask = uap->mask &~ sigcantmask;
        (void) spl0();
        p->p_sigmask = uap->mask &~ sigcantmask;
        (void) spl0();

-       RETURN (0);
+       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.
  */

-sigsuspend()
+struct sigsuspend_args {
+       sigset_t mask;
+};
+/* ARGSUSED */
+sigsuspend(p, uap, retval)
+       register struct proc *p;
+       struct sigsuspend_args *uap;
+       int *retval;

 {
 {

-       struct a {
-               sigset_t mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
+       register struct sigacts *ps = p->p_sigacts;

 
        /*
         * 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 u.).
+        * save it here and mark the sigacts structure
+        * to indicate this.

         */
         */

-       u.u_oldmask = p->p_sigmask;
-       p->p_flag |= SOMASK;
+       ps->ps_oldmask = p->p_sigmask;
+       ps->ps_flags |= SAS_OLDMASK;

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

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

        /* always return EINTR rather than ERESTART... */
        /* always return EINTR rather than ERESTART... */

-       RETURN (EINTR);
+       return (EINTR);

 }
 
 }
 

-sigstack()
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct osigstack_args {
+       struct  sigstack *nss;
+       struct  sigstack *oss;
+};
+/* ARGSUSED */
+osigstack(p, uap, retval)
+       struct proc *p;
+       register struct osigstack_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               struct  sigstack *nss;
-               struct  sigstack *oss;
-       } *uap = (struct a *)u.u_ap;

        struct sigstack ss;
        struct sigstack ss;

+       struct sigacts *psp;

        int error = 0;
 
        int error = 0;
 

-       if (uap->oss && (error = copyout((caddr_t)&u.u_sigstack,
-           (caddr_t)uap->oss, sizeof (struct sigstack))))
-               RETURN (error);
+       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,
        if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,

-           sizeof (ss))) == 0)
-               u.u_sigstack = ss;
-       RETURN (error);
+           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);
+}
+#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);

 }
 
 }
 

-kill()
+struct kill_args {
+       int     pid;
+       int     signum;
+};
+/* ARGSUSED */
+kill(cp, uap, retval)
+       register struct proc *cp;
+       register struct kill_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     pid;
-               int     signo;
-       } *uap = (struct a *)u.u_ap;

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

+       register struct pcred *pc = cp->p_cred;

 
 

-       if ((unsigned) uap->signo >= NSIG)
-               RETURN (EINVAL);
+       if ((u_int)uap->signum >= NSIG)
+               return (EINVAL);

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

-               p = pfind(uap->pid);
-               if (p == 0)
-                       RETURN (ESRCH);
-               if (!CANSIGNAL(p, uap->signo))
-                       RETURN (EPERM);
-               if (uap->signo)
-                       psignal(p, uap->signo);
-               RETURN (0);
+               if ((p = pfind(uap->pid)) == NULL)
+                       return (ESRCH);
+               if (!CANSIGNAL(cp, pc, p, uap->signum))
+                       return (EPERM);
+               if (uap->signum)
+                       psignal(p, uap->signum);
+               return (0);

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

-               RETURN (killpg1(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(uap->signo, 0, 0));
+               return (killpg1(cp, uap->signum, 0, 0));

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

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

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

-#ifdef COMPAT_43
-okillpg()
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct okillpg_args {
+       int     pgid;
+       int     signum;
+};
+/* ARGSUSED */
+okillpg(p, uap, retval)
+       struct proc *p;
+       register struct okillpg_args *uap;
+       int *retval;

 {
 {

-       register struct a {
-               int     pgid;
-               int     signo;
-       } *uap = (struct a *)u.u_ap;
-
-       if ((unsigned) uap->signo >= NSIG)
-               RETURN (EINVAL);
-       RETURN (killpg1(uap->signo, uap->pgid, 0));
+
+       if ((u_int)uap->signum >= NSIG)
+               return (EINVAL);
+       return (killpg1(p, uap->signum, uap->pgid, 0));

 }
 }

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

 
 

-killpg1(signo, pgid, all)
-       int signo, pgid, all;
+/*
+ * Common code for kill process group/broadcast kill.
+ * cp is calling process.
+ */
+killpg1(cp, signum, pgid, all)
+       register struct proc *cp;
+       int signum, pgid, all;

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

+       register struct pcred *pc = cp->p_cred;

        struct pgrp *pgrp;
        struct pgrp *pgrp;

-       int f = 0, error = ESRCH;
+       int nfound = 0;

        
        if (all)        
                /* 
                 * broadcast 
                 */
        
        if (all)        
                /* 
                 * broadcast 
                 */

-               for (p = allproc; p != NULL; p = p->p_nxt) {
-                       if (p->p_ppid == 0 || p->p_flag&SSYS || 
-                           p == u.u_procp || !CANSIGNAL(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;
                                continue;

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

                }
        else {
                if (pgid == 0)          
                        /* 
                         * zero pgid means send to my process group.
                         */
                }
        else {
                if (pgid == 0)          
                        /* 
                         * zero pgid means send to my process group.
                         */

-                       pgrp = u.u_procp->p_pgrp;
+                       pgrp = cp->p_pgrp;

                else {
                        pgrp = pgfind(pgid);
                        if (pgrp == NULL)
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {
                else {
                        pgrp = pgfind(pgid);
                        if (pgrp == NULL)
                                return (ESRCH);
                }
                for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt) {

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

                                continue;
                                continue;

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

                }
        }
                }
        }

-       return (f ? 0 : error);
+       return (nfound ? 0 : ESRCH);

 }
 
 }
 

-/* XXX - to be removed, as soon as sockets are changed to operate on pgrps
- * Send the specified signal to
- * all processes with 'pgid' as
- * process group.
+/*
+ * Send a signal to a process group.

  */
  */

-gsignal(pgid, sig)
+void
+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);
+               pgsignal(pgrp, signum, 0);

 }
 }

+

 /*
 /*

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

  */
  */

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

        struct pgrp *pgrp;
        struct pgrp *pgrp;

+       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)

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

 }
 
 /*
 }
 
 /*


@@ -474,57 +618,63 @@ pgsignal(pgrp, sig)
  * If it will be caught immediately, deliver it with correct code.
  * Otherwise, post it normally.
  */
  * If it will be caught immediately, deliver it with correct code.
  * Otherwise, post it normally.
  */

-trapsignal(sig, code)
-       register int sig;
-       unsigned code;
+void
+trapsignal(p, signum, code)
+       struct proc *p;
+       register int signum;
+       u_int code;

 {
 {

-       register struct proc *p = u.u_procp;
+       register struct sigacts *ps = p->p_sigacts;

        int mask;
 
        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_sigmask & mask) == 0) {

-               u.u_ru.ru_nsignals++;
+               p->p_stats->p_ru.ru_nsignals++;

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

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

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

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

        } else {
        } else {

-               u.u_arg[1] = code;      /* XXX for core dump/debugger */
-               psignal(p, sig);
+               ps->ps_code = code;     /* XXX for core dump/debugger */
+               psignal(p, signum);

        }
 }
 
 /*
        }
 }
 
 /*

- * Send the specified signal to the specified process.
- * Most signals do not do anything directly to a process;
- * they set a flag that asks the process to do something to itself.
+ * 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.
+ *

  * 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.
  */
  * Other ignored signals are discarded immediately.
  */

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

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

-       register int sig;
+       register int signum;

 {
 {

-       register int s;
+       register int s, prop;

        register sig_t action;
        int mask;
 
        register sig_t action;
        int mask;
 

-       if ((unsigned)sig >= NSIG || sig == 0)
-               panic("psignal sig");
-       mask = sigmask(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 {
                /*


@@ -540,43 +690,36 @@ psignal(p, sig)
                        action = SIG_HOLD;
                else if (p->p_sigcatch & mask)
                        action = SIG_CATCH;
                        action = SIG_HOLD;
                else if (p->p_sigcatch & mask)
                        action = SIG_CATCH;

-               else {
-                       if (p->p_pgrp->pg_jobc == 0 && (sig == SIGTTIN || 
-                           sig == SIGTTOU || sig == SIGTSTP))
-                               return;
+               else

                        action = SIG_DFL;
                        action = SIG_DFL;

-               }

        }
        }

-       switch (sig) {
-
-       case SIGTERM:
-               if ((p->p_flag&STRC) || action != SIG_DFL)
-                       break;
-               /* FALLTHROUGH */

 
 

-       case SIGKILL:
-               if (p->p_nice > NZERO)
-                       p->p_nice = NZERO;
-               break;
+       if (p->p_nice > NZERO && action == SIG_DFL && (prop & SA_KILL) &&
+           (p->p_flag & P_TRACED) == 0)
+               p->p_nice = NZERO;

 
 

-       case SIGCONT:
-               p->p_sig &= ~stopsigmask;
-               break;
+       if (prop & SA_CONT)
+               p->p_siglist &= ~stopsigmask;

 
 

-       case SIGTSTP:
-       case SIGTTIN:
-       case SIGTTOU:
-       case SIGSTOP:
-               p->p_sig &= ~sigmask(SIGCONT);
-               break;
+       if (prop & SA_STOP) {
+               /*
+                * If sending a tty stop signal to a member of an orphaned
+                * process group, discard the signal here if the action
+                * is default; don't stop the process below if sleeping,
+                * and don't clear any pending SIGCONT.
+                */
+               if (prop & SA_TTYSTOP && p->p_pgrp->pg_jobc == 0 &&
+                   action == SIG_DFL)
+                       return;
+               p->p_siglist &= ~contsigmask;

        }
        }

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

 
        /*
         * Defer further processing for signals which are held,
         * except that stopped processes must be continued by SIGCONT.
         */
 
        /*
         * Defer further processing for signals which are held,
         * except that stopped processes must be continued by SIGCONT.
         */

-       if (action == SIG_HOLD && (sig != SIGCONT || p->p_stat != SSTOP))
+       if (action == SIG_HOLD && ((prop & SA_CONT) == 0 || p->p_stat != SSTOP))

                return;
        s = splhigh();
        switch (p->p_stat) {
                return;
        s = splhigh();
        switch (p->p_stat) {


@@ -588,33 +731,42 @@ 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.
                 * All other (caught or default) signals
                 * cause the process to run.
                 */
                /*
                 * When a sleeping process receives a stop
                 * signal, process immediately if possible.
                 * All other (caught or default) signals
                 * cause the process to run.
                 */

-               if (mask & stopsigmask) {
+               if (prop & SA_STOP) {

                        if (action != SIG_DFL)
                                goto runfast;
                        /*
                        if (action != SIG_DFL)
                                goto runfast;
                        /*

-                        * If a child in vfork(), stopping could
-                        * cause deadlock.
+                        * If a child holding parent blocked,
+                        * stopping could cause deadlock.

                         */
                         */

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

                                goto out;
                                goto out;

-                       p->p_sig &= ~mask;
-                       p->p_cursig = 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;


@@ -627,60 +779,54 @@ 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;
                        goto out;

-               switch (sig) {

 
 

-               case SIGKILL:
-                       /*
-                        * Kill signal always sets processes running.
-                        */
+               /*
+                * Kill signal always sets processes running.
+                */
+               if (signum == SIGKILL)

                        goto runfast;
 
                        goto runfast;
 

-               case SIGCONT:
+               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.
                         */
                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */

-                       p->p_cursig = 0;        /* ??? XXX */

                        if (action == SIG_DFL)
                        if (action == SIG_DFL)

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

                        if (action == SIG_CATCH)
                                goto runfast;
                        if (p->p_wchan == 0)
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;
                        if (action == SIG_CATCH)
                                goto runfast;
                        if (p->p_wchan == 0)
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;

+               }

 
 

-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
+               if (prop & SA_STOP) {

                        /*
                         * 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 */
-                       goto out;
-
-               default:
-                       /*
-                        * 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 (p->p_wchan && p->p_flag & SSINTR)
-                               unsleep(p);
+                       p->p_siglist &= ~mask;          /* take it away */

                        goto out;
                }
                        goto out;
                }

-               /*NOTREACHED*/
+
+               /*
+                * 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 & P_SINTR)
+                       unsleep(p);
+               goto out;

 
        default:
                /*
 
        default:
                /*


@@ -688,8 +834,8 @@ psignal(p, sig)
                 * other than kicking ourselves if we are running.
                 * It will either never be noticed, or noticed very soon.
                 */
                 * other than kicking ourselves if we are running.
                 * It will either never be noticed, or noticed very soon.
                 */

-               if (p == u.u_procp && !noproc)
-                       aston();
+               if (p == curproc)
+                       signotify(p);

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


@@ -698,82 +844,84 @@ 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 asked at least once each time a process enters the
- * system (though this can usually be done without actually
- * calling issig by checking the pending signal masks.)
+ * 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 (signum = CURSIG(curproc))
+ *             postsig(signum);

  */
  */

-issig()
-{
+issignal(p)

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

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

 
 

-       p = u.u_procp;

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

-               mask = p->p_sig &~ p->p_sigmask;
-               if (p->p_flag&SVFORK)
+               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);
+               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&SVFORK) == 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_cursig = 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_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 u_signal 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;
 
                        /*
                         * If parent wants us to take the signal,
                                continue;
 
                        /*
                         * If parent wants us to take the signal,

-                        * then it will leave it in p->p_cursig;
+                        * then it will leave it in p->p_xstat;

                         * otherwise we just look for signals again.
                         */
                         * otherwise we just look for signals again.
                         */

-                       p->p_sig &= ~mask;      /* clear the old signal */
-                       sig = p->p_cursig;
-                       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;
                }


@@ -783,36 +931,49 @@ issig()
                 * 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)u.u_signal[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_ppid == 0)
+                       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,

-                        * then clear the signal.
+                        * then clear the signal.  However,
+                        * if process is member of an orphaned
+                        * process group, ignore tty stop signals.

                         */
                         */

-                       if (mask & stopsigmask) {
-                               if (p->p_flag&STRC)
+                       if (prop & SA_STOP) {
+                               if (p->p_flag & P_TRACED ||
+                                   (p->p_pgrp->pg_jobc == 0 &&
+                                   prop & SA_TTYSTOP))

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

-                               p->p_cursig = 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;
                                break;

-                       } else if (mask & defaultignmask) {
+                       } else if (prop & SA_IGNORE) {

                                /*
                                 * Except for SIGCONT, shouldn't get here.
                                 * Default action is to ignore; drop it.
                                 */
                                break;          /* == ignore */
                        } else
                                /*
                                 * Except for SIGCONT, shouldn't get here.
                                 * Default action is to ignore; drop it.
                                 */
                                break;          /* == ignore */
                        } else

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

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


@@ -821,175 +982,199 @@ issig()
                         * 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 (sig != SIGCONT && (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);
 }
 
 /*

- * Perform the action specified by the current signal.
- * The usual sequence is:
- *     if (sig = CURSIG(p))
- *             psig(sig);
+ * Take the action for the specified signal
+ * from the current set of pending signals.

  */
  */

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

 {
 {

-       register struct proc *p = u.u_procp;
-       int mask, returnmask;
+       register struct proc *p = curproc;
+       register struct sigacts *ps = p->p_sigacts;

        register sig_t action;
        register sig_t action;

+       int code, mask, returnmask;

 
 

-       do {

 #ifdef DIAGNOSTIC
 #ifdef DIAGNOSTIC

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

 #endif
 #endif

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

 #ifdef KTRACE
 #ifdef KTRACE

-               if (KTRPOINT(p, KTR_PSIG))
-                       ktrpsig(p->p_tracep, sig, action, p->p_flag & SOMASK ?
-                               u.u_oldmask : p->p_sigmask, 0);
+       if (KTRPOINT(p, KTR_PSIG))
+               ktrpsig(p->p_tracep,
+                   signum, action, ps->ps_flags & SAS_OLDMASK ?
+                   ps->ps_oldmask : p->p_sigmask, 0);

 #endif
 #endif

-               if (action != SIG_DFL) {
+       if (action == SIG_DFL) {
+               /*
+                * Default action, where the default is to kill
+                * the process.  (Other cases were ignored above.)
+                */
+               sigexit(p, signum);
+               /* NOTREACHED */
+       } else {
+               /*
+                * If we get here, the signal must be caught.
+                */

 #ifdef DIAGNOSTIC
 #ifdef DIAGNOSTIC

-                       if (action == SIG_IGN || (p->p_sigmask & mask))
-                               panic("psig action");
+               if (action == SIG_IGN || (p->p_sigmask & mask))
+                       panic("postsig action");

 #endif
 #endif

-                       u.u_error = 0;
-                       /*
-                        * Set the new mask value and also defer further
-                        * occurences of this signal.
-                        *
-                        * Special case: user has done a sigpause.  Here the
-                        * current mask is not of interest, but rather the
-                        * mask from before the sigpause is what we want
-                        * restored after the signal processing is completed.
-                        */
-                       (void) splhigh();
-                       if (p->p_flag & SOMASK) {
-                               returnmask = u.u_oldmask;
-                               p->p_flag &= ~SOMASK;
-                       } else
-                               returnmask = p->p_sigmask;
-                       p->p_sigmask |= u.u_sigmask[sig] | mask;
-                       (void) spl0();
-                       u.u_ru.ru_nsignals++;
-                       sendsig(action, sig, returnmask, 0);
-                       continue;
-               }
-               u.u_acflag |= AXSIG;
-               switch (sig) {
-
-               case SIGILL:
-               case SIGIOT:
-               case SIGBUS:
-               case SIGQUIT:
-               case SIGTRAP:
-               case SIGEMT:
-               case SIGFPE:
-               case SIGSEGV:
-               case SIGSYS:
-                       u.u_arg[0] = sig;
-                       if (core() == 0)
-                               sig |= WCOREFLAG;
+               /*
+                * Set the new mask value and also defer further
+                * occurences of this signal.
+                *
+                * Special case: user has done a sigpause.  Here the
+                * current mask is not of interest, but rather the
+                * mask from before the sigpause is what we want
+                * restored after the signal processing is completed.
+                */
+               (void) splhigh();
+               if (ps->ps_flags & SAS_OLDMASK) {
+                       returnmask = ps->ps_oldmask;
+                       ps->ps_flags &= ~SAS_OLDMASK;
+               } else
+                       returnmask = p->p_sigmask;
+               p->p_sigmask |= ps->ps_catchmask[signum] | mask;
+               (void) spl0();
+               p->p_stats->p_ru.ru_nsignals++;
+               if (ps->ps_sig != signum) {
+                       code = 0;
+               } else {
+                       code = ps->ps_code;
+                       ps->ps_code = 0;

                }
                }

-               exit(W_EXITCODE(0, sig));
-               /* NOTREACHED */
-       } while (sig = CURSIG(p));
+               sendsig(action, signum, returnmask, code);
+       }
+}
+
+/*
+ * Kill the current process for stated reason.
+ */
+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;
+       int signum;
+{
+
+       p->p_acflag |= AXSIG;
+       if (sigprop[signum] & SA_CORE) {
+               p->p_sigacts->ps_sig = signum;
+               if (coredump(p) == 0)
+                       signum |= WCOREFLAG;
+       }
+       exit1(p, W_EXITCODE(0, signum));
+       /* NOTREACHED */

 }
 
 /*
 }
 
 /*

- * Create a core image on the file "core".
- * It writes UPAGES block of the
- * user.h area followed by the entire
- * data+stack segments.
+ * Dump core, into a file named "progname.core", unless the process was
+ * setuid/setgid.

  */
  */

-core()
+coredump(p)
+       register struct proc *p;

 {
        register struct vnode *vp;
 {
        register struct vnode *vp;

-       register struct proc *p = u.u_procp;
-       register struct nameidata *ndp = &u.u_nd;
+       register struct pcred *pcred = p->p_cred;
+       register struct ucred *cred = pcred->pc_ucred;
+       register struct vmspace *vm = p->p_vmspace;
+       struct nameidata nd;

        struct vattr vattr;
        struct vattr vattr;

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

 
 

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

                return (EFAULT);
                return (EFAULT);

-       if (ctob(UPAGES + u.u_dsize + u.u_ssize) >=
-           u.u_rlimit[RLIMIT_CORE].rlim_cur)
+       if (ctob(UPAGES + vm->vm_dsize + vm->vm_ssize) >=
+           p->p_rlimit[RLIMIT_CORE].rlim_cur)

                return (EFAULT);
                return (EFAULT);

-       if (p->p_textp) {
-               VOP_LOCK(p->p_textp->x_vptr);
-               error = VOP_ACCESS(p->p_textp->x_vptr, VREAD, u.u_cred);
-               VOP_UNLOCK(p->p_textp->x_vptr);
-               if (error)
-                       return (EFAULT);
-       }
-       ndp->ni_segflg = UIO_SYSSPACE;
-       ndp->ni_dirp = "core";
-       if (error = vn_open(ndp, FCREAT|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);
                return (error);

-       vp = ndp->ni_vp;
-       VOP_LOCK(vp);
+       vp = nd.ni_vp;
+
+       /* Don't dump to non-regular files or files with links. */

        if (vp->v_type != VREG ||
        if (vp->v_type != VREG ||

-           VOP_GETATTR(vp, &vattr, u.u_cred) ||
-           vattr.va_nlink != 1) {
-               vput(vp);
-               return (EFAULT);
-       }
-#ifdef MMAP
-       { register int fd;
-       /* unmap funky devices in the user's address space */
-       for (fd = 0; fd < u.u_lastfile; fd++)
-               if (u.u_ofile[fd] && (u.u_pofile[fd] & UF_MAPPED))
-                       munmapfd(fd);
+           VOP_GETATTR(vp, &vattr, cred, p) || vattr.va_nlink != 1) {
+               error = EFAULT;
+               goto out;

        }
        }

-#endif

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

-       VOP_SETATTR(vp, &vattr, u.u_cred);
-       u.u_acflag |= ACORE;
-       error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&u, ctob(UPAGES), (off_t)0,
-           UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, ndp->ni_cred, (int *)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);
+       error = cpu_coredump(p, vp, cred);

        if (error == 0)
        if (error == 0)

-               error = vn_rdwr(UIO_WRITE, vp,
-                   (caddr_t)ctob(dptov(p, 0)),
-                   (int)ctob(u.u_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,
-                   IO_NODELOCKED|IO_UNIT, ndp->ni_cred, (int *)0);
+               error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr,
+                   (int)ctob(vm->vm_dsize), (off_t)ctob(UPAGES), UIO_USERSPACE,
+                   IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);

        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp,
        if (error == 0)
                error = vn_rdwr(UIO_WRITE, vp,

-                   (caddr_t)ctob(sptov(p, u.u_ssize - 1)),
-                   (int)ctob(u.u_ssize),
-                   (off_t)ctob(UPAGES) + ctob(u.u_dsize), UIO_USERSPACE,
-                   IO_NODELOCKED|IO_UNIT, ndp->ni_cred, (int *)0);
-       vput(vp);
+                   (caddr_t) trunc_page(USRSTACK - ctob(vm->vm_ssize)),
+                   round_page(ctob(vm->vm_ssize)),
+                   (off_t)ctob(UPAGES) + ctob(vm->vm_dsize), UIO_USERSPACE,
+                   IO_NODELOCKED|IO_UNIT, cred, (int *) NULL, p);
+out:
+       VOP_UNLOCK(vp);
+       error1 = vn_close(vp, FWRITE, cred, p);
+       if (error == 0)
+               error = error1;

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


@@ -997,9 +1182,16 @@ core()
  * 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).
  */

-nosys()
+struct nosys_args {
+       int     dummy;
+};
+/* ARGSUSED */
+nosys(p, args, retval)
+       struct proc *p;
+       struct nosys_args *args;
+       int *retval;

 {
 
 {
 

-       psignal(u.u_procp, SIGSYS);
-       u.u_error = EINVAL;
+       psignal(p, SIGSYS);
+       return (EINVAL);

 }
 }