/*-
- * 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.17 (Berkeley) %G%";
+static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#endif /* not lint */
#include <sys/param.h>
#include "ps.h"
-#ifdef SPPWAIT
+#ifdef P_PPWAIT
#define NEWVM
#endif
{"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"},
{"pagein", "PAGEIN", NULL, USER, pagein, 6},
{"pcpu", "", "%cpu"},
{"pending", "", "sig"},
- {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), USHORT, 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"},
{"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), CHAR, "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},
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"},
{"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},
NULL, 0, evar, UIDLEN, EOFF(e_pcred.p_svuid), ULONG, 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},
{"tsess", "TSESS", NULL, 0, evar, 6, EOFF(e_tsess), KPTR, "x"},
{"tsiz", "TSIZ", NULL, 0, tsize, 4},
{"tt", "TT", NULL, LJUST, tname, 3},
{"pagein", "PAGEIN", NULL, USER, pagein, 6},
{"pcpu", "", "%cpu"},
{"pending", "", "sig"},
- {"pgid", "PGID", NULL, 0, evar, PIDLEN, EOFF(e_pgid), USHORT, 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"},
{"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), 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},
{"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},
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},
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";
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)))
findvar(p)
char *p;
{
- extern int eval;
VAR *v, key;
char *hp;
int vcmp();
eval = 1;
}
parsefmt(v->alias);
- return((VAR *)NULL);
+ return ((VAR *)NULL);
}
if (!v) {
warnx("%s: keyword not found", 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));
}