fix up header file dependencies

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

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index 10e0174..8e19b86 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     4.21    82/01/30        */
+/*     kern_proc.c     4.39    82/09/12        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -6,6 +6,7 @@
 #include "../h/mtpr.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/mtpr.h"
 #include "../h/dir.h"
 #include "../h/user.h"

+#include "../h/kernel.h"

 #include "../h/proc.h"
 #include "../h/buf.h"
 #include "../h/reg.h"
 #include "../h/proc.h"
 #include "../h/buf.h"
 #include "../h/reg.h"


@@ -17,8 +18,61 @@
 #include "../h/vm.h"
 #include "../h/text.h"
 #include "../h/psl.h"
 #include "../h/vm.h"
 #include "../h/text.h"
 #include "../h/psl.h"

-#include "../h/vlimit.h"

 #include "../h/file.h"
 #include "../h/file.h"

+#include "../h/quota.h"
+#include "../h/descrip.h"
+#include "../h/uio.h"
+#include "../h/mbuf.h"
+
+gethostid()
+{
+
+       u.u_r.r_val1 = hostid;
+}
+
+sethostid()
+{
+       struct a {
+               int     hostid;
+       } *uap = (struct a *)u.u_ap;
+
+       if (suser())
+               hostid = uap->hostid;
+}
+
+gethostname()
+{
+       register struct a {
+               char    *hostname;
+               int     len;
+       } *uap = (struct a *)u.u_ap;
+       register u_int len;
+
+       len = uap->len;
+       if (len > hostnamelen)
+               len = hostnamelen;
+       if (copyout((caddr_t)hostname, (caddr_t)uap->hostname, len))
+               u.u_error = EFAULT;
+}
+
+sethostname()
+{
+       register struct a {
+               char    *hostname;
+               u_int   len;
+       } *uap = (struct a *)u.u_ap;
+
+       if (!suser())
+               return;
+       if (uap->len > sizeof (hostname) - 1) {
+               u.u_error = EINVAL;
+               return;
+       }
+       hostnamelen = uap->len;
+       if (copyin((caddr_t)uap->hostname, hostname, uap->len))
+               u.u_error = EFAULT;
+       hostname[hostnamelen] = 0;
+}

 
 /*
  * exec system call, with and without environments.
 
 /*
  * exec system call, with and without environments.


@@ -29,13 +83,13 @@ struct execa {
        char    **envp;
 };
 
        char    **envp;
 };
 

-exec()
+execv()

 {
        ((struct execa *)u.u_ap)->envp = NULL;
 {
        ((struct execa *)u.u_ap)->envp = NULL;

-       exece();
+       execve();

 }
 
 }
 

-exece()
+execve()

 {
        register nc;
        register char *cp;
 {
        register nc;
        register char *cp;


@@ -46,10 +100,11 @@ exece()
        char *sharg;
        struct inode *ip;
        swblk_t bno;
        char *sharg;
        struct inode *ip;
        swblk_t bno;

-       char cfname[DIRSIZ];
+       char cfname[MAXNAMLEN + 1];

        char cfarg[SHSIZE];
        char cfarg[SHSIZE];

+       int resid;

 
 

-       if ((ip = namei(uchar, 0)) == NULL)
+       if ((ip = namei(uchar, 0, 1)) == NULL)

                return;
        bno = 0;
        bp = 0;
                return;
        bno = 0;
        bp = 0;


@@ -86,19 +141,18 @@ exece()
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */

-       u.u_base = (caddr_t)&u.u_exdata;
-       u.u_count = sizeof(u.u_exdata);
-       u.u_offset = 0;
-       u.u_segflg = 1;
-       readi(ip);
-       u.u_segflg = 0;
+       u.u_error = rdwri(UIO_READ, ip, (caddr_t)&u.u_exdata, sizeof (u.u_exdata),
+           0, 1, &resid);

        if (u.u_error)
                goto bad;
        if (u.u_error)
                goto bad;

+       u.u_count = resid;
+#ifndef lint

        if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
            u.u_exdata.ux_shell[0] != '#') {
                u.u_error = ENOEXEC;
                goto bad;
        }
        if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
            u.u_exdata.ux_shell[0] != '#') {
                u.u_error = ENOEXEC;
                goto bad;
        }

