projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add cpio to subdirectory list
[unix-history] / usr / src / bin / csh / proc.c
diff --git a/usr/src/bin/csh/proc.c b/usr/src/bin/csh/proc.c
index f47083f..0140cd4 100644 (file)
--- a/usr/src/bin/csh/proc.c
+++ b/usr/src/bin/csh/proc.c
@@ -1,4 +1,12 @@
-static char *sccsid = "@(#)proc.c      4.13 (Berkeley) 84/08/31";
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley Software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+static char *sccsid = "@(#)proc.c      5.10 (Berkeley) %G%";
+#endif
 
 #include "sh.h"
 #include "sh.dir.h"
 
 #include "sh.h"
 #include "sh.dir.h"
@@ -27,12 +35,10 @@ pchild()
        union wait w;
        int jobflags;
        struct rusage ru;
        union wait w;
        int jobflags;
        struct rusage ru;
+       extern int insource;
 
 
-       if (!timesdone)
-               timesdone++, times(&shtimes);
 loop:
 loop:
-       pid = wait3(&w.w_status, (setintr ? WNOHANG|WUNTRACED:WNOHANG),
-           &ru);
+       pid = wait3(&w, (setintr && (intty || insource) ? WNOHANG|WUNTRACED:WNOHANG), &ru);
        if (pid <= 0) {
                if (errno == EINTR) {
                        errno = 0;
        if (pid <= 0) {
                if (errno == EINTR) {
                        errno = 0;
@@ -53,16 +59,8 @@ found:
                pp->p_flags |= PSTOPPED;
                pp->p_reason = w.w_stopsig;
        } else {
                pp->p_flags |= PSTOPPED;
                pp->p_reason = w.w_stopsig;
        } else {
-               if (pp->p_flags & (PTIME|PPTIME) || adrof("time")) {
-                       time_t oldcutimes, oldcstimes;
-                       oldcutimes = shtimes.tms_cutime;
-                       oldcstimes = shtimes.tms_cstime;
-                       gettimeofday(&pp->p_etime, (struct timezone *)0);
-                       times(&shtimes);
-                       pp->p_utime = shtimes.tms_cutime - oldcutimes;
-                       pp->p_stime = shtimes.tms_cstime - oldcstimes;
-               } else
-                       times(&shtimes);
+               if (pp->p_flags & (PTIME|PPTIME) || adrof("time"))
+                       (void) gettimeofday(&pp->p_etime, (struct timezone *)0);
                pp->p_rusage = ru;
                if (WIFSIGNALED(w)) {
                        if (w.w_termsig == SIGINT)
                pp->p_rusage = ru;
                if (WIFSIGNALED(w)) {
                        if (w.w_termsig == SIGINT)
@@ -85,7 +83,7 @@ found:
        do {
                if ((fp->p_flags & (PPTIME|PRUNNING|PSTOPPED)) == 0 &&
                    !child && adrof("time") &&
        do {
                if ((fp->p_flags & (PPTIME|PRUNNING|PSTOPPED)) == 0 &&
                    !child && adrof("time") &&
-                   (fp->p_utime + fp->p_stime) / HZ >=
+                   fp->p_rusage.ru_utime.tv_sec+fp->p_rusage.ru_stime.tv_sec >=
                     atoi(value("time")))
                        fp->p_flags |= PTIME;
                jobflags |= fp->p_flags;
                     atoi(value("time")))
                        fp->p_flags |= PTIME;
                jobflags |= fp->p_flags;
@@ -124,7 +122,7 @@ found:
                } else {
                        if (jobflags&PNOTIFY || adrof("notify")) {
                                printf("\215\n");
                } else {
                        if (jobflags&PNOTIFY || adrof("notify")) {
                                printf("\215\n");
-                               pprint(pp, NUMBER|NAME|REASON);
+                               (void) pprint(pp, NUMBER|NAME|REASON);
                                if ((jobflags&PSTOPPED) == 0)
                                        pflush(pp);
                        } else {
                                if ((jobflags&PSTOPPED) == 0)
                                        pflush(pp);
                        } else {
@@ -139,7 +137,8 @@ found:
 pnote()
 {
        register struct process *pp;
 pnote()
 {
        register struct process *pp;
-       int flags, omask;
+       int flags;
+       long omask;
 
        neednote = 0;
        for (pp = proclist.p_next; pp != PNULL; pp = pp->p_next) {
 
        neednote = 0;
        for (pp = proclist.p_next; pp != PNULL; pp = pp->p_next) {
@@ -149,7 +148,7 @@ pnote()
                        flags = pprint(pp, NUMBER|NAME|REASON);
                        if ((flags&(PRUNNING|PSTOPPED)) == 0)
                                pflush(pp);
                        flags = pprint(pp, NUMBER|NAME|REASON);
                        if ((flags&(PRUNNING|PSTOPPED)) == 0)
                                pflush(pp);
-                       sigsetmask(omask);
+                       (void) sigsetmask(omask);
                }
        }
 }
                }
        }
 }
@@ -161,7 +160,7 @@ pnote()
 pwait()
 {
        register struct process *fp, *pp;
 pwait()
 {
        register struct process *fp, *pp;
-       int omask;
+       long omask;
 
        /*
         * Here's where dead procs get flushed.
 
        /*
         * Here's where dead procs get flushed.
@@ -177,7 +176,7 @@ pwait()
                        xfree((char *)pp);
                        pp = fp;
                }
                        xfree((char *)pp);
                        pp = fp;
                }
-       sigsetmask(omask);
+       (void) sigsetmask(omask);
        pjwait(pcurrjob);
 }
 
        pjwait(pcurrjob);
 }
 
@@ -189,11 +188,8 @@ pjwait(pp)
        register struct process *pp;
 {
        register struct process *fp;
        register struct process *pp;
 {
        register struct process *fp;
-       int jobflags, reason, omask;
-       int (*old)();
-
-       if (setintr)
-               old = signal(SIGINT, SIG_IGN);
+       int jobflags, reason;
+       long omask;
 
        while (pp->p_pid != pp->p_jobid)
                pp = pp->p_friends;
 
        while (pp->p_pid != pp->p_jobid)
                pp = pp->p_friends;
@@ -215,16 +211,16 @@ pjwait(pp)
                while ((fp = (fp->p_friends)) != pp);
                if ((jobflags & PRUNNING) == 0)
                        break;
                while ((fp = (fp->p_friends)) != pp);
                if ((jobflags & PRUNNING) == 0)
                        break;
-               sigpause(0);
+               sigpause(sigblock(0L) &~ sigmask(SIGCHLD));
        }
        }
-       sigsetmask(omask);
-       if (tpgrp > 0)
-               ioctl(FSHTTY, TIOCSPGRP, &tpgrp);       /* get tty back */
+       (void) sigsetmask(omask);
+       if (tpgrp > 0)                  /* get tty back */
+               (void) ioctl(FSHTTY, TIOCSPGRP, (char *)&tpgrp);
        if ((jobflags&(PSIGNALED|PSTOPPED|PTIME)) ||
             !eq(dcwd->di_name, fp->p_cwd->di_name)) {
                if (jobflags&PSTOPPED)
                        printf("\n");
        if ((jobflags&(PSIGNALED|PSTOPPED|PTIME)) ||
             !eq(dcwd->di_name, fp->p_cwd->di_name)) {
                if (jobflags&PSTOPPED)
                        printf("\n");
-               pprint(pp, AREASON|SHELLDIR);
+               (void) pprint(pp, AREASON|SHELLDIR);
        }
        if ((jobflags&(PINTERRUPTED|PSTOPPED)) && setintr &&
            (!gointr || !eq(gointr, "-"))) {
        }
        if ((jobflags&(PINTERRUPTED|PSTOPPED)) && setintr &&
            (!gointr || !eq(gointr, "-"))) {
@@ -244,8 +240,6 @@ pjwait(pp)
        if (reason && exiterr)
                exitstat();
        pflush(pp);
        if (reason && exiterr)
                exitstat();
        pflush(pp);
-       if (setintr)
-               signal(SIGINT, old);
 }
 
 /*
 }
 
 /*
@@ -254,7 +248,7 @@ pjwait(pp)
 dowait()
 {
        register struct process *pp;
 dowait()
 {
        register struct process *pp;
-       int omask;
+       long omask;
 
        pjobs++;
        omask = sigblock(sigmask(SIGCHLD));
 
        pjobs++;
        omask = sigblock(sigmask(SIGCHLD));
@@ -262,10 +256,10 @@ loop:
        for (pp = proclist.p_next; pp; pp = pp->p_next)
                if (pp->p_pid && /* pp->p_pid == pp->p_jobid && */
                    pp->p_flags&PRUNNING) {
        for (pp = proclist.p_next; pp; pp = pp->p_next)
                if (pp->p_pid && /* pp->p_pid == pp->p_jobid && */
                    pp->p_flags&PRUNNING) {
-                       sigpause(0);
+                       sigpause(0L);
                        goto loop;
                }
                        goto loop;
                }
-       sigsetmask(omask);
+       (void) sigsetmask(omask);
        pjobs = 0;
 }
 
        pjobs = 0;
 }
 
@@ -404,7 +398,7 @@ palloc(pid, t)
        }
        pp->p_next = proclist.p_next;
        proclist.p_next = pp;
        }
        pp->p_next = proclist.p_next;
        proclist.p_next = pp;
-       gettimeofday(&pp->p_btime, (struct timezone *)0);
+       (void) gettimeofday(&pp->p_btime, (struct timezone *)0);
 }
 
 padd(t)
 }
 
 padd(t)
@@ -430,15 +424,25 @@ padd(t)
                }
                break;
 
                }
                break;
 
+       case TOR:
+       case TAND:
        case TFIL:
        case TFIL:
-               padd(t->t_dcar);
-               pads(" | ");
-               padd(t->t_dcdr);
-               return;
-
        case TLST:
                padd(t->t_dcar);
        case TLST:
                padd(t->t_dcar);
-               pads("; ");
+               switch (t->t_dtyp) {
+               case TOR:
+                       pads(" || ");
+                       break;
+               case TAND:
+                       pads(" && ");
+                       break;
+               case TFIL:
+                       pads(" | ");
+                       break;
+               case TLST:
+                       pads("; ");
+                       break;
+               }
                padd(t->t_dcdr);
                return;
        }
                padd(t->t_dcdr);
                return;
        }
