projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
BSD 4_3_Reno 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 8be5ef4..a271cdc 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -1,97 +1,148 @@
-/*     kern_sig.c      6.10    85/03/12        */
-
-#include "../machine/reg.h"
-#include "../machine/pte.h"
-#include "../machine/psl.h"
+/*
+ * Copyright (c) 1982, 1986, 1989 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  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.
+ * 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.
+ *
+ *     @(#)kern_sig.c  7.23 (Berkeley) 6/28/90
+ */
 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"
-#include "dir.h"
 #include "user.h"
 #include "user.h"
-#include "inode.h"
+#include "vnode.h"
 #include "proc.h"
 #include "timeb.h"
 #include "times.h"
 #include "proc.h"
 #include "timeb.h"
 #include "times.h"
-#include "conf.h"
 #include "buf.h"
 #include "buf.h"
-#include "mount.h"
 #include "text.h"
 #include "seg.h"
 #include "vm.h"
 #include "acct.h"
 #include "uio.h"
 #include "text.h"
 #include "seg.h"
 #include "vm.h"
 #include "acct.h"
 #include "uio.h"
+#include "file.h"
 #include "kernel.h"
 #include "kernel.h"
+#include "wait.h"
+#include "ktrace.h"
 
 
-#define        cantmask        (sigmask(SIGKILL)|sigmask(SIGCONT)|sigmask(SIGSTOP))
+#include "machine/reg.h"
+#include "machine/pte.h"
+#include "machine/psl.h"
+#include "machine/mtpr.h"
+
+#define        ttystopsigmask  (sigmask(SIGTSTP)|sigmask(SIGTTIN)|sigmask(SIGTTOU))
+#define        stopsigmask     (sigmask(SIGSTOP)|ttystopsigmask)
+#define defaultignmask (sigmask(SIGCONT)|sigmask(SIGIO)|sigmask(SIGURG)| \
+                       sigmask(SIGCHLD)|sigmask(SIGWINCH)|sigmask(SIGINFO))
 
 /*
 
 /*
- * Generalized interface signal handler.
+ * Can process p send the signal signo to process q?
  */
  */
-sigvec()
-{
-       register struct a {
+#define CANSIGNAL(p, q, signo) \
+       ((p)->p_uid == 0 || \
+           (p)->p_ruid == (q)->p_ruid || (p)->p_uid == (q)->p_ruid || \
+           (p)->p_ruid == (q)->p_uid || (p)->p_uid == (q)->p_uid || \
+           ((signo) == SIGCONT && (q)->p_session == (p)->p_session))
+
+/* ARGSUSED */
+sigaction(p, uap, retval)
+       struct proc *p;
+       register struct args {
                int     signo;
                int     signo;
-               struct  sigvec *nsv;
-               struct  sigvec *osv;
-       } *uap = (struct a  *)u.u_ap;
-       struct sigvec vec;
-       register struct sigvec *sv;
+               struct  sigaction *nsa;
+               struct  sigaction *osa;
+       } *uap;
+       int *retval;
+{
+       struct sigaction vec;
+       register struct sigaction *sa;
        register int sig;
        register int sig;
+       int bit, error;
 
        sig = uap->signo;
 
        sig = uap->signo;
-       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP) {
-               u.u_error = EINVAL;
-               return;
-       }
-       sv = &vec;
-       if (uap->osv) {
-               sv->sv_handler = u.u_signal[sig];
-               sv->sv_mask = u.u_sigmask[sig];
-               sv->sv_onstack = (u.u_sigonstack & sigmask(sig)) != 0;
-               u.u_error =
-                   copyout((caddr_t)sv, (caddr_t)uap->osv, sizeof (vec));
-               if (u.u_error)
-                       return;
+       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+               return (EINVAL);
+       sa = &vec;
+       if (uap->osa) {
+               sa->sa_handler = u.u_signal[sig];
+               sa->sa_mask = u.u_sigmask[sig];
+               bit = sigmask(sig);
+               sa->sa_flags = 0;
+               if ((u.u_sigonstack & bit) != 0)
+                       sa->sa_flags |= SA_ONSTACK;
+               if ((u.u_sigintr & bit) == 0)
+                       sa->sa_flags |= SA_RESTART;
+               if (p->p_flag & SNOCLDSTOP)
+                       sa->sa_flags |= SA_NOCLDSTOP;
+               if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
+                   sizeof (vec)))
+                       return (error);
        }
        }
-       if (uap->nsv) {
-               u.u_error =
-                   copyin((caddr_t)uap->nsv, (caddr_t)sv, sizeof (vec));
-               if (u.u_error)
-                       return;
-               if (sig == SIGCONT && sv->sv_handler == SIG_IGN) {
-                       u.u_error = EINVAL;
-                       return;
-               }
-               setsigvec(sig, sv);
+       if (uap->nsa) {
+               if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
+                   sizeof (vec)))
+                       return (error);
+               setsigvec(p, sig, sa);
        }
        }
+       return (0);
 }
 
 }
 
-setsigvec(sig, sv)
+setsigvec(p, sig, sa)
+       register struct proc *p;
        int sig;
        int sig;
