X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/fec32fdb7f21ad896b8e82648c05801237868361..ed554bc5e4201344d7eaad78263566e79428759c:/usr/src/bin/ps/keyword.c diff --git a/usr/src/bin/ps/keyword.c b/usr/src/bin/ps/keyword.c index 2393a40cc2..fb1133ba23 100644 --- a/usr/src/bin/ps/keyword.c +++ b/usr/src/bin/ps/keyword.c @@ -1,12 +1,38 @@ /*- - * 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 -static char sccsid[] = "@(#)keyword.c 5.18 (Berkeley) %G%"; +static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #endif /* not lint */ #include @@ -23,7 +49,7 @@ static char sccsid[] = "@(#)keyword.c 5.18 (Berkeley) %G%"; #include "ps.h" -#ifdef SPPWAIT +#ifdef P_PPWAIT #define NEWVM #endif @@ -65,7 +91,7 @@ VAR var[] = { {"blocked", "", "sigmask"}, {"caught", "", "sigcatch"}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, 16}, - {"cpu", "CPU", NULL, 0, pvar, 3, POFF(p_cpu), ULONG, "d"}, + {"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"}, @@ -103,10 +129,10 @@ VAR var[] = { {"pmem", "", "%mem"}, {"ppid", "PPID", NULL, 0, evar, PIDLEN, EOFF(e_ppid), LONG, PIDFMT}, {"pri", "PRI", NULL, 0, pri, 3}, - {"re", "RE", NULL, 0, pvar, 3, POFF(p_time), ULONG, "d"}, + {"re", "RE", NULL, 0, pvar, 3, POFF(p_swtime), ULONG, "d"}, {"rgid", "RGID", NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_rgid), ULONG, UIDFMT}, - {"rlink", "RLINK", NULL, 0, pvar, 8, POFF(p_rlink), KPTR, "x"}, + {"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}, @@ -114,7 +140,7 @@ VAR var[] = { ULONG, UIDFMT}, {"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"}, @@ -190,7 +216,7 @@ VAR var[] = { {"poip", "POIP", NULL, 0, pvar, 4, POFF(p_poip), SHORT, "d"}, {"ppid", "PPID", NULL, 0, pvar, PIDLEN, POFF(p_ppid), LONG, PIDFMT}, {"pri", "PRI", NULL, 0, pri, 3}, - {"re", "RE", NULL, 0, pvar, 3, POFF(p_time), ULONG, "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}, @@ -237,15 +263,14 @@ VAR var[] = { void showkey() { - extern int termwidth; - register VAR *v; - register int i, len; - register char *p, *sep; + VAR *v; + int i; + char *p, *sep; i = 0; sep = ""; for (v = var; *(p = v->name); ++v) { - len = strlen(p); + int len = strlen(p); if (termwidth && (i += len + 1) > termwidth) { i = len; sep = "\n"; @@ -261,12 +286,13 @@ parsefmt(p) char *p; { static struct varent *vtail; - register VAR *v; - register char *cp; - register struct varent *vent; #define FMTSEP " \t,\n" while (p && *p) { + char *cp; + VAR *v; + struct varent *vent; + while ((cp = strsep(&p, FMTSEP)) != NULL && *cp == '\0') /* void */; if (!(v = findvar(cp))) @@ -290,7 +316,6 @@ static VAR * findvar(p) char *p; { - extern int eval; VAR *v, key; char *hp; int vcmp(); @@ -310,7 +335,7 @@ findvar(p) eval = 1; } parsefmt(v->alias); - return((VAR *)NULL); + return ((VAR *)NULL); } if (!v) { warnx("%s: keyword not found", p); @@ -318,12 +343,12 @@ findvar(p) } if (hp) v->header = hp; - return(v); + return (v); } static int vcmp(a, b) const void *a, *b; { - return(strcmp(((VAR *)a)->name, ((VAR *)b)->name)); + return (strcmp(((VAR *)a)->name, ((VAR *)b)->name)); }