@@ -463,12 +467,12 @@ pads(cp)
        if (cmdlen >= PMAXLEN)
                return;
        if (cmdlen + i >= PMAXLEN) {
        if (cmdlen >= PMAXLEN)
                return;
        if (cmdlen + i >= PMAXLEN) {
-               strcpy(cmdp, " ...");
+               (void) strcpy(cmdp, " ...");
                cmdlen = PMAXLEN;
                cmdp += 4;
                return;
        }
                cmdlen = PMAXLEN;
                cmdp += 4;
                return;
        }
-       strcpy(cmdp, cp);
+       (void) strcpy(cmdp, cp);
        cmdp += i;
        cmdlen += i;
 }
        cmdp += i;
        cmdlen += i;
 }
@@ -562,7 +566,7 @@ pprint(pp, flag)
                                printf("%5d ", pp->p_pid);
                        if (flag&(REASON|AREASON)) {
                                if (flag&NAME)
                                printf("%5d ", pp->p_pid);
                        if (flag&(REASON|AREASON)) {
                                if (flag&NAME)
-                                       format = "%-21s";
+                                       format = "%-23s";
                                else
                                        format = "%s";
                                if (pstatus == status)
                                else
                                        format = "%s";
                                if (pstatus == status)
@@ -584,8 +588,9 @@ pprint(pp, flag)
                                case PINTERRUPTED:
                                case PSTOPPED:
                                case PSIGNALED:
                                case PINTERRUPTED:
                                case PSTOPPED:
                                case PSIGNALED:
-                                       if (flag&REASON || reason != SIGINT ||
-                                           reason != SIGPIPE)
+                                       if ((flag&(REASON|AREASON))
+                                           && reason != SIGINT
+                                           && reason != SIGPIPE)
                                                printf(format, mesg[pp->p_reason].pname);
                                        break;
 
                                                printf(format, mesg[pp->p_reason].pname);
                                        break;
 
@@ -781,14 +786,14 @@ dokill(v)
                                if (name = mesg[signum].iname)
                                        printf("%s ", name);
                                if (signum == 16)
                                if (name = mesg[signum].iname)
                                        printf("%s ", name);
                                if (signum == 16)
-                                       printf("\n");
+                                       cshputchar('\n');
                        }
                        }
