use rdwri()

[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 96f57be..dc1a150 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.11    81/04/23        */
+/*     kern_proc.c     4.34    82/08/22        */

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


@@ -19,6 +19,9 @@
 #include "../h/psl.h"
 #include "../h/vlimit.h"
 #include "../h/file.h"
 #include "../h/psl.h"
 #include "../h/vlimit.h"
 #include "../h/file.h"

+#include "../h/quota.h"
+#include "../h/descrip.h"
+#include "../h/uio.h"

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


@@ -46,29 +49,28 @@ 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;
                return;

-

        bno = 0;
        bp = 0;
        indir = 0;
        uid = u.u_uid;
        gid = u.u_gid;
        bno = 0;
        bp = 0;
        indir = 0;
        uid = u.u_uid;
        gid = u.u_gid;

-

        if (ip->i_mode & ISUID)
                uid = ip->i_uid;
        if (ip->i_mode & ISGID)
                gid = ip->i_gid;
 
   again:
        if (ip->i_mode & ISUID)
                uid = ip->i_uid;
        if (ip->i_mode & ISGID)
                gid = ip->i_gid;
 
   again:

-       if(access(ip, IEXEC))
+       if (access(ip, IEXEC))

                goto bad;
                goto bad;

-       if((u.u_procp->p_flag&STRC) && access(ip, IREAD))
+       if ((u.u_procp->p_flag&STRC) && access(ip, IREAD))

                goto bad;
                goto bad;

-       if((ip->i_mode & IFMT) != IFREG ||
+       if ((ip->i_mode & IFMT) != IFREG ||

           (ip->i_mode & (IEXEC|(IEXEC>>3)|(IEXEC>>6))) == 0) {
                u.u_error = EACCES;
                goto bad;
           (ip->i_mode & (IEXEC|(IEXEC>>3)|(IEXEC>>6))) == 0) {
                u.u_error = EACCES;
                goto bad;


@@ -88,19 +90,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;
-       if(u.u_error)
+       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;
                goto bad;

-       if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A)
-               && u.u_exdata.ux_shell[0] != '#') {
+       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;
        }
                u.u_error = ENOEXEC;
                goto bad;
        }

+#endif

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


@@ -153,10 +154,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;


