BSD 4_4_Lite1 release

[unix-history] / usr / src / bin / ps / keyword.c

diff --git a/usr/src/bin/ps/keyword.c b/usr/src/bin/ps/keyword.c
index 267be39..fb1133b 100644 (file)
--- a/usr/src/bin/ps/keyword.c
+++ b/usr/src/bin/ps/keyword.c
@@ -1,40 +1,65 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)keyword.c  5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyword.c  8.5 (Berkeley) 4/2/94";

 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/proc.h>

+
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdio.h>

 #include <stddef.h>
 #include <stddef.h>

+#include <stdio.h>
+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

+

 #include "ps.h"
 
 #include "ps.h"
 

-#ifdef SPPWAIT
+#ifdef P_PPWAIT

 #define NEWVM
 #endif
 
 #ifdef NEWVM
 #include <sys/ucred.h>
 #define NEWVM
 #endif
 
 #ifdef NEWVM
 #include <sys/ucred.h>

-#include <sys/kinfo_proc.h>
+#include <sys/sysctl.h>

 #endif
 
 #endif
 

-int    command(), cputime(), evar(), logname(), longtname(), lstarted(),
-       maxrss(), p_rssize(), pagein(), pcpu(), pmem(), pri(), pvar(),
-       rssize(), runame(), rvar(), started(), state(), tdev(), tname(),
-       tsize(), ucomm(), uname(), uvar(), vsize(), wchan();
-#ifndef NEWVM
-int    trss();
-#endif
+static VAR *findvar __P((char *));
+static int  vcmp __P((const void *, const void *));

 
 #ifdef NOTINUSE
 int    utime(), stime(), ixrss(), idrss(), isrss();
 
 #ifdef NOTINUSE
 int    utime(), stime(), ixrss(), idrss(), isrss();


@@ -61,12 +86,12 @@ VAR var[] = {
 #ifdef NEWVM
        {"%cpu", "%CPU", NULL, 0, pcpu, 4},
        {"%mem", "%MEM", NULL, 0, pmem, 4},
 #ifdef NEWVM
        {"%cpu", "%CPU", NULL, 0, pcpu, 4},
        {"%mem", "%MEM", NULL, 0, pmem, 4},

-       {"acflag", "ACFLG", NULL, 0, pvar, 3, POFF(p_acflag), SHORT, "x"},
+       {"acflag", "ACFLG", NULL, 0, pvar, 3, POFF(p_acflag), USHORT, "x"},

        {"acflg", "", "acflag"},
        {"blocked", "", "sigmask"},
        {"caught", "", "sigcatch"},
        {"acflg", "", "acflag"},
        {"blocked", "", "sigmask"},
        {"caught", "", "sigcatch"},

-       {"command", "COMMAND", NULL, COMM|LJUST, command, 16},
-       {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), UCHAR, "d"},
+       {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16},
+       {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_estcpu), ULONG, "d"},

        {"cputime", "", "time"},
        {"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"},
        {"flags", "", "f"},
        {"cputime", "", "time"},
        {"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"},
        {"flags", "", "f"},


