merge into new file system
[unix-history] / usr / src / sys / kern / kern_proc.c
index 879bd93..f3a38bc 100644 (file)
@@ -1,4 +1,4 @@
-/*     kern_proc.c     3.21    %G%     */
+/*     kern_proc.c     4.26    82/04/19        */
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -42,20 +42,125 @@ exece()
        register struct buf *bp;
        register struct execa *uap;
        int na, ne, ucp, ap, c;
        register struct buf *bp;
        register struct execa *uap;
        int na, ne, ucp, ap, c;
+       int indir, uid, gid;
+       char *sharg;
        struct inode *ip;
        swblk_t bno;
        struct inode *ip;
        swblk_t bno;
+       char cfname[MAXNAMLEN + 1];
+       char cfarg[SHSIZE];
 
 
-       if ((ip = namei(uchar, 0)) == NULL)
+       if ((ip = namei(uchar, 0, 1)) == NULL)
                return;
        bno = 0;
        bp = 0;
                return;
        bno = 0;
        bp = 0;
-       if(access(ip, IEXEC))
+       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 (access(ip, IEXEC))
                goto bad;
                goto bad;
-       if((ip->i_mode & IFMT) != IFREG ||
+       if ((u.u_procp->p_flag&STRC) && access(ip, IREAD))
+               goto bad;
+       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;
        }
+
+       /*
+        * Read in first few bytes of file for segment sizes, ux_mag:
+        *      407 = plain executable
+        *      410 = RO text
+        *      413 = demand paged RO text
+        * Also an ASCII line beginning with #! is
+        * the file name of a ``shell'' and arguments may be prepended
+        * to the argument list if given here.
+        *
+        * SHELL NAMES ARE LIMITED IN LENGTH.
+        *
+        * 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)
+               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;
+       }
+       switch (u.u_exdata.ux_mag) {
+
+       case 0407:
+               u.u_exdata.ux_dsize += u.u_exdata.ux_tsize;
+               u.u_exdata.ux_tsize = 0;
+               break;
+
+       case 0413:
+       case 0410:
+               if (u.u_exdata.ux_tsize == 0) {
+                       u.u_error = ENOEXEC;
+                       goto bad;
+               }
+               break;
+
+       default:
+               if (u.u_exdata.ux_shell[0] != '#' ||
+                   u.u_exdata.ux_shell[1] != '!' ||
+                   indir) {
+                       u.u_error = ENOEXEC;
+                       goto bad;
+               }
+               cp = &u.u_exdata.ux_shell[2];           /* skip "#!" */
+               while (cp < &u.u_exdata.ux_shell[SHSIZE]) {
+                       if (*cp == '\t')
+                               *cp = ' ';
+                       else if (*cp == '\n') {
+                               *cp = '\0';
+                               break;
+                       }
+                       cp++;
+               }
+               if (*cp != '\0') {
+                       u.u_error = ENOEXEC;
+                       goto bad;
+               }
+               cp = &u.u_exdata.ux_shell[2];
+               while (*cp == ' ')
+                       cp++;
+               u.u_dirp = cp;
+               while (*cp && *cp != ' ')
+                       cp++;
+               sharg = NULL;
+               if (*cp) {
+                       *cp++ = '\0';
+                       while (*cp == ' ')
+                               cp++;
+                       if (*cp) {
+                               bcopy((caddr_t)cp, (caddr_t)cfarg, SHSIZE);
+                               sharg = cfarg;
+                       }
+               }
+               bcopy((caddr_t)u.u_dent.d_name, (caddr_t)cfname,
+                   u.u_dent.d_namlen + 1);
+               indir = 1;
+               iput(ip);
+               ip = namei(schar, 0, 1);
+               if (ip == NULL)
+                       return;
+               goto again;
+       }
+
        /*
         * Collect arguments on "file" in swap space.
         */
        /*
         * Collect arguments on "file" in swap space.
         */
@@ -63,15 +168,17 @@ exece()
        ne = 0;
        nc = 0;
        uap = (struct execa *)u.u_ap;
        ne = 0;
        nc = 0;
        uap = (struct execa *)u.u_ap;