-       register struct sigvec *sv;
+       register struct sigaction *sa;
 {
 {
-       register struct proc *p;
        register int bit;
 
        bit = sigmask(sig);
        register int bit;
 
        bit = sigmask(sig);
-       p = u.u_procp;
        /*
         * Change setting atomically.
         */
        (void) splhigh();
        /*
         * Change setting atomically.
         */
        (void) splhigh();
-       u.u_signal[sig] = sv->sv_handler;
-       u.u_sigmask[sig] = sv->sv_mask &~ cantmask;
-       if (sv->sv_onstack)
+       u.u_signal[sig] = sa->sa_handler;
+       u.u_sigmask[sig] = sa->sa_mask &~ sigcantmask;
+       if ((sa->sa_flags & SA_RESTART) == 0)
+               u.u_sigintr |= bit;
+       else
+               u.u_sigintr &= ~bit;
+       if (sa->sa_flags & SA_ONSTACK)
                u.u_sigonstack |= bit;
        else
                u.u_sigonstack &= ~bit;
                u.u_sigonstack |= bit;
        else
                u.u_sigonstack &= ~bit;
-       if (sv->sv_handler == SIG_IGN) {
+       if (sig == SIGCHLD) {
+               if (sa->sa_flags & SA_NOCLDSTOP)
+                       p->p_flag |= SNOCLDSTOP;
+               else
+                       p->p_flag &= ~SNOCLDSTOP;
+       }
+       /*
+        * Set bit in p_sigignore for signals that are set to SIG_IGN,
+        * and for signals set to SIG_DFL where the default is to ignore.
+        * However, don't put SIGCONT in p_sigignore,
+        * 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 */
                p->p_sig &= ~bit;               /* never to be seen again */
-               p->p_sigignore |= bit;
+               if (sig != SIGCONT)
+                       p->p_sigignore |= bit;  /* easier in psignal */
                p->p_sigcatch &= ~bit;
        } else {
                p->p_sigignore &= ~bit;
                p->p_sigcatch &= ~bit;
        } else {
                p->p_sigignore &= ~bit;
-               if (sv->sv_handler == SIG_DFL)
+               if (sa->sa_handler == SIG_DFL)
                        p->p_sigcatch &= ~bit;
                else
                        p->p_sigcatch |= bit;
                        p->p_sigcatch &= ~bit;
                else
                        p->p_sigcatch |= bit;
@@ -99,38 +150,193 @@ setsigvec(sig, sv)
        (void) spl0();
 }
 
        (void) spl0();
 }
 
-sigblock()
+/*
+ * Initialize signal state for process 0;
+ * set to ignore signals that are ignored by default.
+ */
+siginit(p)
+       struct proc *p;
 {
 {
-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
 
 
+       p->p_sigignore = defaultignmask &~ sigmask(SIGCONT);
+}
+
+/*
+ * Reset signals for an exec of the specified process.
+ */
+execsigs(p)
+       register struct proc *p;
+{
+       register int nc, mask;
+
+       /*
+        * Reset caught signals.  Held signals remain held
+        * through p_sigmask (unless they were caught,
+        * and are now ignored by default).
+        */
+       while (p->p_sigcatch) {
+               nc = ffs((long)p->p_sigcatch);
+               mask = sigmask(nc);
+               p->p_sigcatch &= ~mask;
+               if (mask & defaultignmask) {
+                       if (nc != SIGCONT)
+                               p->p_sigignore |= mask;
+                       p->p_sig &= ~mask;
+               }
+               u.u_signal[nc] = SIG_DFL;
+       }
+       /*
+        * 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;
+}
+
+/*
+ * Manipulate signal mask.
+ * Note that we receive new mask, not pointer,
+ * and return old mask as return value;
+ * the library stub does the rest.
+ */
+sigprocmask(p, uap, retval)
+       register struct proc *p;
+       struct args {
+               int     how;
+               sigset_t mask;
+       } *uap;
+       int *retval;
+{
+       int error = 0;
+
+       *retval = p->p_sigmask;
        (void) splhigh();
        (void) splhigh();
-       u.u_r.r_val1 = p->p_sigmask;
-       p->p_sigmask |= uap->mask &~ cantmask;
+
+       switch (uap->how) {
+       case SIG_BLOCK:
+               p->p_sigmask |= uap->mask &~ sigcantmask;
+               break;
+
+       case SIG_UNBLOCK:
+               p->p_sigmask &= ~uap->mask;
+               break;
+
+       case SIG_SETMASK:
+               p->p_sigmask = uap->mask &~ sigcantmask;
+               break;
+       
+       default:
+               error = EINVAL;
+               break;
+       }
        (void) spl0();
        (void) spl0();
+       return (error);
+}
+
+/* ARGSUSED */
+sigpending(p, uap, retval)
+       struct proc *p;
+       void *uap;
+       int *retval;
+{
+
+       *retval = p->p_sig;
+       return (0);
+}
+
+#ifdef COMPAT_43
+/*
+ * Generalized interface signal handler, 4.3-compatible.
+ */
+/* ARGSUSED */
+osigvec(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     signo;
+               struct  sigvec *nsv;
+               struct  sigvec *osv;
+       } *uap;
+       int *retval;
+{
+       struct sigvec vec;
+       register struct sigvec *sv;
+       register int sig;
+       int bit, error;
+
+       sig = uap->signo;
+       if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
+               return (EINVAL);
+       sv = &vec;
+       if (uap->osv) {
+               *(sig_t *)&sv->sv_handler = u.u_signal[sig];
+               sv->sv_mask = u.u_sigmask[sig];
+               bit = sigmask(sig);
+               sv->sv_flags = 0;
+               if ((u.u_sigonstack & bit) != 0)
+                       sv->sv_flags |= SV_ONSTACK;
+               if ((u.u_sigintr & bit) != 0)
+                       sv->sv_flags |= SV_INTERRUPT;
+               if (p->p_flag & SNOCLDSTOP)
+                       sv->sv_flags |= SA_NOCLDSTOP;
+               if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
+                   sizeof (vec)))
+                       return (error);
+       }
+       if (uap->nsv) {
+               if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
+                   sizeof (vec)))
+                       return (error);
+               sv->sv_flags ^= SA_RESTART;     /* opposite of SV_INTERRUPT */
+               setsigvec(p, sig, (struct sigaction *)sv);
+       }
+       return (0);
 }
 
 }
 