@@ -99,45 +124,45 @@ VAR var[] = {
        {"pagein", "PAGEIN", NULL, USER, pagein, 6},
        {"pcpu", "", "%cpu"},
        {"pending", "", "sig"},
        {"pagein", "PAGEIN", NULL, USER, pagein, 6},
        {"pcpu", "", "%cpu"},
        {"pending", "", "sig"},

-       {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), USHORT, PIDFMT},
-       {"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid),SHORT, PIDFMT},
+       {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT},
+       {"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid), LONG, PIDFMT},

        {"pmem", "", "%mem"},
        {"pmem", "", "%mem"},

-       {"ppid", "PPID", NULL, 0, evar, PIDLEN, EOFF(e_ppid), SHORT, PIDFMT},
+       {"ppid", "PPID", NULL, 0, evar, PIDLEN, EOFF(e_ppid), LONG, PIDFMT},

        {"pri", "PRI", NULL, 0, pri, 3},
        {"pri", "PRI", NULL, 0, pri, 3},

-       {"re", "RE", NULL, 0, pvar, 3, POFF(p_time), CHAR, "d"},
+       {"re", "RE", NULL, 0, pvar, 3, POFF(p_swtime), ULONG, "d"},

        {"rgid", "RGID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_rgid),
        {"rgid", "RGID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_rgid),

-               USHORT, UIDFMT},
-       {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"},
+               ULONG, UIDFMT},
+       {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_back), KPTR, "x"},

        {"rss", "RSS", NULL, 0, p_rssize, 4},
        {"rssize", "", "rsz"},
        {"rsz", "RSZ", NULL, 0, rssize, 4},
        {"ruid", "RUID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_ruid),
        {"rss", "RSS", NULL, 0, p_rssize, 4},
        {"rssize", "", "rsz"},
        {"rsz", "RSZ", NULL, 0, rssize, 4},
        {"ruid", "RUID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_ruid),

-               USHORT, UIDFMT},
+               ULONG, UIDFMT},

        {"ruser", "RUSER", NULL, LJUST, runame, USERLEN},
        {"sess", "SESS", NULL, 0, evar, 6, EOFF(e_sess), KPTR, "x"},
        {"ruser", "RUSER", NULL, LJUST, runame, USERLEN},
        {"sess", "SESS", NULL, 0, evar, 6, EOFF(e_sess), KPTR, "x"},

-       {"sig", "PENDING", NULL, 0, pvar, 8, POFF(p_sig), LONG, "x"},
+       {"sig", "PENDING", NULL, 0, pvar, 8, POFF(p_siglist), LONG, "x"},

        {"sigcatch", "CAUGHT", NULL, 0, pvar, 8, POFF(p_sigcatch), LONG, "x"},
        {"sigignore", "IGNORED",
                NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"},
        {"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"},
        {"sigcatch", "CAUGHT", NULL, 0, pvar, 8, POFF(p_sigcatch), LONG, "x"},
        {"sigignore", "IGNORED",
                NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"},
        {"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"},

-       {"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), CHAR, "d"},
+       {"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), ULONG, "d"},

        {"start", "STARTED", NULL, LJUST|USER, started, 8},
        {"stat", "", "state"},
        {"state", "STAT", NULL, 0, state, 4},
        {"svgid", "SVGID",
        {"start", "STARTED", NULL, LJUST|USER, started, 8},
        {"stat", "", "state"},
        {"state", "STAT", NULL, 0, state, 4},
        {"svgid", "SVGID",

-               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svgid), USHORT, UIDFMT},
+               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svgid), ULONG, UIDFMT},

        {"svuid", "SVUID",
        {"svuid", "SVUID",

-               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svuid), USHORT, UIDFMT},
+               NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svuid), ULONG, UIDFMT},

        {"tdev", "TDEV", NULL, 0, tdev, 4},
        {"time", "TIME", NULL, USER, cputime, 9},
        {"tdev", "TDEV", NULL, 0, tdev, 4},
        {"time", "TIME", NULL, USER, cputime, 9},

-       {"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), USHORT, PIDFMT},
+       {"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT},

        {"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
        {"tsiz", "TSIZ", NULL, 0, tsize, 4},
        {"tt", "TT", NULL, LJUST, tname, 3},
        {"tty", "TTY", NULL, LJUST, longtname, 8},
        {"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
        {"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid),
        {"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
        {"tsiz", "TSIZ", NULL, 0, tsize, 4},
        {"tt", "TT", NULL, LJUST, tname, 3},
        {"tty", "TTY", NULL, LJUST, longtname, 8},
        {"ucomm", "UCOMM", NULL, LJUST, ucomm, MAXCOMLEN},
        {"uid", "UID", NULL, 0, evar, UIDLEN, EOFF(e_ucred.cr_uid),

-               USHORT, UIDFMT},
+               ULONG, UIDFMT},

        {"upr", "UPR", NULL, 0, pvar, 3, POFF(p_usrpri), CHAR, "d"},
        {"user", "USER", NULL, LJUST, uname, USERLEN},
        {"usrpri", "", "upr"},
        {"upr", "UPR", NULL, 0, pvar, 3, POFF(p_usrpri), CHAR, "d"},
        {"user", "USER", NULL, LJUST, uname, USERLEN},
        {"usrpri", "", "upr"},


@@ -153,7 +178,7 @@ VAR var[] = {
        {"blocked", "", "sigmask"},
        {"caught", "", "sigcatch"},
        {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16},
        {"blocked", "", "sigmask"},
        {"caught", "", "sigcatch"},
        {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16},

-       {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), UCHAR, "d"},
+       {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), ULONG, "d"},

        {"cputime", "", "time"},
        {"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"},
        {"flags", "", "f"},
        {"cputime", "", "time"},
        {"f", "F", NULL, 0, pvar, 7, POFF(p_flag), LONG, "x"},
        {"flags", "", "f"},


@@ -185,13 +210,13 @@ VAR var[] = {
        {"pagein", "PAGEIN", NULL, USER, pagein, 6},
        {"pcpu", "", "%cpu"},
        {"pending", "", "sig"},
        {"pagein", "PAGEIN", NULL, USER, pagein, 6},
        {"pcpu", "", "%cpu"},
        {"pending", "", "sig"},

-       {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), USHORT, PIDFMT},
-       {"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid),SHORT, PIDFMT},
+       {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), ULONG, PIDFMT},
+       {"pid", "PID", NULL, 0, pvar, PIDLEN, POFF(p_pid), LONG, PIDFMT},

        {"pmem", "", "%mem"},
        {"poip", "POIP", NULL, 0, pvar, 4, POFF(p_poip), SHORT, "d"},
        {"pmem", "", "%mem"},
        {"poip", "POIP", NULL, 0, pvar, 4, POFF(p_poip), SHORT, "d"},

-       {"ppid", "PPID", NULL, 0, pvar, PIDLEN, POFF(p_ppid), SHORT, PIDFMT},
+       {"ppid", "PPID", NULL, 0, pvar, PIDLEN, POFF(p_ppid), LONG, PIDFMT},

        {"pri", "PRI", NULL, 0, pri, 3},
        {"pri", "PRI", NULL, 0, pri, 3},

-       {"re", "RE", NULL, 0, pvar, 3, POFF(p_time), CHAR, "d"},
+       {"re", "RE", NULL, 0, pvar, 3, POFF(p_swtime), ULONG, "d"},

        {"rgid", "RGID", NULL, 0, pvar, UIDLEN, POFF(p_rgid), USHORT, UIDFMT},
        {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"},
        {"rss", "RSS", NULL, 0, p_rssize, 4},
        {"rgid", "RGID", NULL, 0, pvar, UIDLEN, POFF(p_rgid), USHORT, UIDFMT},
        {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"},
        {"rss", "RSS", NULL, 0, p_rssize, 4},


@@ -205,7 +230,7 @@ VAR var[] = {
        {"sigignore", "IGNORED",
                NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"},
        {"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"},
        {"sigignore", "IGNORED",
                NULL, 0, pvar, 8, POFF(p_sigignore), LONG, "x"},
        {"sigmask", "BLOCKED", NULL, 0, pvar, 8, POFF(p_sigmask), LONG, "x"},

-       {"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), CHAR, "d"},
+       {"sl", "SL", NULL, 0, pvar, 3, POFF(p_slptime), ULONG, "d"},

        {"start", "STARTED", NULL, LJUST|USER, started, 8},
        {"stat", "", "state"},
        {"state", "STAT", NULL, 0, state, 4},
        {"start", "STARTED", NULL, LJUST|USER, started, 8},
        {"stat", "", "state"},
        {"state", "STAT", NULL, 0, state, 4},


@@ -215,7 +240,7 @@ VAR var[] = {
                NULL, 0, pvar, UIDLEN, POFF(p_svuid), USHORT, UIDFMT},
        {"tdev", "TDEV", NULL, 0, tdev, 4},
        {"time", "TIME", NULL, USER, cputime, 9},
                NULL, 0, pvar, UIDLEN, POFF(p_svuid), USHORT, UIDFMT},
        {"tdev", "TDEV", NULL, 0, tdev, 4},
        {"time", "TIME", NULL, USER, cputime, 9},

-       {"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), USHORT, PIDFMT},
+       {"tpgid", "TPGID", NULL, 0, evar, 4, EOFF(e_tpgid), ULONG, PIDFMT},

        {"trs", "TRS", NULL, 0, trss, 3},
        {"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
        {"tsiz", "TSIZ", NULL, 0, tsize, 4},
        {"trs", "TRS", NULL, 0, trss, 3},
        {"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
        {"tsiz", "TSIZ", NULL, 0, tsize, 4},


@@ -235,45 +260,45 @@ VAR var[] = {
        {""},
 };
 
        {""},
 };
 

+void

 showkey()
 {
 showkey()
 {

-       extern int termwidth;
-       register VAR *v;
-       register int i, len;
-       register char *p, *sep;
+       VAR *v;
+       int i;
+       char *p, *sep;

 
        i = 0;
 
        i = 0;

+       sep = "";

        for (v = var; *(p = v->name); ++v) {
        for (v = var; *(p = v->name); ++v) {

-               len = strlen(p);
+               int len = strlen(p);

                if (termwidth && (i += len + 1) > termwidth) {
                        i = len;
                        sep = "\n";
                if (termwidth && (i += len + 1) > termwidth) {
                        i = len;
                        sep = "\n";

-               } else
-                       sep = " ";
+               }

                (void) printf("%s%s", sep, p);
                (void) printf("%s%s", sep, p);

+               sep = " ";

        }
        (void) printf("\n");
 }
 
        }
        (void) printf("\n");
 }
 

+void

 parsefmt(p)
        char *p;
 {
 parsefmt(p)
        char *p;
 {

-       register VAR *v;
-       register char *cp;
-       register struct varent *vent;
-       static VAR *findvar();
+       static struct varent *vtail;

 
 #define        FMTSEP  " \t,\n"
 
 #define        FMTSEP  " \t,\n"

-       while (p) {
+       while (p && *p) {
+               char *cp;
+               VAR *v;
+               struct varent *vent;
+

                while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
                        /* void */;
                if (!(v = findvar(cp)))
                        continue;
                while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0')
                        /* void */;
                if (!(v = findvar(cp)))
                        continue;

-               if ((vent = (struct varent *)malloc(sizeof(struct varent))) == 
-                   NULL) {
-                       (void)fprintf(stderr, "ps: no space\n");
-                       exit(1);
-               }
+               if ((vent = malloc(sizeof(struct varent))) == NULL)
+                       err(1, NULL);

                vent->var = v;
                vent->next = NULL;
                if (vhead == NULL)
                vent->var = v;
                vent->next = NULL;
                if (vhead == NULL)


@@ -283,51 +308,47 @@ parsefmt(p)
                        vtail = vent;
                }
        }
                        vtail = vent;
                }
        }

-       if (!vhead) {
-               (void)fprintf(stderr, "ps: no valid keywords\n");
-               exit(1);
-       }
+       if (!vhead)
+               errx(1, "no valid keywords");

 }
 
 static VAR *
 findvar(p)
        char *p;
 {
 }
 
 static VAR *
 findvar(p)
        char *p;
 {

-       extern int eval;

        VAR *v, key;
        char *hp;
        int vcmp();
 
        key.name = p;
 
        VAR *v, key;
        char *hp;
        int vcmp();
 
        key.name = p;
 

-       hp = index(p, '=');
+       hp = strchr(p, '=');

        if (hp)
                *hp++ = '\0';
 
        key.name = p;
        if (hp)
                *hp++ = '\0';
 
        key.name = p;

-       v = (VAR *)bsearch(&key, var,
-           sizeof(var)/sizeof(VAR), sizeof(VAR), vcmp);
+       v = bsearch(&key, var, sizeof(var)/sizeof(VAR) - 1, sizeof(VAR), vcmp);

 
        if (v && v->alias) {
                if (hp) {
 
        if (v && v->alias) {
                if (hp) {

-                       (void)fprintf(stderr,
-                           "ps: %s: illegal keyword specification\n", p);
+                       warnx("%s: illegal keyword specification", p);

                        eval = 1;
                }
                parsefmt(v->alias);
                        eval = 1;
                }
                parsefmt(v->alias);

-               return((VAR *)NULL);
+               return ((VAR *)NULL);

        }
        if (!v) {
        }
        if (!v) {

-               (void)fprintf(stderr, "ps: keyword %s not found\n", p);
+               warnx("%s: keyword not found", p);

                eval = 1;
        }
        if (hp)
                v->header = hp;
                eval = 1;
        }
        if (hp)
                v->header = hp;

-       return(v);
+       return (v);

 }
 
 }
 

+static int

 vcmp(a, b)
 vcmp(a, b)

-        VAR *a, *b;
+        const void *a, *b;

 {
 {

-        return(strcmp(a->name, b->name));
+        return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));

 }
 }