-       if ((bno = malloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
+       if ((bno = rmalloc(argmap, ctod(clrnd((int) btoc(NCARGS))))) == 0) {
                swkill(u.u_procp, "exece");
                goto bad;
        }
        if (bno % CLSIZE)
                swkill(u.u_procp, "exece");
                goto bad;
        }
        if (bno % CLSIZE)
-               panic("execa malloc");
+               panic("execa rmalloc");
        if (uap->argp) for (;;) {
                ap = NULL;
        if (uap->argp) for (;;) {
                ap = NULL;
-               if (uap->argp) {
+               if (indir && (na == 1 || na == 2 && sharg))
+                       ap = (int)uap->fname;
+               else if (uap->argp) {
                        ap = fuword((caddr_t)uap->argp);
                        uap->argp++;
                }
                        ap = fuword((caddr_t)uap->argp);
                        uap->argp++;
                }
@@ -82,15 +189,17 @@ 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 = E2BIG;
                        u.u_error = EFAULT;
                do {
                        if (nc >= NCARGS-1)
                                u.u_error = E2BIG;
-                       if ((c = fubyte((caddr_t)ap++)) < 0)
+                       if (indir && na == 2 && sharg != NULL)
+                               c = *sharg++ & 0377;
+                       else if ((c = fubyte((caddr_t)ap++)) < 0)
                                u.u_error = EFAULT;
                        if (u.u_error) {
                                if (bp)
                                u.u_error = EFAULT;
                        if (u.u_error) {
                                if (bp)
@@ -98,25 +207,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 (getxfile(ip, nc) || u.u_error) {
+       if (indir) {
+               u.u_dent.d_namlen = strlen(cfname);
+               bcopy((caddr_t)cfname, (caddr_t)u.u_dent.d_name,
+                   u.u_dent.d_namlen + 1);
+       }
+       getxfile(ip, nc + (na+4)*NBPW, uid, gid);
+       if (u.u_error) {
 badarg:
 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);
@@ -128,7 +243,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;
@@ -144,11 +258,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;
@@ -164,186 +278,112 @@ bad:
        if (bp)
                brelse(bp);
        if (bno)
        if (bp)
                brelse(bp);
        if (bno)
-               mfree(argmap, ctod(clrnd((int) btoc(NCARGS))), bno);
+               rmfree(argmap, ctod(clrnd((int) btoc(NCARGS))), bno);
        iput(ip);
 }
 
 /*
  * Read in and set up memory for executed file.
        iput(ip);
 }
 
 /*
  * Read in and set up memory for executed file.
- * Zero return is normal;
- * non-zero means only the text is being replaced
  */
  */
-getxfile(ip, nargc)
+getxfile(ip, nargc, uid, gid)
 register struct inode *ip;
 {
 register struct inode *ip;
 {
-       register sep;
        register size_t ts, ds, ss;
        register size_t ts, ds, ss;
-       int overlay;
-       int pagi = 0;
-
-       /*
-        * read in first few bytes
-        * of file for segment
-        * sizes:
-        * ux_mag = 407/410/411/405
-        *  407 is plain executable
-        *  410 is RO text
-        *  411 is separated ID
-        *  405 is overlaid text
-        *  412 is demand paged plain executable (NOT IMPLEMENTED)
-        *  413 is demand paged RO text
-        */
-
-       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)
-               goto bad;
-       if (u.u_count!=0) {
-               u.u_error = ENOEXEC;
-               goto bad;
-       }
-       sep = 0;
-       overlay = 0;
-       switch (u.u_exdata.ux_mag) {
-
-       case 0405:
-               overlay++;
-               break;
-
-       case 0412:
-               u.u_error = ENOEXEC;
-               goto bad;
-
-       case 0407:
-               u.u_exdata.ux_dsize += u.u_exdata.ux_tsize;
-               u.u_exdata.ux_tsize = 0;
-               break;
+       int pagi;
 
 
-       case 0413:
+       if (u.u_exdata.ux_mag == 0413)
                pagi = SPAGI;
                pagi = SPAGI;
-               /* fall into ... */
-
-       case 0410:
-               if (u.u_exdata.ux_tsize == 0) {
-                       u.u_error = ENOEXEC;
-                       goto bad;
-               }
-               break;
-
-       case 0411:
-               u.u_error = ENOEXEC;
-               goto bad;
-
-       default:
-               u.u_error = ENOEXEC;
-               goto bad;
-       }
-       if(u.u_exdata.ux_tsize!=0 && (ip->i_flag&ITEXT)==0 && ip->i_count!=1) {
+       else
+               pagi = 0;
+       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 < &file[NFILE]; fp++)
+               for (fp = file; fp < fileNFILE; fp++) {
+                       if (fp->f_flag & FSOCKET)
+                               continue;
                        if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
                                u.u_error = ETXTBSY;
                                goto bad;
                        }
                        if (fp->f_inode == ip && (fp->f_flag&FWRITE)) {
                                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));
        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 (overlay) {
-               if ((u.u_procp->p_flag & SPAGI) ||
-                   u.u_sep==0 && ctos(ts) != ctos(u.u_tsize) || nargc) {
-                       u.u_error = ENOMEM;
-                       goto bad;
-               }
-               ds = u.u_dsize;
-               ss = u.u_ssize;
-               sep = u.u_sep;
-               xfree();
-               xalloc(ip, pagi);
-               u.u_ar0[PC] = u.u_exdata.ux_entloc + 2; /* skip over entry mask */
-       } else {
-               if (chksize(ts, ds, ss))
-                       goto bad;
-               u.u_cdmap = zdmap;
-               u.u_csmap = zdmap;
-               if (swpexpand(ds, ss, &u.u_cdmap, &u.u_csmap) == NULL)
-                       goto bad;
-
-               /*
-                * At this point, committed to the new image!
-                * Release virtual memory resources of old process, and
-                * initialize the virtual memory of the new process.
-                * If we resulted from vfork(), instead wakeup our
-                * 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 {
-                       u.u_procp->p_flag &= ~SVFORK;
-                       u.u_procp->p_flag |= SKEEP;
-                       wakeup((caddr_t)u.u_procp);
-                       while ((u.u_procp->p_flag & SVFDONE) == 0)
-                               sleep((caddr_t)u.u_procp, PZERO - 1);
-                       u.u_procp->p_flag &= ~(SVFDONE|SKEEP);
-               }
-               u.u_procp->p_flag &= ~(SPAGI|SANOM|SUANOM);
-               u.u_procp->p_flag |= pagi;
-               u.u_dmap = u.u_cdmap;
-               u.u_smap = u.u_csmap;
-               vgetvm(ts, ds, ss);
+       if (chksize(ts, ds, ss))
+               goto bad;
 
 
-               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);
-               }
-               xalloc(ip, pagi);
-               if (pagi && u.u_procp->p_textp)
-                       vinifod((struct fpte *)dptopte(u.u_procp, 0),
-                           PG_FTEXT, u.u_procp->p_textp->x_iptr,
-                           1 + ts/CLSIZE, (int)btoc(u.u_exdata.ux_dsize));
+       /*
+        * 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)
+               goto bad;
 
 
-               /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
-               mtpr(TBIA, 0);
+       /*
+        * At this point, committed to the new image!
+        * Release virtual memory resources of old process, and
+        * initialize the virtual memory of the new process.
+        * If we resulted from vfork(), instead wakeup our
+        * 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 {
+               u.u_procp->p_flag &= ~SVFORK;
+               u.u_procp->p_flag |= SKEEP;
+               wakeup((caddr_t)u.u_procp);
+               while ((u.u_procp->p_flag & SVFDONE) == 0)
+                       sleep((caddr_t)u.u_procp, PZERO - 1);
+               u.u_procp->p_flag &= ~(SVFDONE|SKEEP);
+       }
+       u.u_procp->p_flag &= ~(SPAGI|SSEQL|SUANOM|SNUSIG);
+       u.u_procp->p_flag |= pagi;
+       u.u_dmap = u.u_cdmap;
+       u.u_smap = u.u_csmap;
+       vgetvm(ts, ds, ss);
 
 
+       if (pagi == 0) {
                /*
                /*
-                * set SUID/SGID protections, if no tracing
+                * Read in data segment.
                 */
                 */
-               if ((u.u_procp->p_flag&STRC)==0) {
-                       if(ip->i_mode&ISUID)
-                               if(u.u_uid != 0) {
-                                       u.u_uid = ip->i_uid;
-                                       u.u_procp->p_uid = ip->i_uid;
-                               }
-                       if(ip->i_mode&ISGID)
-                               u.u_gid = ip->i_gid;
-               } else
-                       psignal(u.u_procp, SIGTRAP);
+               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);
        }
        }
+       xalloc(ip, pagi);
+       if (pagi && u.u_procp->p_textp)
+               vinifod((struct fpte *)dptopte(u.u_procp, 0),
+                   PG_FTEXT, u.u_procp->p_textp->x_iptr,
+                   1 + ts/CLSIZE, (int)btoc(u.u_exdata.ux_dsize));
+
+       /* THIS SHOULD BE DONE AT A LOWER LEVEL, IF AT ALL */
+       mtpr(TBIA, 0);
+
+       /*
+        * set SUID/SGID protections, if no tracing
+        */
+       if ((u.u_procp->p_flag&STRC)==0) {
+               u.u_uid = uid;
+               u.u_procp->p_uid = uid;
+               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;
        u.u_dsize = ds;
        u.u_ssize = ss;
        u.u_tsize = ts;
        u.u_dsize = ds;
        u.u_ssize = ss;
-       u.u_sep = sep;
 bad:
 bad:
-       return(overlay);
+       return;
 }
 
 /*
 }
 
 /*
@@ -355,7 +395,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) {
 
@@ -373,7 +413,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
@@ -383,27 +423,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_ofile[i] = NULL;
                        u.u_pofile[i] &= ~EXCLOSE;
                }
        }
                        u.u_ofile[i] = NULL;
                        u.u_pofile[i] &= ~EXCLOSE;
                }
        }
+
        /*
         * 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,
+           u.u_dent.d_namlen + 1);
 }
 
 /*
 }
 
 /*
- * exit system call:
- * pass back caller's arg
+ * Exit system call: pass back caller's arg
  */
 rexit()
 {
  */
 rexit()
 {
@@ -446,8 +487,9 @@ exit(rv)
        else
                p->p_siga1 = 0;
        (void) spl0();
        else
                p->p_siga1 = 0;
        (void) spl0();
-       p->p_aveflt = 0;
-       for(i=0; i<NSIG; i++)
+       p->p_cpticks = 0;
+       p->p_pctcpu = 0;
+       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
@@ -463,25 +505,25 @@ 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++) {
                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);
        }
        }
-       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();
        vrelpt(u.u_procp);
        vrelu(u.u_procp, 0);
                iput(u.u_rdir);
        }
        u.u_limit[LIM_FSIZE] = INFINITY;
        acct();
        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 */
-       noproc = 1;
        p->p_stat = SZOMB;
        p->p_stat = SZOMB;
+       noproc = 1;
        i = PIDHASH(p->p_pid);
        x = p - proc;
        if (pidhash[i] == x)
        i = PIDHASH(p->p_pid);
        x = p - proc;
        if (pidhash[i] == x)
@@ -494,12 +536,14 @@ exit(rv)
                        }
                panic("exit");
        }
                        }
                panic("exit");
        }