-                       printf("\n");
+                       cshputchar('\n');
                        return;
                }
                if (digit(v[0][1])) {
                        signum = atoi(v[0]+1);
                        return;
                }
                if (digit(v[0][1])) {
                        signum = atoi(v[0]+1);
-                       if (signum < 1 || signum > NSIG)
+                       if (signum < 0 || signum > NSIG)
                                bferr("Bad signal number");
                } else {
                        name = &v[0][1];
                                bferr("Bad signal number");
                } else {
                        name = &v[0][1];
@@ -812,7 +817,8 @@ pkill(v, signum)
 {
        register struct process *pp, *np;
        register int jobflags = 0;
 {
        register struct process *pp, *np;
        register int jobflags = 0;
-       int omask, pid, err = 0;
+       int pid, err = 0;
+       long omask;
        char *cp;
        extern char *sys_errlist[];
 
        char *cp;
        extern char *sys_errlist[];
 
@@ -834,15 +840,19 @@ pkill(v, signum)
                        case SIGTTIN:
                        case SIGTTOU:
                                if ((jobflags & PRUNNING) == 0) {
                        case SIGTTIN:
                        case SIGTTOU:
                                if ((jobflags & PRUNNING) == 0) {
-                                       printf("%s: Already stopped\n", cp);
+                                       printf("%s: Already suspended\n", cp);
                                        err++;
                                        goto cont;
                                }
                        }
                                        err++;
                                        goto cont;
                                }
                        }
-                       killpg(pp->p_jobid, signum);
+                       if (killpg(pp->p_jobid, signum) < 0) {
+                               printf("%s: ", cp);
+                               printf("%s\n", sys_errlist[errno]);
+                               err++;
+                       }
                        if (signum == SIGTERM || signum == SIGHUP)
                        if (signum == SIGTERM || signum == SIGHUP)
-                               killpg(pp->p_jobid, SIGCONT);
-               } else if (!digit(*cp))
+                               (void) killpg(pp->p_jobid, SIGCONT);
+               } else if (!(digit(*cp) || *cp == '-'))
                        bferr("Arguments should be jobs or process id's");
                else {
                        pid = atoi(cp);
                        bferr("Arguments should be jobs or process id's");
                else {
                        pid = atoi(cp);
@@ -853,13 +863,13 @@ pkill(v, signum)
                                goto cont;
                        }
                        if (signum == SIGTERM || signum == SIGHUP)
                                goto cont;
                        }
                        if (signum == SIGTERM || signum == SIGHUP)