-sigsetmask()
+osigblock(p, uap, retval)
+       register struct proc *p;
+       struct args {
+               int     mask;
+       } *uap;
+       int *retval;
 {
 {
-       struct a {
+
+       (void) splhigh();
+       *retval = p->p_sigmask;
+       p->p_sigmask |= uap->mask &~ sigcantmask;
+       (void) spl0();
+       return (0);
+}
+
+osigsetmask(p, uap, retval)
+       struct proc *p;
+       struct args {
                int     mask;
                int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
+       } *uap;
+       int *retval;
+{
 
        (void) splhigh();
 
        (void) splhigh();
-       u.u_r.r_val1 = p->p_sigmask;
-       p->p_sigmask = uap->mask &~ cantmask;
+       *retval = p->p_sigmask;
+       p->p_sigmask = uap->mask &~ sigcantmask;
        (void) spl0();
        (void) spl0();
+       return (0);
 }
 }
+#endif
 
 
-sigpause()
+/*
+ * 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.
+ */
+/* ARGSUSED */
+sigsuspend(p, uap, retval)
+       register struct proc *p;
+       struct args {
+               sigset_t mask;
+       } *uap;
+       int *retval;
 {
 {
-       struct a {
-               int     mask;
-       } *uap = (struct a *)u.u_ap;
-       register struct proc *p = u.u_procp;
 
        /*
         * When returning from sigpause, we want
 
        /*
         * When returning from sigpause, we want
@@ -141,137 +347,211 @@ sigpause()
         */
        u.u_oldmask = p->p_sigmask;
        p->p_flag |= SOMASK;
         */
        u.u_oldmask = p->p_sigmask;
        p->p_flag |= SOMASK;
-       p->p_sigmask = uap->mask &~ cantmask;
-       for (;;)
-               sleep((caddr_t)&u, PSLEP);
-       /*NOTREACHED*/
+       p->p_sigmask = uap->mask &~ sigcantmask;
+       (void) tsleep((caddr_t)&u, PPAUSE | PCATCH, "pause", 0);
+       /* always return EINTR rather than ERESTART... */
+       return (EINTR);
 }
 }
-#undef cantmask
 
 
-sigstack()
-{
-       register struct a {
+/* ARGSUSED */
+sigstack(p, uap, retval)
+       struct proc *p;
+       register struct args {
                struct  sigstack *nss;
                struct  sigstack *oss;
                struct  sigstack *nss;
                struct  sigstack *oss;
-       } *uap = (struct a *)u.u_ap;
+       } *uap;
+       int *retval;
+{
        struct sigstack ss;
        struct sigstack ss;
+       int error = 0;
 
 
-       if (uap->oss) {
-               u.u_error = copyout((caddr_t)&u.u_sigstack, (caddr_t)uap->oss, 
-                   sizeof (struct sigstack));
-               if (u.u_error)
-                       return;
-       }
-       if (uap->nss) {
-               u.u_error =
-                   copyin((caddr_t)uap->nss, (caddr_t)&ss, sizeof (ss));
-               if (u.u_error == 0)
-                       u.u_sigstack = ss;
-       }
+       if (uap->oss && (error = copyout((caddr_t)&u.u_sigstack,
+           (caddr_t)uap->oss, sizeof (struct sigstack))))
+               return (error);
+       if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
+           sizeof (ss))) == 0)
+               u.u_sigstack = ss;
+       return (error);
 }
 
 }
 