+       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);
 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);
-       for(q = &proc[0]; q < &proc[NPROC]; q++)
-               if(q->p_pptr == p) {
+       for (q = proc; q < procNPROC; q++)
+               if (q->p_pptr == p) {
                        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]);
@@ -520,13 +564,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.
                         */
                         */
-                       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();
 }
 
@@ -562,10 +605,10 @@ wait1(options, vp)
 
        f = 0;
 loop:
 
        f = 0;
 loop:
-       for(p = &proc[0]; p < &proc[NPROC]; 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;
@@ -602,12 +645,10 @@ loop:
                u.u_r.r_val1 = 0;
                return;
        }
                u.u_r.r_val1 = 0;
                return;
        }
-/*
-       if (setjmp(u.u_qsav)) {
+       if ((u.u_procp->p_flag&SNUSIG) && setjmp(u.u_qsav)) {
                u.u_eosys = RESTARTSYS;
                return;
        }
                u.u_eosys = RESTARTSYS;
                return;
        }
-*/
        sleep((caddr_t)u.u_procp, PWAIT);
        goto loop;
 }
        sleep((caddr_t)u.u_procp, PWAIT);
        goto loop;
 }
@@ -634,7 +675,7 @@ fork1(isvfork)
 
        a = 0;
        p2 = NULL;
 
        a = 0;
        p2 = NULL;
-       for(p1 = &proc[0]; p1 < &proc[NPROC]; p1++) {
+       for (p1 = proc; p1 < procNPROC; p1++) {
                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
                if (p1->p_stat==NULL && p2==NULL)
                        p2 = p1;
                else {
@@ -648,7 +689,9 @@ fork1(isvfork)
         *  not su and too many procs owned; or
         *  not su and would take last slot.
         */
         *  not su and too many procs owned; or
         *  not su and would take last slot.
         */
-       if (p2==NULL || (u.u_uid!=0 && (p2==&proc[NPROC-1] || a>MAXUPRC))) {
+       if (p2==NULL)
+               tablefull("proc");
+       if (p2==NULL || (u.u_uid!=0 && (p2==procNPROC-1 || a>MAXUPRC))) {
                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);
@@ -657,7 +700,7 @@ 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_r.r_val1 = p1->p_pid;
                u.u_r.r_val2 = 1;  /* child */
                u.u_start = time;