-                               kill(pid, SIGCONT);
+                               (void) kill(pid, SIGCONT);
                }
 cont:
                xfree(cp);
                v++;
        }
                }
 cont:
                xfree(cp);
                v++;
        }
-       sigsetmask(omask);
+       (void) sigsetmask(omask);
        if (err)
                error(NOSTR);
 }
        if (err)
                error(NOSTR);
 }
@@ -872,7 +882,8 @@ pstart(pp, foregnd)
        int foregnd;
 {
        register struct process *np;
        int foregnd;
 {
        register struct process *np;
-       int omask, jobflags = 0;
+       int jobflags = 0;
+       long omask;
 
        omask = sigblock(sigmask(SIGCHLD));
        np = pp;
 
        omask = sigblock(sigmask(SIGCHLD));
        np = pp;
@@ -889,12 +900,12 @@ pstart(pp, foregnd)
        } while((np = np->p_friends) != pp);
        if (!foregnd)
                pclrcurr(pp);
        } while((np = np->p_friends) != pp);
        if (!foregnd)
                pclrcurr(pp);
-       pprint(pp, foregnd ? NAME|JOBDIR : NUMBER|NAME|AMPERSAND);
+       (void) pprint(pp, foregnd ? NAME|JOBDIR : NUMBER|NAME|AMPERSAND);
        if (foregnd)
        if (foregnd)
-               ioctl(FSHTTY, TIOCSPGRP, &pp->p_jobid);
+               (void) ioctl(FSHTTY, TIOCSPGRP, (char *)&pp->p_jobid);
        if (jobflags&PSTOPPED)
        if (jobflags&PSTOPPED)
-               killpg(pp->p_jobid, SIGCONT);
-       sigsetmask(omask);
+               (void) killpg(pp->p_jobid, SIGCONT);
+       (void) sigsetmask(omask);
 }
 
 panystop(neednl)
 }
 
 panystop(neednl)
@@ -904,7 +915,7 @@ panystop(neednl)
        chkstop = 2;
        for (pp = proclist.p_next; pp; pp = pp->p_next)
                if (pp->p_flags & PSTOPPED)
        chkstop = 2;
        for (pp = proclist.p_next; pp; pp = pp->p_next)
                if (pp->p_flags & PSTOPPED)
-                       error("\nThere are stopped jobs" + 1 - neednl);
+                       error("\nThere are suspended jobs" + 1 - neednl);
 }
 
 struct process *
 }
 
 struct process *
@@ -954,6 +965,7 @@ match:
                bferr("No job matches pattern");
        else
                bferr("No such job");
                bferr("No job matches pattern");
        else
                bferr("No such job");