-/* KILL SHOULD BE UPDATED */
-
-kill()
-{
-       register struct a {
+/* ARGSUSED */
+kill(cp, uap, retval)
+       register struct proc *cp;
+       register struct args {
                int     pid;
                int     signo;
                int     pid;
                int     signo;
-       } *uap = (struct a *)u.u_ap;
-
-       u.u_error = kill1(uap->signo < 0,
-               uap->signo < 0 ? -uap->signo : uap->signo, uap->pid);
-}
-
-killpg()
-{
-       register struct a {
-               int     pgrp;
-               int     signo;
-       } *uap = (struct a *)u.u_ap;
-
-       u.u_error = kill1(1, uap->signo, uap->pgrp);
-}
-
-/* KILL CODE SHOULDNT KNOW ABOUT PROCESS INTERNALS !?! */
-
-kill1(ispgrp, signo, who)
-       int ispgrp, signo, who;
+       } *uap;
+       int *retval;
 {
        register struct proc *p;
 {
        register struct proc *p;
-       int f, priv = 0;
 
 
-       if (signo < 0 || signo > NSIG)
+       if ((unsigned) uap->signo >= NSIG)
                return (EINVAL);
                return (EINVAL);
-       if (who > 0 && !ispgrp) {
-               p = pfind(who);
+       if (uap->pid > 0) {
+               /* kill single process */
+               p = pfind(uap->pid);
                if (p == 0)
                        return (ESRCH);
                if (p == 0)
                        return (ESRCH);
-               if (u.u_uid && u.u_uid != p->p_uid)
+               if (!CANSIGNAL(cp, p, uap->signo))
                        return (EPERM);
                        return (EPERM);
-               if (signo)
-                       psignal(p, signo);
+               if (uap->signo)
+                       psignal(p, uap->signo);
                return (0);
        }
                return (0);
        }
-       if (who == -1 && u.u_uid == 0)
-               priv++, who = 0, ispgrp = 1;    /* like sending to pgrp */
-       else if (who == 0) {
-               /*
-                * Zero process id means send to my process group.
-                */
-               ispgrp = 1;
-               who = u.u_procp->p_pgrp;
-               if (who == 0)
-                       return (EINVAL);
+       switch (uap->pid) {
+       case -1:                /* broadcast signal */
+               return (killpg1(cp, uap->signo, 0, 1));
+       case 0:                 /* signal own process group */
+               return (killpg1(cp, uap->signo, 0, 0));
+       default:                /* negative explicit process group */
+               return (killpg1(cp, uap->signo, -uap->pid, 0));
        }
        }
-       for (f = 0, p = allproc; p != NULL; p = p->p_nxt) {
-               if (!ispgrp) {
-                       if (p->p_pid != who)
+       /* NOTREACHED */
+}
+
+#ifdef COMPAT_43
+/* ARGSUSED */
+okillpg(p, uap, retval)
+       struct proc *p;
+       register struct args {
+               int     pgid;
+               int     signo;
+       } *uap;
+       int *retval;
+{
+
+       if ((unsigned) uap->signo >= NSIG)
+               return (EINVAL);
+       return (killpg1(p, uap->signo, uap->pgid, 0));
+}
+#endif
+
+/*
+ * Common code for kill process group/broadcast kill.
+ * cp is calling process.
+ */
+killpg1(cp, signo, pgid, all)
+       register struct proc *cp;
+       int signo, pgid, all;
+{
+       register struct proc *p;
+       struct pgrp *pgrp;
+       int f = 0;
+       
+       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(cp, p, signo))
                                continue;
                                continue;
-               } else if (p->p_pgrp != who && priv == 0 || p->p_ppid == 0 ||
-                   (p->p_flag&SSYS) || (priv && p == u.u_procp))
-                       continue;
-               if (u.u_uid != 0 && u.u_uid != p->p_uid &&
-                   (signo != SIGCONT || !inferior(p)))
-                       continue;
-               f++;
-               if (signo)
-                       psignal(p, signo);
+                       f++;
+                       if (signo)
+                               psignal(p, signo);
+               }
+       else {
+               if (pgid == 0)          
+                       /* 
+                        * zero pgid means send to my process group.
+                        */
+                       pgrp = u.u_procp->p_pgrp;
+               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(cp, p, signo))
+                               continue;
+                       f++;
+                       if (signo)
+                               psignal(p, signo);
+               }
        }
        }
-       return (f == 0 ? ESRCH : 0);
+       return (f ? 0 : ESRCH);
 }
 
 /*
  * Send the specified signal to
 }
 
 /*
  * Send the specified signal to
- * all processes with 'pgrp' as
+ * all processes with 'pgid' as
  * process group.
  */
  * process group.
  */
-gsignal(pgrp, sig)
-       register int pgrp;
+gsignal(pgid, sig)
+{
+       struct pgrp *pgrp;
+
+       if (pgid && (pgrp = pgfind(pgid)))
+               pgsignal(pgrp, sig, 0);
+}
+
+/*
+ * Send sig to every member of a process group.
+ * If checktty is 1, limit to members which have a controlling
+ * terminal.
+ */
+pgsignal(pgrp, sig, checkctty)
+       struct pgrp *pgrp;
 {
        register struct proc *p;
 
 {
        register struct proc *p;
 
-       if (pgrp == 0)
-               return;
-       for (p = allproc; p != NULL; p = p->p_nxt)
-               if (p->p_pgrp == pgrp)
-                       psignal(p, sig);
+       if (pgrp)
+               for (p = pgrp->pg_mem; p != NULL; p = p->p_pgrpnxt)
+                       if (checkctty == 0 || p->p_flag&SCTTY)
+                               psignal(p, sig);
 }
 
 /*
 }
 
 /*
- * Send the specified signal to
- * the specified process.
+ * Send a signal caused by a trap to the current process.
+ * If it will be caught immediately, deliver it with correct code.
+ * Otherwise, post it normally.
+ */
+trapsignal(sig, code)
+       register int sig;
+       unsigned code;
+{
+       register struct proc *p = u.u_procp;    /* XXX */
+       int mask;
+
+       mask = sigmask(sig);
+       if ((p->p_flag & STRC) == 0 && (p->p_sigcatch & mask) != 0 &&
+           (p->p_sigmask & mask) == 0) {
+               u.u_ru.ru_nsignals++;
+#ifdef KTRACE
+               if (KTRPOINT(p, KTR_PSIG))
+                       ktrpsig(p->p_tracep, sig, u.u_signal[sig], 
+                               p->p_sigmask, code);
+#endif
+               sendsig(u.u_signal[sig], sig, p->p_sigmask, code);
+               p->p_sigmask |= u.u_sigmask[sig] | mask;
+       } else {
+               u.u_code = code;        /* XXX for core dump/debugger */
+               psignal(p, sig);
+       }
+}
+
+/*
+ * 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.
+ * 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 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.
  */
 psignal(p, sig)
        register struct proc *p;
        register int sig;
 {
        register int s;
  */
 psignal(p, sig)
        register struct proc *p;
        register int sig;
 {
        register int s;
-       register int (*action)();
+       register sig_t action;
        int mask;
 
        int mask;
 
-       if ((unsigned)sig >= NSIG)
-               return;
+       if ((unsigned)sig >= NSIG || sig == 0)
+               panic("psignal sig");
        mask = sigmask(sig);
 
        /*
        mask = sigmask(sig);
 
        /*
@@ -283,6 +563,9 @@ psignal(p, sig)
                /*
                 * If the signal is being ignored,
                 * then we forget about it immediately.
                /*
                 * If the signal is being ignored,
                 * then we forget about it immediately.
+                * (Note: we don't set SIGCONT in p_sigignore,
+                * and if it is set to SIG_IGN,
+                * action will be SIG_DFL here.)
                 */
                if (p->p_sigignore & mask)
                        return;
                 */
                if (p->p_sigignore & mask)
                        return;
@@ -293,51 +576,48 @@ psignal(p, sig)
                else
                        action = SIG_DFL;
        }
                else
                        action = SIG_DFL;
        }
-#define        stops   (sigmask(SIGSTOP)|sigmask(SIGTSTP)| \
-                       sigmask(SIGTTIN)|sigmask(SIGTTOU))
-       if (sig) {
-               p->p_sig |= mask;
-               switch (sig) {
-
-               case SIGTERM:
-                       if ((p->p_flag&STRC) || action != SIG_DFL)
-                               break;
-                       /* fall into ... */
+       switch (sig) {
 
 
-               case SIGKILL:
-                       if (p->p_nice > NZERO)
-                               p->p_nice = NZERO;
+       case SIGTERM:
+               if ((p->p_flag&STRC) || action != SIG_DFL)
                        break;
                        break;
+               /* FALLTHROUGH */
 
 
-               case SIGCONT:
-                       p->p_sig &= ~stops;
-                       break;
+       case SIGKILL:
+               if (p->p_nice > NZERO)
+                       p->p_nice = NZERO;
+               break;
 
 
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       p->p_sig &= ~sigmask(SIGCONT);
-                       break;
-               }
+       case SIGCONT:
+               p->p_sig &= ~stopsigmask;
+               break;
+
+       case SIGTSTP:
+       case SIGTTIN:
+       case SIGTTOU:
+       case SIGSTOP:
+               p->p_sig &= ~sigmask(SIGCONT);
+               break;
        }
        }