@@ -177,10 +179,7 @@ exece()
                panic("execa rmalloc");
        if (uap->argp) for (;;) {
                ap = NULL;
                panic("execa rmalloc");
        if (uap->argp) for (;;) {
                ap = NULL;

-               if (na == 1 && indir) {
-                       if (sharg == NULL)
-                               ap = (int)uap->fname;
-               } else if (na == 2 && indir && sharg != NULL)
+               if (indir && (na == 1 || na == 2 && sharg))

                        ap = (int)uap->fname;
                else if (uap->argp) {
                        ap = fuword((caddr_t)uap->argp);
                        ap = (int)uap->fname;
                else if (uap->argp) {
                        ap = fuword((caddr_t)uap->argp);


@@ -193,10 +192,10 @@ exece()
                        uap->envp++;
                        ne++;
                }
                        uap->envp++;
                        ne++;
                }

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

                        break;
                na++;
                        break;
                na++;

-               if(ap == -1)
+               if (ap == -1)

                        u.u_error = EFAULT;
                do {
                        if (nc >= NCARGS-1)
                        u.u_error = EFAULT;
                do {
                        if (nc >= NCARGS-1)


@@ -211,28 +210,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);


@@ -244,7 +246,6 @@ badarg:
        /*
         * copy back arglist
         */
        /*
         * copy back arglist
         */

-

        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;
        ucp = USRSTACK - nc - NBPW;
        ap = ucp - na*NBPW - 3*NBPW;
        u.u_ar0[SP] = ap;


@@ -260,11 +261,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;


@@ -297,28 +298,31 @@ register struct inode *ip;
                pagi = SPAGI;
        else
                pagi = 0;
                pagi = SPAGI;
        else
                pagi = 0;

-
-       if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
+       if (u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 &&
+           ip->i_count!=1) {

                register struct file *fp;
 
                register struct file *fp;
 

-               for (fp = file; fp < fileNFILE; fp++)
-                       if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
+               for (fp = file; fp < fileNFILE; fp++) {
+                       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;
                        }

+               }

        }
 
        /*
        }
 
        /*

-        * find text and data sizes
-        * try them out for possible
-        * exceed of max sizes
+        * Compute text and data sizes and make sure not too large.

         */
         */

-

        ts = clrnd(btoc(u.u_exdata.ux_tsize));
        ds = clrnd(btoc((u.u_exdata.ux_dsize+u.u_exdata.ux_bsize)));
        ss = clrnd(SSIZE + btoc(nargc));
        if (chksize(ts, ds, ss))
                goto bad;
        ts = clrnd(btoc(u.u_exdata.ux_tsize));
        ds = clrnd(btoc((u.u_exdata.ux_dsize+u.u_exdata.ux_bsize)));
        ss = clrnd(SSIZE + btoc(nargc));
        if (chksize(ts, ds, ss))
                goto bad;

+
+       /*
+        * Make sure enough space to start process.
+        */

        u.u_cdmap = zdmap;
        u.u_csmap = zdmap;
        if (swpexpand(ds, ss, &u.u_cdmap, &u.u_csmap) == NULL)
        u.u_cdmap = zdmap;
        u.u_csmap = zdmap;
        if (swpexpand(ds, ss, &u.u_cdmap, &u.u_csmap) == NULL)


@@ -349,15 +353,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),


@@ -367,18 +368,16 @@ 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
         */
        if ((u.u_procp->p_flag&STRC)==0) {
        /*
         * set SUID/SGID protections, if no tracing
         */
        if ((u.u_procp->p_flag&STRC)==0) {

-#ifndef        MELB
-               if(u.u_uid != 0)
-#endif
-               {
-                       u.u_uid = uid;
-                       u.u_procp->p_uid = uid;
-               }
+               u.u_uid = uid;
+               u.u_procp->p_uid = uid;

                u.u_gid = gid;
                u.u_gid = gid;

+               u.u_grps[gid/(sizeof(int)*8)] |= 1 << (gid%(sizeof(int)*8));

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


@@ -397,7 +396,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) {
 


@@ -415,7 +414,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


@@ -425,27 +424,28 @@ setregs()
                }
        }
 /*
                }
        }
 /*

-       for(rp = &u.u_ar0[0]; rp < &u.u_ar0[16];)
+       for (rp = &u.u_ar0[0]; rp < &u.u_ar0[16];)

                *rp++ = 0;
 */
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
                *rp++ = 0;
 */
        u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */

-       for(i=0; i<NOFILE; i++) {
+       for (i=0; i<NOFILE; i++) {

                if (u.u_pofile[i]&EXCLOSE) {
                if (u.u_pofile[i]&EXCLOSE) {

-                       closef(u.u_ofile[i]);
+                       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;

                }
        }
                }
        }

+

        /*
         * 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));

 }
 
 /*
 }
 
 /*

- * exit system call:
- * pass back caller's arg
+ * Exit system call: pass back caller's arg

  */
 rexit()
 {
  */
 rexit()
 {


@@ -468,7 +468,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


@@ -490,7 +489,7 @@ exit(rv)
        (void) spl0();
        p->p_cpticks = 0;
        p->p_pctcpu = 0;
        (void) spl0();
        p->p_cpticks = 0;
        p->p_pctcpu = 0;

-       for(i=0; i<NSIG; i++)
+       for (i=0; i<NSIG; i++)

                u.u_signal[i] = SIG_IGN;
        /*
         * Release virtual memory.  If we resulted from
                u.u_signal[i] = SIG_IGN;
        /*
         * Release virtual memory.  If we resulted from


@@ -506,23 +505,33 @@ 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;
                f = u.u_ofile[i];
                u.u_ofile[i] = NULL;

-               closef(f);
+               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

        }
        }

-       plock(u.u_cdir);
+       ilock(u.u_cdir);

        iput(u.u_cdir);
        if (u.u_rdir) {
        iput(u.u_cdir);
        if (u.u_rdir) {

-               plock(u.u_rdir);
+               ilock(u.u_rdir);

                iput(u.u_rdir);
        }
        u.u_limit[LIM_FSIZE] = INFINITY;
        acct();
                iput(u.u_rdir);
        }
        u.u_limit[LIM_FSIZE] = INFINITY;
        acct();

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

        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);
        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);

+       (void) spl5();          /* hack for mem alloc race XXX */

        multprog--;
        multprog--;

-/*     spl7();                 /* clock will get mad because of overlaying */

        p->p_stat = SZOMB;
        noproc = 1;
        i = PIDHASH(p->p_pid);
        p->p_stat = SZOMB;
        noproc = 1;
        i = PIDHASH(p->p_pid);


@@ -543,8 +552,18 @@ 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);
        ((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);

-       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]);


@@ -565,13 +584,12 @@ done:
                        }
                        /*
                         * Protect this process from future
                        }
                        /*
                         * Protect this process from future

-                        * tty signals, clear TSTP/TTIN/TTOU if pending,
-                        * and set SDETACH bit on procs.
+                        * tty signals, clear TSTP/TTIN/TTOU if pending.

                         */
                        (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();
 }
 


@@ -603,14 +621,14 @@ wait1(options, vp)
        struct vtimes *vp;
 {
        register f;
        struct vtimes *vp;
 {
        register f;

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

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

-       for(p = proc; p < procNPROC; p++)
-       if(p->p_pptr == u.u_procp) {
+       for (p = proc; p < procNPROC; p++)
+       if (p->p_pptr == u.u_procp) {

                f++;
                f++;

-               if(p->p_stat == SZOMB) {
+               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;
                        u.u_r.r_val1 = p->p_pid;
                        u.u_r.r_val2 = ((struct xproc *)p)->xp_xstat;
                        ((struct xproc *)p)->xp_xstat = 0;


@@ -621,7 +639,16 @@ loop:
                        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;


@@ -673,17 +700,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;
        p2 = NULL;

-       for(p1 = proc; p1 < procNPROC; p1++) {
+       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


@@ -693,7 +735,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);


@@ -702,11 +748,14 @@ fork1(isvfork)
                goto out;
        }
        p1 = u.u_procp;
                goto out;
        }
        p1 = u.u_procp;

-       if(newproc(isvfork)) {
+       if (newproc(isvfork)) {

                u.u_r.r_val1 = p1->p_pid;
                u.u_r.r_val2 = 1;  /* child */
                u.u_start = time;
                u.u_acflag = AFORK;
                u.u_r.r_val1 = p1->p_pid;
                u.u_r.r_val2 = 1;  /* child */
                u.u_start = time;
                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;


@@ -715,35 +764,61 @@ 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;

 
 

-       /*
-        * set n to new data size
-        * set d to new-old
-        */
+       for (; p != u.u_procp; p = p->p_pptr)
+               if (p->p_ppid == 0)
+                       return (0);
+       return (1);
+}

 
 

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

 }
 }