+       /*NOTREACHED*/
 }
 
 /*
 }
 
 /*
@@ -1006,7 +1018,8 @@ pfork(t, wanttty)
 {
        register int pid;
        bool ignint = 0;
 {
        register int pid;
        bool ignint = 0;
-       int pgrp, omask;
+       int pgrp;
+       long omask;
 
        /*
         * A child will be uninterruptible only under very special
 
        /*
         * A child will be uninterruptible only under very special
@@ -1028,7 +1041,7 @@ pfork(t, wanttty)
                if (setintr == 0)
                        sleep(FORKSLEEP);
                else {
                if (setintr == 0)
                        sleep(FORKSLEEP);
                else {
-                       sigsetmask(omask);
+                       (void) sigsetmask(omask);
                        error("No more processes");
                }
        if (pid == 0) {
                        error("No more processes");
                }
        if (pid == 0) {
@@ -1036,7 +1049,6 @@ pfork(t, wanttty)
                pgrp = pcurrjob ? pcurrjob->p_jobid : getpid();
                pflushall();
                pcurrjob = PNULL;
                pgrp = pcurrjob ? pcurrjob->p_jobid : getpid();
                pflushall();
                pcurrjob = PNULL;
-               timesdone = 0;
                child++;
                if (setintr) {
                        setintr = 0;            /* until I think otherwise */
                child++;
                if (setintr) {
                        setintr = 0;            /* until I think otherwise */
@@ -1044,23 +1056,23 @@ pfork(t, wanttty)
                         * Children just get blown away on SIGINT, SIGQUIT
                         * unless "onintr -" seen.
                         */
                         * Children just get blown away on SIGINT, SIGQUIT
                         * unless "onintr -" seen.
                         */
-                       signal(SIGINT, ignint ? SIG_IGN : SIG_DFL);
-                       signal(SIGQUIT, ignint ? SIG_IGN : SIG_DFL);
+                       (void) signal(SIGINT, ignint ? SIG_IGN : SIG_DFL);
+                       (void) signal(SIGQUIT, ignint ? SIG_IGN : SIG_DFL);
                        if (wanttty >= 0) {
                                /* make stoppable */
                        if (wanttty >= 0) {
                                /* make stoppable */
-                               signal(SIGTSTP, SIG_DFL);
-                               signal(SIGTTIN, SIG_DFL);
-                               signal(SIGTTOU, SIG_DFL);
+                               (void) signal(SIGTSTP, SIG_DFL);
+                               (void) signal(SIGTTIN, SIG_DFL);
+                               (void) signal(SIGTTOU, SIG_DFL);
                        }
                        }
-                       signal(SIGTERM, parterm);
+                       (void) signal(SIGTERM, parterm);
                } else if (tpgrp == -1 && (t->t_dflg&FINT)) {
                } else if (tpgrp == -1 && (t->t_dflg&FINT)) {
-                       signal(SIGINT, SIG_IGN);
-                       signal(SIGQUIT, SIG_IGN);
+                       (void) signal(SIGINT, SIG_IGN);
+                       (void) signal(SIGQUIT, SIG_IGN);
                }
                if (wanttty > 0)
                }
                if (wanttty > 0)
-                       ioctl(FSHTTY, TIOCSPGRP, &pgrp);
+                       (void) ioctl(FSHTTY, TIOCSPGRP, (char *)&pgrp);
                if (wanttty >= 0 && tpgrp >= 0)
                if (wanttty >= 0 && tpgrp >= 0)
-                       setpgrp(0, pgrp);
+                       (void) setpgrp(0, pgrp);
                if (tpgrp > 0)
                        tpgrp = 0;              /* gave tty away */
                /*
                if (tpgrp > 0)
                        tpgrp = 0;              /* gave tty away */
                /*
@@ -1069,12 +1081,12 @@ pfork(t, wanttty)
                 * Then the parser would have to know about nice/nohup/time
                 */
                if (t->t_dflg & FNOHUP)
                 * Then the parser would have to know about nice/nohup/time
                 */
                if (t->t_dflg & FNOHUP)
-                       signal(SIGHUP, SIG_IGN);
+                       (void) signal(SIGHUP, SIG_IGN);
                if (t->t_dflg & FNICE)
                if (t->t_dflg & FNICE)
-                       setpriority(PRIO_PROCESS, 0, t->t_nice);
+                       (void) setpriority(PRIO_PROCESS, 0, t->t_nice);
        } else {
                palloc(pid, t);
        } else {
                palloc(pid, t);
-               sigsetmask(omask);
+               (void) sigsetmask(omask);
        }
 
        return (pid);
        }
 
        return (pid);
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.