-#undef stops
+       p->p_sig |= mask;
+
        /*
        /*
-        * Defer further processing for signals which are held.
+        * Defer further processing for signals which are held,
+        * except that stopped processes must be continued by SIGCONT.
         */
         */
-       if (action == SIG_HOLD)
+       if (action == SIG_HOLD && (sig != SIGCONT || p->p_stat != SSTOP))
                return;
        s = splhigh();
        switch (p->p_stat) {
 
        case SSLEEP:
                /*
                return;
        s = splhigh();
        switch (p->p_stat) {
 
        case SSLEEP:
                /*
-                * If process is sleeping at negative priority
+                * If process is sleeping uninterruptibly
                 * we can't interrupt the sleep... the signal will
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */
                 * we can't interrupt the sleep... the signal will
                 * be noticed when the process returns through
                 * trap() or syscall().
                 */
-               if (p->p_pri <= PZERO)
+               if ((p->p_flag & SSINTR) == 0)
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
                        goto out;
                /*
                 * Process is sleeping and traced... make it runnable
@@ -346,28 +626,15 @@ psignal(p, sig)
                 */
                if (p->p_flag&STRC)
                        goto run;
                 */
                if (p->p_flag&STRC)
                        goto run;
-               switch (sig) {
-
-               case SIGSTOP:
-               case SIGTSTP:
-               case SIGTTIN:
-               case SIGTTOU:
-                       /*
-                        * These are the signals which by default
-                        * stop a process.
-                        */
+               /*
+                * 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 (action != SIG_DFL)
                        if (action != SIG_DFL)
-                               goto run;
-                       /*
-                        * Don't clog system with children of init
-                        * stopped from the keyboard.
-                        */
-                       if (sig != SIGSTOP && p->p_pptr == &proc[1]) {
-                               psignal(p, SIGKILL);
-                               p->p_sig &= ~mask;
-                               splx(s);
-                               return;
-                       }
+                               goto runfast;
                        /*
                         * If a child in vfork(), stopping could
                         * cause deadlock.
                        /*
                         * If a child in vfork(), stopping could
                         * cause deadlock.
@@ -375,30 +642,13 @@ psignal(p, sig)
                        if (p->p_flag&SVFORK)
                                goto out;
                        p->p_sig &= ~mask;
                        if (p->p_flag&SVFORK)
                                goto out;
                        p->p_sig &= ~mask;
-                       p->p_cursig = sig;
+                       p->p_xstat = sig;
+                       if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                               psignal(p->p_pptr, SIGCHLD);
                        stop(p);
                        goto out;
                        stop(p);
                        goto out;
-
-               case SIGIO:
-               case SIGURG:
-               case SIGCHLD:
-               case SIGWINCH:
-                       /*
-                        * These signals are special in that they
-                        * don't get propogated... if the process
-                        * isn't interested, forget it.
-                        */
-                       if (action != SIG_DFL)
-                               goto run;
-                       p->p_sig &= ~mask;              /* take it away */
-                       goto out;
-
-               default:
-                       /*
-                        * All other signals cause the process to run
-                        */
-                       goto run;
-               }
+               } else
+                       goto runfast;
                /*NOTREACHED*/
 
        case SSTOP:
                /*NOTREACHED*/
 
        case SSTOP:
@@ -414,16 +664,24 @@ psignal(p, sig)
                        /*
                         * Kill signal always sets processes running.
                         */
                        /*
                         * Kill signal always sets processes running.
                         */
-                       goto run;
+                       goto runfast;
 
                case SIGCONT:
                        /*
 
                case SIGCONT:
                        /*
+                        * 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
                         * an event, then it goes back to run state.
                         * Otherwise, process goes back to sleep state.
                         */
                         * 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 || p->p_wchan == 0)