+#endif

        switch (u.u_exdata.ux_mag) {
 
        case 0407:
        switch (u.u_exdata.ux_mag) {
 
        case 0407:


@@ -151,10 +205,11 @@ exece()
                                sharg = cfarg;
                        }
                }
                                sharg = cfarg;
                        }
                }

-               bcopy((caddr_t)u.u_dbuf, (caddr_t)cfname, DIRSIZ);
+               bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,
+                   (unsigned)(u.u_dent.d_namlen + 1));

                indir = 1;
                iput(ip);
                indir = 1;
                iput(ip);

-               ip = namei(schar, 0);
+               ip = namei(schar, 0, 1);

                if (ip == NULL)
                        return;
                goto again;
                if (ip == NULL)
                        return;
                goto again;


@@ -188,7 +243,7 @@ exece()
                        uap->envp++;
                        ne++;
                }
                        uap->envp++;
                        ne++;
                }

-               if (ap==NULL)
+               if (ap == NULL)

                        break;
                na++;
                if (ap == -1)
                        break;
                na++;
                if (ap == -1)


@@ -206,28 +261,31 @@ exece()
                                bp = 0;
                                goto badarg;
                        }
                                bp = 0;
                                goto badarg;
                        }

-                       if ((nc&BMASK) == 0) {
+                       if (nc % (CLSIZE*NBPG) == 0) {

                                if (bp)
                                        bdwrite(bp);
                                if (bp)
                                        bdwrite(bp);

-                               bp = getblk(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
+                               bp = getblk(argdev, bno + nc / NBPG,
+                                   CLSIZE*NBPG);

                                cp = bp->b_un.b_addr;
                        }
                        nc++;
                        *cp++ = c;
                                cp = bp->b_un.b_addr;
                        }
                        nc++;
                        *cp++ = c;

-               } while (c>0);
+               } while (c > 0);

        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);
        }
        if (bp)
                bdwrite(bp);
        bp = 0;
        nc = (nc + NBPW-1) & ~(NBPW-1);