+                       if (action == SIG_DFL)
+                               p->p_sig &= ~mask;
+                       if (action == SIG_CATCH)
+                               goto runfast;
+                       if (p->p_wchan == 0)
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;
                                goto run;
                        p->p_stat = SSLEEP;
                        goto out;
@@ -442,12 +700,11 @@ psignal(p, sig)
                default:
                        /*
                         * If process is sleeping interruptibly, then
                default:
                        /*
                         * If process is sleeping interruptibly, then
-                        * unstick it so that when it is continued
-                        * it can look at the signal.
-                        * But don't setrun the process as its not to
-                        * be unstopped by the signal alone.
+                        * 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_pri > PZERO)
+                       if (p->p_wchan && p->p_flag & SSINTR)
                                unsleep(p);
                        goto out;
                }
                                unsleep(p);
                        goto out;
                }
@@ -460,176 +717,162 @@ psignal(p, sig)
                 * It will either never be noticed, or noticed very soon.
                 */
                if (p == u.u_procp && !noproc)
                 * It will either never be noticed, or noticed very soon.
                 */
                if (p == u.u_procp && !noproc)
-#include "../vax/mtpr.h"
                        aston();
                goto out;
        }
        /*NOTREACHED*/
                        aston();
                goto out;
        }
        /*NOTREACHED*/
-run:
+
+runfast:
        /*
         * Raise priority to at least PUSER.
         */
        if (p->p_pri > PUSER)
                p->p_pri = PUSER;
        /*
         * Raise priority to at least PUSER.
         */
        if (p->p_pri > PUSER)
                p->p_pri = PUSER;
+run:
        setrun(p);
 out:
        splx(s);
 }
 
 /*
        setrun(p);
 out:
        splx(s);
 }
 
 /*
- * Returns true if the current
- * process has a signal to process.
- * The signal to process is put in p_cursig.
+ * 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.)
  * 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.)
- * A signal does not do anything
- * directly to a process; it sets
- * a flag that asks the process to
- * do something to itself.
  */
 issig()
 {
  */
 issig()
 {
-       register struct proc *p;
-       register int sig;
-       int sigbits, mask;
+       register struct proc *p = u.u_procp;            /* XXX */
+       register int sig, mask;
 
 
-       p = u.u_procp;
        for (;;) {
        for (;;) {
-               sigbits = p->p_sig &~ p->p_sigmask;
-               if ((p->p_flag&STRC) == 0)
-                       sigbits &= ~p->p_sigignore;
+               mask = p->p_sig &~ p->p_sigmask;
                if (p->p_flag&SVFORK)
                if (p->p_flag&SVFORK)
-#define bit(a) (1<<(a-1))
-                       sigbits &= ~(bit(SIGSTOP)|bit(SIGTSTP)|bit(SIGTTIN)|bit(SIGTTOU));
-               if (sigbits == 0)
-                       break;
-               sig = ffs(sigbits);
+                       mask &= ~stopsigmask;
+               if (mask == 0)          /* no signal to send */
+                       return (0);
+               sig = ffs((long)mask);
                mask = sigmask(sig);
                mask = sigmask(sig);
-               p->p_sig &= ~mask;              /* take the signal! */
-               p->p_cursig = sig;
+               /*
+                * We should see pending but ignored signals
+                * only if STRC was on when they were posted.
+                */
+               if (mask & p->p_sigignore && (p->p_flag&STRC) == 0) {
+                       p->p_sig &= ~mask;
+                       continue;
+               }
                if (p->p_flag&STRC && (p->p_flag&SVFORK) == 0) {
                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */
                if (p->p_flag&STRC && (p->p_flag&SVFORK) == 0) {
                        /*
                         * If traced, always stop, and stay
                         * stopped until released by the parent.
                         */
+                       p->p_xstat = sig;
+                       psignal(p->p_pptr, SIGCHLD);
                        do {
                                stop(p);
                                swtch();
                        do {
                                stop(p);
                                swtch();
-                       } while (!procxmt() && p->p_flag&STRC);
+                       } while (!procxmt(p) && p->p_flag&STRC);
 
                        /*
                         * If the traced bit got turned off,
 
                        /*
                         * If the traced bit got turned off,
-                        * then put the signal taken above back into p_sig
-                        * and go back up to the top to rescan signals.
+                        * go back up to the top to rescan signals.
                         * This ensures that p_sig* and u_signal are consistent.
                         */
                         * This ensures that p_sig* and u_signal are consistent.
                         */
-                       if ((p->p_flag&STRC) == 0) {
-                               p->p_sig |= mask;
+                       if ((p->p_flag&STRC) == 0)
                                continue;
                                continue;
-                       }
 
                        /*
                         * If parent wants us to take the signal,
 
                        /*
                         * 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.
                         */
-                       sig = p->p_cursig;
+                       p->p_sig &= ~mask;      /* clear the old signal */
+                       sig = p->p_xstat;
                        if (sig == 0)
                                continue;
 
                        /*
                        if (sig == 0)
                                continue;
 
                        /*
-                        * If signal is being masked put it back
-                        * into p_sig and look for other signals.
+                        * Put the new signal into p_sig.
+                        * If signal is being masked,
+                        * look for other signals.
                         */
                        mask = sigmask(sig);
                         */
                        mask = sigmask(sig);
-                       if (p->p_sigmask & mask) {
-                               p->p_sig |= mask;
+                       p->p_sig |= mask;
+                       if (p->p_sigmask & mask)
                                continue;
                                continue;
-                       }
                }
                }
-               switch (u.u_signal[sig]) {
+
+               /*
+                * Decide whether the signal should be returned.
+                * Return the signal's number, or fall through
+                * to clear it from the pending mask.
+                */
+               switch ((int)u.u_signal[sig]) {
 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */
                        if (p->p_ppid == 0)
 
                case SIG_DFL:
                        /*
                         * Don't take default actions on system processes.
                         */
                        if (p->p_ppid == 0)
-                               break;
-                       switch (sig) {
-
-                       case SIGTSTP:
-                       case SIGTTIN:
-                       case SIGTTOU:
-                               /*
-                                * Children of init aren't allowed to stop
-                                * on signals from the keyboard.
-                                */
-                               if (p->p_pptr == &proc[1]) {
-                                       psignal(p, SIGKILL);
-                                       continue;
-                               }
-                               /* fall into ... */
-
-                       case SIGSTOP:
-                               if (p->p_flag&STRC)
-                                       continue;
+                               break;          /* == ignore */
+                       /*
+                        * If there is a pending stop signal to process
+                        * with default action, stop here,
+                        * 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 ||
+                                   (p->p_pgrp->pg_jobc == 0 &&
+                                   mask & ttystopsigmask))
+                                       break;  /* == ignore */
+                               p->p_xstat = sig;
                                stop(p);
                                stop(p);
+                               if ((p->p_pptr->p_flag & SNOCLDSTOP) == 0)
+                                       psignal(p->p_pptr, SIGCHLD);
                                swtch();
                                swtch();
-                               continue;
-
-                       case SIGCONT:
-                       case SIGCHLD:
-                       case SIGURG:
-                       case SIGIO:
-                       case SIGWINCH:
+                               break;
+                       } else if (mask & defaultignmask) {
                                /*
                                /*
-                                * These signals are normally not
-                                * sent if the action is the default.
+                                * Except for SIGCONT, shouldn't get here.
+                                * Default action is to ignore; drop it.
                                 */
                                 */
-                               continue;               /* == ignore */
-
-                       default:
-                               goto send;
-                       }
+                               break;          /* == ignore */
+                       } else
+                               return (sig);
                        /*NOTREACHED*/
 
                        /*NOTREACHED*/
 
-               case SIG_HOLD:
                case SIG_IGN:
                        /*
                case SIG_IGN:
                        /*
-                        * Masking above should prevent us
-                        * ever trying to take action on a held
-                        * or ignored signal, unless process is traced.
+                        * Masking above should prevent us ever trying
+                        * to take action on an ignored signal other
+                        * than SIGCONT, unless process is traced.
                         */
                         */
-                       if ((p->p_flag&STRC) == 0)
+                       if (sig != SIGCONT && (p->p_flag&STRC) == 0)
                                printf("issig\n");
                                printf("issig\n");
-                       continue;
+                       break;          /* == ignore */
 
                default:
                        /*
                         * This signal has an action, let
                         * psig process it.
                         */
 
                default:
                        /*
                         * This signal has an action, let
                         * psig process it.
                         */
-                       goto send;
+                       return (sig);
                }
                }
-               /*NOTREACHED*/
+               p->p_sig &= ~mask;              /* take the signal! */
        }
        }
-       /*
-        * Didn't find a signal to send.
-        */
-       p->p_cursig = 0;
-       return (0);
-
-send:
-       /*
-        * Let psig process the signal.
-        */
-       return (sig);
+       /* NOTREACHED */
 }
 
 /*
  * Put the argument process into the stopped
 }
 
 /*
  * Put the argument process into the stopped
- * state and notify the parent via wakeup and/or signal.
+ * 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;
  */
 stop(p)
        register struct proc *p;
@@ -638,141 +881,167 @@ stop(p)
        p->p_stat = SSTOP;
        p->p_flag &= ~SWTED;
        wakeup((caddr_t)p->p_pptr);
        p->p_stat = SSTOP;
        p->p_flag &= ~SWTED;
        wakeup((caddr_t)p->p_pptr);
-       /*
-        * Avoid sending signal to parent if process is traced
-        */
-       if (p->p_flag&STRC)
-               return;
-       psignal(p->p_pptr, SIGCHLD);
 }
 
 /*
 }
 
 /*
- * Perform the action specified by
- * the current signal.
+ * Perform the action specified by the current signal.
  * The usual sequence is:
  * The usual sequence is:
- *     if (issig())
- *             psig();
- * The signal bit has already been cleared by issig,
- * and the current signal number stored in p->p_cursig.
+ *     if (sig = CURSIG(p))
+ *             psig(sig);
  */
  */
-psig()
+psig(sig)
+       register int sig;
 {
        register struct proc *p = u.u_procp;
 {
        register struct proc *p = u.u_procp;
-       register int sig = p->p_cursig;
-       int mask = sigmask(sig), returnmask;
-       register int (*action)();
-
-       if (sig == 0)
-               panic("psig");
-       action = u.u_signal[sig];
-       if (action != SIG_DFL) {
-               if (action == SIG_IGN || (p->p_sigmask & mask))
-                       panic("psig action");
-               u.u_error = 0;
-               /*
-                * Set the new mask value and also defer further
-                * occurences of this signal (unless we're simulating
-                * the old signal facilities). 
-                *
-                * 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 & SOUSIG) {
-                       if (sig != SIGILL && sig != SIGTRAP) {
-                               u.u_signal[sig] = SIG_DFL;
-                               p->p_sigcatch &= ~mask;
-                       }
-                       mask = 0;
+       int mask, returnmask;
+       register sig_t action;
+
+       do {
+#ifdef DIAGNOSTIC
+               if (sig == 0)
+                       panic("psig");
+#endif
+               mask = sigmask(sig);
+               p->p_sig &= ~mask;
+               action = u.u_signal[sig];
+#ifdef KTRACE
+               if (KTRPOINT(p, KTR_PSIG))
+                       ktrpsig(p->p_tracep, sig, action, p->p_flag & SOMASK ?
+                               u.u_oldmask : p->p_sigmask, 0);
+#endif
+               if (action != SIG_DFL) {
+#ifdef DIAGNOSTIC
+                       if (action == SIG_IGN || (p->p_sigmask & mask))
+                               panic("psig action");
+#endif
+                       /*
+                        * 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;
                }
                }
-               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);
-               p->p_cursig = 0;
-               return;
-       }
-       u.u_acflag |= AXSIG;
-       switch (sig) {
+               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())
-                       sig += 0200;
-       }
-       exit(sig);
+               case SIGILL:
+               case SIGIOT:
+               case SIGBUS:
+               case SIGQUIT:
+               case SIGTRAP:
+               case SIGEMT:
+               case SIGFPE:
+               case SIGSEGV:
+               case SIGSYS:
+                       u.u_sig = sig;
+                       if (core() == 0)
+                               sig |= WCOREFLAG;
+               }
+               exit(p, W_EXITCODE(0, sig));
+               /* NOTREACHED */
+       } while (sig = CURSIG(p));
 }
 
 /*
 }
 
 /*
- * Create a core image on the file "core"
- * If you are looking for protection glitches,
- * there are probably a wealth of them here
- * when this occurs to a suid command.
- *
+ * Create a core image on the file "core".
  * It writes UPAGES block of the
  * user.h area followed by the entire
  * data+stack segments.
  */
 core()
 {
  * It writes UPAGES block of the
  * user.h area followed by the entire
  * data+stack segments.
  */
 core()
 {
-       register struct inode *ip;
+       register struct vnode *vp;
+       register struct proc *p = u.u_procp;
        register struct nameidata *ndp = &u.u_nd;
        register struct nameidata *ndp = &u.u_nd;
+       struct vattr vattr;
+       int error;
 
 
-       if (u.u_uid != u.u_ruid || u.u_gid != u.u_rgid)
-               return (0);
-       if (ctob(UPAGES+u.u_dsize+u.u_ssize) >=
+       if (p->p_svuid != p->p_ruid || p->p_svgid != p->p_rgid)
+               return (EFAULT);
+       if (ctob(UPAGES + u.u_dsize + u.u_ssize) >=
            u.u_rlimit[RLIMIT_CORE].rlim_cur)
            u.u_rlimit[RLIMIT_CORE].rlim_cur)
-               return (0);
-       u.u_error = 0;
-       ndp->ni_nameiop = CREATE | FOLLOW;
+               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";
        ndp->ni_segflg = UIO_SYSSPACE;
        ndp->ni_dirp = "core";
-       ip = namei(ndp);
-       if (ip == NULL) {
-               if (u.u_error)
-                       return (0);
-               ip = maknode(0644, ndp);
-               if (ip==NULL)
-                       return (0);
+       if (error = vn_open(ndp, FCREAT|FWRITE, 0644))
+               return (error);
+       vp = ndp->ni_vp;
+       VOP_LOCK(vp);
+       if (vp->v_type != VREG ||
+           VOP_GETATTR(vp, &vattr, u.u_cred) ||
+           vattr.va_nlink != 1) {
+               vput(vp);
+               return (EFAULT);
        }
        }
-       if (access(ip, IWRITE) ||
-          (ip->i_mode&IFMT) != IFREG ||
-          ip->i_nlink != 1) {
-               u.u_error = EFAULT;
-               goto out;
+#ifdef MAPMEM
+       if (error = mmcore(p)) {
+               vput(vp);
+               return (error);
        }
        }
-       itrunc(ip, (u_long)0);
+#endif
+       VATTR_NULL(&vattr);
+       vattr.va_size = 0;
+       VOP_SETATTR(vp, &vattr, u.u_cred);
        u.u_acflag |= ACORE;
        u.u_acflag |= ACORE;
-       u.u_error = rdwri(UIO_WRITE, ip,
-           (caddr_t)&u,
-           ctob(UPAGES),
-           0, 1, (int *)0);
-       if (u.u_error == 0)
-               u.u_error = rdwri(UIO_WRITE, ip,
-                   (caddr_t)ctob(dptov(u.u_procp, 0)),
-                   ctob(u.u_dsize),
-                   ctob(UPAGES), 0, (int *)0);
-       if (u.u_error == 0)
-               u.u_error = rdwri(UIO_WRITE, ip,
-                   (caddr_t)ctob(sptov(u.u_procp, u.u_ssize - 1)),
-                   ctob(u.u_ssize),
-                   ctob(UPAGES)+ctob(u.u_dsize), 0, (int *)0);
-out:
-       iput(ip);
-       return (u.u_error == 0);
+#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 (u.u_pcb.pcb_flags & PCB_HPUXBIN)
+               error = hpuxdumpu(vp, ndp->ni_cred);
+       else
+#endif
+       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);
+       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);
+       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);
+       return (error);
+}
+
+/*
+ * Nonexistent system call-- signal process (may want to handle it).
+ * Flag error in case process won't see signal immediately (blocked or ignored).
+ */
+/* ARGSUSED */
+nosys(p, args, retval)
+       struct proc *p;
+       void *args;
+       int *retval;
+{
+
+       psignal(p, SIGSYS);
+       return (EINVAL);
 }
 }
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.