-       if (indir)
-               bcopy((caddr_t)cfname, (caddr_t)u.u_dbuf, DIRSIZ);
+       if (indir) {
+               u.u_dent.d_namlen = strlen(cfname);
+               bcopy((caddr_t)cfname, (caddr_t)u.u_dent.d_name,
+                   (unsigned)(u.u_dent.d_namlen + 1));
+       }

        getxfile(ip, nc + (na+4)*NBPW, uid, gid);
        if (u.u_error) {
 badarg:
        getxfile(ip, nc + (na+4)*NBPW, uid, gid);
        if (u.u_error) {
 badarg:

-               for (c = 0; c < nc; c += BSIZE)
-                       if (bp = baddr(argdev, dbtofsb(bno)+(c>>BSHIFT))) {
+               for (c = 0; c < nc; c += CLSIZE*NBPG)
+                       if (bp = baddr(argdev, bno + c / NBPG, CLSIZE*NBPG)) {

                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                brelse(bp);
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                brelse(bp);


@@ -254,11 +312,11 @@ badarg:
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {
                        break;
                (void) suword((caddr_t)ap, ucp);
                do {

-                       if ((nc&BMASK) == 0) {
+                       if (nc % (CLSIZE*NBPG) == 0) {

                                if (bp)
                                        brelse(bp);
                                if (bp)
                                        brelse(bp);

-                               bp = bread(argdev,
-                                   (daddr_t)(dbtofsb(bno)+(nc>>BSHIFT)));
+                               bp = bread(argdev, bno + nc / NBPG,
+                                   CLSIZE*NBPG);

                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;
                                bp->b_flags |= B_AGE;           /* throw away */
                                bp->b_flags &= ~B_DELWRI;       /* cancel io */
                                cp = bp->b_un.b_addr;


@@ -296,9 +354,8 @@ register struct inode *ip;
                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {
                register struct file *fp;
 
                for (fp = file; fp < fileNFILE; fp++) {

-                       if (fp->f_flag & FSOCKET)
-                               continue;
-                       if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
+                       if (fp->f_type == DTYPE_FILE &&
+                           fp->f_inode == ip && (fp->f_flag&FWRITE)) {

                                u.u_error = ETXTBSY;
                                goto bad;
                        }
                                u.u_error = ETXTBSY;
                                goto bad;
                        }


@@ -330,7 +387,6 @@ register struct inode *ip;
         * parent who will set SVFDONE when he has taken back
         * our resources.
         */
         * parent who will set SVFDONE when he has taken back
         * our resources.
         */

-       u.u_prof.pr_scale = 0;

        if ((u.u_procp->p_flag & SVFORK) == 0)
                vrelvm();
        else {
        if ((u.u_procp->p_flag & SVFORK) == 0)
                vrelvm();
        else {


@@ -347,15 +403,12 @@ register struct inode *ip;
        u.u_smap = u.u_csmap;
        vgetvm(ts, ds, ss);
 
        u.u_smap = u.u_csmap;
        vgetvm(ts, ds, ss);
 

-       if (pagi == 0) {
-               /*
-                * Read in data segment.
-                */
-               u.u_base = (char *)ctob(ts);
-               u.u_offset = sizeof(u.u_exdata)+u.u_exdata.ux_tsize;
-               u.u_count = u.u_exdata.ux_dsize;
-               readi(ip);
-       }
+       if (pagi == 0)
+               u.u_error =
+                   rdwri(UIO_READ, ip,
+                       (char*)ctob(ts), (int)u.u_exdata.ux_dsize,
+                       (int)(sizeof(u.u_exdata)+u.u_exdata.ux_tsize),
+                       0, (int *)0);

        xalloc(ip, pagi);
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),
        xalloc(ip, pagi);
        if (pagi && u.u_procp->p_textp)
                vinifod((struct fpte *)dptopte(u.u_procp, 0),


@@ -365,6 +418,8 @@ register struct inode *ip;
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
        mtpr(TBIA, 0);
 
        /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
        mtpr(TBIA, 0);
 

+       if (u.u_error)
+               swkill(u.u_procp, "i/o error mapping pages");

        /*
         * set SUID/SGID protections, if no tracing
         */
        /*
         * set SUID/SGID protections, if no tracing
         */


@@ -372,6 +427,7 @@ register struct inode *ip;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;
                u.u_uid = uid;
                u.u_procp->p_uid = uid;
                u.u_gid = gid;

+               entergroup(gid);

        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;
        } else
                psignal(u.u_procp, SIGTRAP);
        u.u_tsize = ts;


@@ -390,7 +446,7 @@ setregs()
        register i;
        long sigmask;
 
        register i;
        long sigmask;
 

-       for (rp = &u.u_signal[0], sigmask = 1L; rp < &u.u_signal[NSIG];
+       for (rp = &u.u_signal[1], sigmask = 1L; rp < &u.u_signal[NSIG];

            sigmask <<= 1, rp++) {
                switch (*rp) {
 
            sigmask <<= 1, rp++) {
                switch (*rp) {
 


@@ -408,7 +464,7 @@ setregs()
                        if ((int)*rp & 1)
                                u.u_procp->p_siga0 |= sigmask;
                        else
                        if ((int)*rp & 1)
                                u.u_procp->p_siga0 |= sigmask;
                        else

-                               u.u_procp->p_siga1 &= ~sigmask;
+                               u.u_procp->p_siga0 &= ~sigmask;

                        if ((int)*rp & 2)
                                u.u_procp->p_siga1 |= sigmask;
                        else
                        if ((int)*rp & 2)
                                u.u_procp->p_siga1 |= sigmask;
                        else


@@ -424,9 +480,9 @@ setregs()
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&EXCLOSE) {
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
        for (i=0; i<NOFILE; i++) {
                if (u.u_pofile[i]&EXCLOSE) {

-                       closef(u.u_ofile[i], 1);
+                       closef(u.u_ofile[i], 1, u.u_pofile[i]);

                        u.u_ofile[i] = NULL;
                        u.u_ofile[i] = NULL;

-                       u.u_pofile[i] &= ~EXCLOSE;
+                       u.u_pofile[i] = 0;

                }
        }
 
                }
        }
 


@@ -434,7 +490,8 @@ setregs()
         * Remember file name for accounting.
         */
        u.u_acflag &= ~AFORK;
         * Remember file name for accounting.
         */
        u.u_acflag &= ~AFORK;

-       bcopy((caddr_t)u.u_dbuf, (caddr_t)u.u_comm, DIRSIZ);
+       bcopy((caddr_t)u.u_dent.d_name, (caddr_t)u.u_comm,
+           (unsigned)(u.u_dent.d_namlen + 1));

 }
 
 /*
 }
 
 /*


@@ -461,7 +518,6 @@ exit(rv)
 {
        register int i;
        register struct proc *p, *q;
 {
        register int i;
        register struct proc *p, *q;

-       register struct file *f;

        register int x;
 
 #ifdef PGINPROF
        register int x;
 
 #ifdef PGINPROF


@@ -470,7 +526,6 @@ exit(rv)
        p = u.u_procp;
        p->p_flag &= ~(STRC|SULOCK);
        p->p_flag |= SWEXIT;
        p = u.u_procp;
        p->p_flag &= ~(STRC|SULOCK);
        p->p_flag |= SWEXIT;

-       p->p_clktim = 0;

        (void) spl6();
        if ((int)SIG_IGN & 1)
                p->p_siga0 = ~0;
        (void) spl6();
        if ((int)SIG_IGN & 1)
                p->p_siga0 = ~0;


@@ -485,6 +540,7 @@ exit(rv)
        p->p_pctcpu = 0;
        for (i=0; i<NSIG; i++)
                u.u_signal[i] = SIG_IGN;
        p->p_pctcpu = 0;
        for (i=0; i<NSIG; i++)
                u.u_signal[i] = SIG_IGN;

+       untimeout(realitexpire, p);

        /*
         * Release virtual memory.  If we resulted from
         * a vfork(), instead give the resources back to
        /*
         * Release virtual memory.  If we resulted from
         * a vfork(), instead give the resources back to


@@ -499,10 +555,17 @@ exit(rv)
                        sleep((caddr_t)p, PZERO - 1);
                p->p_flag &= ~SVFDONE;
        }
                        sleep((caddr_t)p, PZERO - 1);
                p->p_flag &= ~SVFDONE;
        }

-       for (i=0; i<NOFILE; i++) {
+       for (i = 0; i < NOFILE; i++) {
+#ifdef notdef
+               /* why was this like this? */

                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;
                closef(f, 1);
                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;
                closef(f, 1);

+#else
+               closef(u.u_ofile[i], 1, u.u_pofile[i]);
+               u.u_ofile[i] = NULL;
+               u.u_pofile[i] = 0;
+#endif

        }
        ilock(u.u_cdir);
        iput(u.u_cdir);
        }
        ilock(u.u_cdir);
        iput(u.u_cdir);


@@ -510,8 +573,11 @@ exit(rv)
                ilock(u.u_rdir);
                iput(u.u_rdir);
        }
                ilock(u.u_rdir);
                iput(u.u_rdir);
        }

-       u.u_limit[LIM_FSIZE] = INFINITY;
+       u.u_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;

        acct();
        acct();

+#ifdef QUOTA
+       qclean();
+#endif

        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);
        (void) spl5();          /* hack for mem alloc race XXX */
        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);
        (void) spl5();          /* hack for mem alloc race XXX */


@@ -533,11 +599,22 @@ exit(rv)
        if (p->p_pid == 1)
                panic("init died");
 done:
        if (p->p_pid == 1)
                panic("init died");
 done:

-       ((struct xproc *)p)->xp_xstat = rv;             /* overlay */
-       ((struct xproc *)p)->xp_vm = u.u_vm;            /* overlay */
-       vmsadd(&((struct xproc *)p)->xp_vm, &u.u_cvm);
+       p->p_xstat = rv;
+       { struct mbuf *m = m_getclr(M_DONTWAIT); p->p_ru = mtod(m, struct rusage *); }
+       *p->p_ru = u.u_ru;
+       ruadd(p->p_ru, &u.u_cru);

        for (q = proc; q < procNPROC; q++)
                if (q->p_pptr == p) {
        for (q = proc; q < procNPROC; q++)
                if (q->p_pptr == p) {

+                       if (q->p_osptr)
+                               q->p_osptr->p_ysptr = q->p_ysptr;
+                       if (q->p_ysptr)
+                               q->p_ysptr->p_osptr = q->p_osptr;
+                       if (proc[1].p_cptr)
+                               proc[1].p_cptr->p_ysptr = q;
+                       q->p_osptr = proc[1].p_cptr;
+                       q->p_ysptr = NULL;
+                       proc[1].p_cptr = q;
+

                        q->p_pptr = &proc[1];
                        q->p_ppid = 1;
                        wakeup((caddr_t)&proc[1]);
                        q->p_pptr = &proc[1];
                        q->p_ppid = 1;
                        wakeup((caddr_t)&proc[1]);


@@ -562,25 +639,28 @@ done:
                         */
                        (void) spgrp(q, -1);
                }
                         */
                        (void) spgrp(q, -1);
                }

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

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

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

        swtch();
 }
 
        swtch();
 }
 

-wait()
+#include <vtimes.h>
+
+owait()

 {
 {

-       struct vtimes vm;
-       struct vtimes *vp;
+       struct rusage ru;
+       struct vtimes *vtp, avt;

 
        if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {
 
        if ((u.u_ar0[PS] & PSL_ALLCC) != PSL_ALLCC) {

-               wait1(0, (struct vtimes *)0);
+               wait1(0, (struct rusage *)0);

                return;
        }
                return;
        }

-       vp = (struct vtimes *)u.u_ar0[R1];
-       wait1(u.u_ar0[R0], &vm);
+       vtp = (struct vtimes *)u.u_ar0[R1];
+       wait1(u.u_ar0[R0], &ru);

        if (u.u_error)
                return;
        if (u.u_error)
                return;

-       (void) copyout((caddr_t)&vm, (caddr_t)vp, sizeof (struct vtimes));
+       getvtimes(&ru, &avt);
+       (void) copyout((caddr_t)&avt, (caddr_t)vtp, sizeof (struct vtimes));

 }
 
 /*
 }
 
 /*


@@ -590,12 +670,12 @@ wait()
  * Look also for stopped (traced) children,
  * and pass back status from them.
  */
  * Look also for stopped (traced) children,
  * and pass back status from them.
  */

-wait1(options, vp)
-       register options;
-       struct vtimes *vp;
+wait1(options, ru)
+       register int options;
+       struct rusage *ru;

 {
        register f;
 {
        register f;

-       register struct proc *p;
+       register struct proc *p, *q;

 
        f = 0;
 loop:
 
        f = 0;
 loop:


@@ -604,16 +684,26 @@ loop:
                f++;
                if (p->p_stat == SZOMB) {
                        u.u_r.r_val1 = p->p_pid;
                f++;
                if (p->p_stat == SZOMB) {
                        u.u_r.r_val1 = p->p_pid;

-                       u.u_r.r_val2 = ((struct xproc *)p)->xp_xstat;
-                       ((struct xproc *)p)->xp_xstat = 0;
-                       if (vp)
-                               *vp = ((struct xproc *)p)->xp_vm;
-                       vmsadd(&u.u_cvm, &((struct xproc *)p)->xp_vm);
-                       ((struct xproc *)p)->xp_vm = zvms;
+                       u.u_r.r_val2 = p->p_xstat;
+                       p->p_xstat = 0;
+                       if (ru)
+                               *ru = *p->p_ru;
+                       ruadd(&u.u_cru, p->p_ru);
+                       m_free(dtom(p->p_ru));
+                       p->p_ru = 0;

                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;
                        p->p_stat = NULL;
                        p->p_pid = 0;
                        p->p_ppid = 0;

+                       if (q = p->p_ysptr)
+                               q->p_osptr = p->p_osptr;
+                       if (q = p->p_osptr)
+                               q->p_ysptr = p->p_ysptr;
+                       if ((q = p->p_pptr)->p_cptr == p)
+                               q->p_cptr = p->p_osptr;

                        p->p_pptr = 0;
                        p->p_pptr = 0;

+                       p->p_ysptr = 0;
+                       p->p_osptr = 0;
+                       p->p_cptr = 0;

                        p->p_sig = 0;
                        p->p_siga0 = 0;
                        p->p_siga1 = 0;
                        p->p_sig = 0;
                        p->p_siga0 = 0;
                        p->p_siga1 = 0;


@@ -639,7 +729,7 @@ loop:
                u.u_r.r_val1 = 0;
                return;
        }
                u.u_r.r_val1 = 0;
                return;
        }

-       if ((u.u_procp->p_flag&SNUSIG) && setjmp(u.u_qsav)) {
+       if ((u.u_procp->p_flag&SNUSIG) && setjmp(&u.u_qsave)) {

                u.u_eosys = RESTARTSYS;
                return;
        }
                u.u_eosys = RESTARTSYS;
                return;
        }


@@ -665,17 +755,32 @@ fork()
 fork1(isvfork)
 {
        register struct proc *p1, *p2;
 fork1(isvfork)
 {
        register struct proc *p1, *p2;

+#ifndef        QUOTA

        register a;
 
        a = 0;
        register a;
 
        a = 0;

+#else
+       if (u.u_quota != NOQUOT && u.u_quota->q_plim &&
+           u.u_quota->q_cnt >= u.u_quota->q_plim) {
+               u.u_error = EPROCLIM;
+               return;
+       }
+#endif

        p2 = NULL;
        for (p1 = proc; p1 < procNPROC; p1++) {
        p2 = NULL;
        for (p1 = proc; p1 < procNPROC; p1++) {

+#ifdef QUOTA
+               if (p1->p_stat == NULL) {
+                       p2 = p1;
+                       break;
+               }
+#else

                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
                        if (p1->p_uid==u.u_uid && p1->p_stat!=NULL)
                                a++;
                }
                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
                        if (p1->p_uid==u.u_uid && p1->p_stat!=NULL)
                                a++;
                }

+#endif

        }
        /*
         * Disallow if
        }
        /*
         * Disallow if


@@ -685,7 +790,11 @@ fork1(isvfork)
         */
        if (p2==NULL)
                tablefull("proc");
         */
        if (p2==NULL)
                tablefull("proc");

+#ifdef QUOTA
+       if (p2==NULL || (u.u_uid!=0 && p2==procNPROC-1)) {
+#else

        if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {
        if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {

+#endif

                u.u_error = EAGAIN;
                if (!isvfork) {
                        (void) vsexpand(0, &u.u_cdmap, 1);
                u.u_error = EAGAIN;
                if (!isvfork) {
                        (void) vsexpand(0, &u.u_cdmap, 1);


@@ -697,8 +806,11 @@ fork1(isvfork)
        if (newproc(isvfork)) {
                u.u_r.r_val1 = p1->p_pid;
                u.u_r.r_val2 = 1;  /* child */
        if (newproc(isvfork)) {
                u.u_r.r_val1 = p1->p_pid;
                u.u_r.r_val2 = 1;  /* child */

-               u.u_start = time;
+               u.u_start = time.tv_sec;

                u.u_acflag = AFORK;
                u.u_acflag = AFORK;

+#ifdef QUOTA
+               u.u_qflags &= ~QUF_LOGIN;
+#endif

                return;
        }
        u.u_r.r_val1 = p2->p_pid;
                return;
        }
        u.u_r.r_val1 = p2->p_pid;


@@ -707,35 +819,230 @@ out:
        u.u_r.r_val2 = 0;
 }
 
        u.u_r.r_val2 = 0;
 }
 

+spgrp(top, npgrp)
+register struct proc *top;
+{
+       register struct proc *pp, *p;
+       int f = 0;
+
+       for (p = top; npgrp == -1 || u.u_uid == p->p_uid ||
+           !u.u_uid || inferior(p); p = pp) {
+               if (npgrp == -1) {
+#define        bit(a)  (1<<(a-1))
+                       p->p_sig &= ~(bit(SIGTSTP)|bit(SIGTTIN)|bit(SIGTTOU));
+               } else
+                       p->p_pgrp = npgrp;
+               f++;
+               /*
+                * Search for children.
+                */
+               for (pp = proc; pp < procNPROC; pp++)
+                       if (pp->p_pptr == p)
+                               goto cont;
+               /*
+                * Search for siblings.
+                */
+               for (; p != top; p = p->p_pptr)
+                       for (pp = p + 1; pp < procNPROC; pp++)
+                               if (pp->p_pptr == p->p_pptr)
+                                       goto cont;
+               break;
+       cont:
+               ;
+       }
+       return (f);
+}
+

 /*
 /*

- * break system call.
- *  -- bad planning: "break" is a dirty word in C.
+ * Is p an inferior of the current process?

  */
  */

-sbreak()
+inferior(p)
+       register struct proc *p;

 {
 {

-       struct a {
-               char    *nsiz;
-       };
-       register int n, d;

 
 

+       for (; p != u.u_procp; p = p->p_pptr)
+               if (p->p_ppid == 0)
+                       return (0);
+       return (1);
+}
+
+struct proc *
+pfind(pid)
+       int pid;
+{
+       register struct proc *p;
+
+       for (p = &proc[pidhash[PIDHASH(pid)]]; p != &proc[0]; p = &proc[p->p_idhash])
+               if (p->p_pid == pid)
+                       return (p);
+       return ((struct proc *)0);
+}
+
+/*
+ * Create a new process-- the internal version of
+ * sys fork.
+ * It returns 1 in the new process, 0 in the old.
+ */
+newproc(isvfork)
+       int isvfork;
+{
+       register struct proc *p;
+       register struct proc *rpp, *rip;
+       register int n;
+       register struct file *fp;
+
+       p = NULL;

        /*
        /*

-        * set n to new data size
-        * set d to new-old
+        * First, just locate a slot for a process
+        * and copy the useful info from this process into it.
+        * The panic "cannot happen" because fork has already
+        * checked for the existence of a slot.

         */
         */

+retry:
+       mpid++;
+       if (mpid >= 30000) {
+               mpid = 0;
+               goto retry;
+       }
+       for (rpp = proc; rpp < procNPROC; rpp++) {
+               if (rpp->p_stat == NULL && p==NULL)
+                       p = rpp;
+               if (rpp->p_pid==mpid || rpp->p_pgrp==mpid)
+                       goto retry;
+       }
+       if ((rpp = p) == NULL)
+               panic("no procs");

 
 

-       n = btoc(((struct a *)u.u_ap)->nsiz);
-       if (!u.u_sep)
-               n -= ctos(u.u_tsize) * stoc(1);
-       if (n < 0)
-               n = 0;
-       d = clrnd(n - u.u_dsize);
-       if (ctob(u.u_dsize+d) > u.u_limit[LIM_DATA]) {
-               u.u_error = ENOMEM;
-               return;
+       /*
+        * Make a proc table entry for the new process.
+        */
+       rip = u.u_procp;
+#ifdef QUOTA
+       (rpp->p_quota = rip->p_quota)->q_cnt++;
+#endif
+       rpp->p_stat = SIDL;
+       timerclear(&rpp->p_realtimer.it_value);
+       rpp->p_flag = SLOAD | (rip->p_flag & (SPAGI|SNUSIG));
+       if (isvfork) {
+               rpp->p_flag |= SVFORK;
+               rpp->p_ndx = rip->p_ndx;
+       } else
+               rpp->p_ndx = rpp - proc;
+       rpp->p_uid = rip->p_uid;
+       rpp->p_pgrp = rip->p_pgrp;
+       rpp->p_nice = rip->p_nice;
+       rpp->p_textp = isvfork ? 0 : rip->p_textp;
+       rpp->p_pid = mpid;
+       rpp->p_ppid = rip->p_pid;
+       rpp->p_pptr = rip;
+       rpp->p_osptr = rip->p_cptr;
+       if (rip->p_cptr)
+               rip->p_cptr->p_ysptr = rpp;
+       rpp->p_ysptr = NULL;
+       rpp->p_cptr = NULL;
+       rip->p_cptr = rpp;
+       rpp->p_time = 0;
+       rpp->p_cpu = 0;
+       rpp->p_siga0 = rip->p_siga0;
+       rpp->p_siga1 = rip->p_siga1;
+       /* take along any pending signals, like stops? */
+       if (isvfork) {
+               rpp->p_tsize = rpp->p_dsize = rpp->p_ssize = 0;
+               rpp->p_szpt = clrnd(ctopt(UPAGES));
+               forkstat.cntvfork++;
+               forkstat.sizvfork += rip->p_dsize + rip->p_ssize;
+       } else {
+               rpp->p_tsize = rip->p_tsize;
+               rpp->p_dsize = rip->p_dsize;
+               rpp->p_ssize = rip->p_ssize;
+               rpp->p_szpt = rip->p_szpt;
+               forkstat.cntfork++;
+               forkstat.sizfork += rip->p_dsize + rip->p_ssize;

        }
        }

-       if (chksize(u.u_tsize, u.u_dsize+d, u.u_ssize))
-               return;
-       if (swpexpand(u.u_dsize+d, u.u_ssize, &u.u_dmap, &u.u_smap)==0)
-               return;
-       expand(d, P0BR);
+       rpp->p_rssize = 0;
+       rpp->p_maxrss = rip->p_maxrss;
+       rpp->p_wchan = 0;
+       rpp->p_slptime = 0;
+       rpp->p_pctcpu = 0;
+       rpp->p_cpticks = 0;
+       n = PIDHASH(rpp->p_pid);
+       p->p_idhash = pidhash[n];
+       pidhash[n] = rpp - proc;
+       multprog++;
+
+       /*
+        * Increase reference counts on shared objects.
+        */
+       for (n = 0; n < NOFILE; n++) {
+               fp = u.u_ofile[n];
+               if (fp == NULL)
+                       continue;
+               fp->f_count++;
+               if (u.u_pofile[n]&RDLOCK)
+                       fp->f_inode->i_rdlockc++;
+               if (u.u_pofile[n]&WRLOCK)
+                       fp->f_inode->i_wrlockc++;
+       }
+       u.u_cdir->i_count++;
+       if (u.u_rdir)
+               u.u_rdir->i_count++;
+
+       /*
+        * Partially simulate the environment
+        * of the new process so that when it is actually
+        * created (by copying) it will look right.
+        * This begins the section where we must prevent the parent
+        * from being swapped.
+        */
+       rip->p_flag |= SKEEP;
+       if (procdup(rpp, isvfork))
+               return (1);
+
+       /*
+        * Make child runnable and add to run queue.
+        */
+       (void) spl6();
+       rpp->p_stat = SRUN;
+       setrq(rpp);
+       (void) spl0();
+
+       /*
+        * Cause child to take a non-local goto as soon as it runs.
+        * On older systems this was done with SSWAP bit in proc
+        * table; on VAX we use u.u_pcb.pcb_sswap so don't need
+        * to do rpp->p_flag |= SSWAP.  Actually do nothing here.
+        */
+       /* rpp->p_flag |= SSWAP; */
+
+       /*
+        * Now can be swapped.
+        */
+       rip->p_flag &= ~SKEEP;
+
+       /*
+        * If vfork make chain from parent process to child
+        * (where virtal memory is temporarily).  Wait for
+        * child to finish, steal virtual memory back,
+        * and wakeup child to let it die.
+        */
+       if (isvfork) {
+               u.u_procp->p_xlink = rpp;
+               u.u_procp->p_flag |= SNOVM;
+               while (rpp->p_flag & SVFORK)
+                       sleep((caddr_t)rpp, PZERO - 1);
+               if ((rpp->p_flag & SLOAD) == 0)
+                       panic("newproc vfork");
+               uaccess(rpp, Vfmap, &vfutl);
+               u.u_procp->p_xlink = 0;
+               vpassvm(rpp, u.u_procp, &vfutl, &u, Vfmap);
+               u.u_procp->p_flag &= ~SNOVM;
+               rpp->p_ndx = rpp - proc;
+               rpp->p_flag |= SVFDONE;
+               wakeup((caddr_t)rpp);
+       }
+
+       /*
+        * 0 return means parent.
+        */
+       return (0);

 }
 }