BSD 4_3_Reno release
[unix-history] / usr / src / bin / ps / ps.c
index 8586304..d529999 100644 (file)
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
 #ifndef lint
 #ifndef lint
-static char *sccsid = "@(#)ps.c        4.28 (Berkeley) %G%";
-#endif
+char copyright[] =
+"@(#) Copyright (c) 1990 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)ps.c       5.28 (Berkeley) 6/26/90";
+#endif /* not lint */
+
+#include <machine/pte.h>
 
 
-/*
- * ps
- */
-#include <stdio.h>
-#include <ctype.h>
-#include <nlist.h>
-#include <pwd.h>
 #include <sys/param.h>
 #include <sys/param.h>
+#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/tty.h>
-#include <sys/dir.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/proc.h>
-#include <machine/pte.h>
 #include <sys/vm.h>
 #include <sys/text.h>
 #include <sys/stat.h>
 #include <sys/mbuf.h>
 #include <sys/vm.h>
 #include <sys/text.h>
 #include <sys/stat.h>
 #include <sys/mbuf.h>
+#include <nlist.h>
+#include <pwd.h>
 #include <math.h>
 #include <errno.h>
 #include <math.h>
 #include <errno.h>
-
-struct nlist nl[] = {
-       { "_proc" },
-#define        X_PROC          0
-       { "_Usrptmap" },
-#define        X_USRPTMAP      1
-       { "_usrpt" },
-#define        X_USRPT         2
-       { "_text" },
-#define        X_TEXT          3
-       { "_nswap" },
-#define        X_NSWAP         4
-       { "_maxslp" },
-#define        X_MAXSLP        5
-       { "_ccpu" },
-#define        X_CCPU          6
-       { "_ecmx" },
-#define        X_ECMX          7
-       { "_nproc" },
-#define        X_NPROC         8
-       { "_ntext" },
-#define        X_NTEXT         9
-       { "_dmmin" },
-#define        X_DMMIN         10
-       { "_dmmax" },
-#define        X_DMMAX         11
-       { "_Sysmap" },
-#define        X_SYSMAP        12
-       { "_Syssize" },
-#define        X_SYSSIZE       13
-       { "" },
+#include <stdio.h>
+#include <ctype.h>
+#include <kvm.h>
+
+struct usave {
+       struct  proc *u_procp;
+       struct  timeval u_start;
+       struct  rusage u_ru;
+       struct  rusage u_cru;
+       short   u_cmask;
+       char    u_acflag;
 };
 
 };
 
-struct savcom {
-       union {
-               struct  lsav *lp;
-               float   u_pctcpu;
-               struct  vsav *vp;
-               int     s_ssiz;
-       } s_un;
-       struct  asav *ap;
-} *savcom;
-
-struct asav {
-       char    *a_cmdp;
-       int     a_flag;
-       short   a_stat, a_uid, a_pid, a_nice, a_pri, a_slptime, a_time;
-       size_t  a_size, a_rss, a_tsiz, a_txtrss;
-       short   a_xccount;
-       char    a_tty[MAXNAMLEN+1];
-       dev_t   a_ttyd;
-       time_t  a_cpu;
-       size_t  a_maxrss;
+/*
+ * to compute offset in common structures
+ */
+#define        POFF(x)         ((int)&((struct proc *)0)->x)
+#define        EOFF(x)         ((int)&((struct eproc *)0)->x)
+#define        UOFF(x)         ((int)&((struct usave *)0)->x)
+#define        ROFF(x)         ((int)&((struct rusage *)0)->x)
+
+enum type      { CHAR, UCHAR, SHORT, USHORT, LONG, ULONG, KPTR };
+
+#define        UIDFMT  "u"
+#define UIDLEN 5
+#define PIDFMT "d"
+#define PIDLEN 5
+#define        USERLEN 8
+
+int needuser, needcomm, neednlist;
+
+int    command(), ucomm(), logname(), pvar(), evar(), uvar(), rvar(), uname(), 
+       runame(), state(), pri(), tdev(), tname(), longtname(), started(),
+       lstarted(), wchan(), vsize(), rssize(), p_rssize(), cputime(), 
+       pmem(), pcpu(), pagein(), maxrss(), tsize(), trss();
+       /**
+       utime(), stime(), ixrss(), idrss(), isrss();
+       **/
+
+struct usave *saveuser();
+char   *saveargs();
+
+struct var {
+       char    *name[8];       /* name(s) of variable */
+       char    *header;        /* default header */
+       int     flag;
+#define        USER    0x01    /* requires user structure */
+#define        LJUST   0x02    /* right adjust on output */
+#define        COMM    0x04    /* requires exec arguments and environment (XXX) */
+#define        NLIST   0x08    /* requires nlist to get extra variables */
+       int     (*oproc)();     /* output routine */
+       short   width;          /* printing width */
+       /*
+        * The following (optional) elements are hooks for passing information
+        * to the generic output routines: pvar, evar, uvar (those which print
+        * simple elements from well known structures: proc, eproc, usave)
+        */
+       int     off;            /* offset in structure */
+       enum    type type;      /* type of element */
+       char    *fmt;           /* printf format */
+       /*
+        * glue to link selected fields together
+        */
+       struct  var *next;
+}  var[] = {
+       {{"command", "comm", "args"}, "COMMAND", USER|LJUST|COMM, 
+               command, 16}, 
+       {{"ucomm"}, "COMMAND",  LJUST, ucomm, MAXCOMLEN},
+       {{"logname"}, "LOGNAME", LJUST, logname, MAXLOGNAME},
+       {{"flag", "f"}, "F", 0, pvar, 7, POFF(p_flag), LONG, "x"},
+       {{"uid"}, "UID", 0, pvar, UIDLEN, POFF(p_uid),USHORT, UIDFMT},
+       {{"ruid"}, "RUID", 0, pvar, UIDLEN, POFF(p_ruid), USHORT, UIDFMT},
+       {{"svuid"}, "SVUID", 0, pvar, UIDLEN, POFF(p_svuid), USHORT, UIDFMT},
+       {{"rgid"}, "RGID", 0, pvar, UIDLEN, POFF(p_rgid), USHORT, UIDFMT},
+       {{"svgid"}, "SVGID", 0, pvar, UIDLEN, POFF(p_svgid), USHORT, UIDFMT},
+       {{"pid"}, "PID", 0, pvar, PIDLEN, POFF(p_pid),SHORT, PIDFMT},
+       {{"ppid"}, "PPID", 0, pvar, PIDLEN, POFF(p_ppid), SHORT, PIDFMT},
+       {{"cp", "cpu"}, "CP", 0, pvar, 3, POFF(p_cpu), UCHAR, "d"},
+       {{"xstat"}, "XSTAT", 0, pvar, 4, POFF(p_xstat), USHORT, "x"},
+       {{"poip"}, "POIP", 0, pvar, 4, POFF(p_poip), SHORT, "d"},
+       {{"nwchan"}, "WCHAN", 0, pvar, 6, POFF(p_wchan), KPTR, "x"},
+       {{"wchan"}, "WCHAN", LJUST, wchan, 6},
+       {{"rlink"}, "RLINK", 0, pvar, 8, POFF(p_rlink), KPTR, "x"},
+       {{"ktrace", "traceflag"}, "KTRACE",
+               0, pvar, 8, POFF(p_traceflag), LONG, "x"},
+       {{"ktracep", "tracep"}, "KTRACEP",
+               0, pvar, 8, POFF(p_tracep), LONG, "x"},
+       {{"sig", "pending"}, "PENDING",
+               0, pvar, 8, POFF(p_sig), LONG, "x"},
+       {{"sigmask", "blocked"}, "BLOCKED",
+               0, pvar, 8, POFF(p_sigmask), LONG, "x"},
+       {{"sigignore", "ignored"}, "IGNORED",
+               0, pvar, 8, POFF(p_sigignore), LONG, "x"},
+       {{"sigcatch", "caught"}, "CAUGHT",
+               0, pvar, 8, POFF(p_sigcatch), LONG, "x"},
+       {{"user", "uname"}, "USER", LJUST, uname, USERLEN},
+       {{"ruser", "runame"}, "RUSER", LJUST, runame, USERLEN},
+       {{"pgid"}, "PGID", 0, evar, PIDLEN, EOFF(e_pgid), USHORT, PIDFMT},
+       {{"jobc"}, "JOBC", 0, evar, 4, EOFF(e_jobc), SHORT, "d"},
+       {{"sess", "session"}, "SESS", 0, evar, 6, EOFF(e_sess), KPTR, "x"},
+       {{"tdev", "dev"}, "TDEV", 0, tdev, 4},
+       {{"tname", "tty", "tt"}, "TT", LJUST, tname, 3},
+       {{"longtname", "longtty"}, "TT", LJUST, longtname, 8},
+       {{"tpgid"}, "TPGID", 0, evar, 4, EOFF(e_tpgid), USHORT, PIDFMT},
+       {{"tsession", "tsess"}, "TSESS", 
+               0, evar, 6, EOFF(e_tsess), KPTR, "x"},
+       {{"paddr", "procaddr"}, "PADDR",
+               0, evar, 6, EOFF(e_paddr), KPTR, "x"},
+       {{"state", "stat"}, "STAT", 0, state, 4},
+       {{"pri"}, "PRI", 0, pri, 3},
+       {{"usrpri"}, "UPR", 0, pvar, 3, POFF(p_usrpri), CHAR, "d"},
+       {{"nice", "ni"}, "NI", 0, pvar, 2, POFF(p_nice), CHAR, "d"}, 
+       {{"vsize", "vsz"}, "VSZ", 0, vsize, 5},
+       {{"rssize", "rsz"}, "RSZ", 0, rssize, 4},
+       {{"rss", "p_rss"}, "RSS", 0, p_rssize, 4},
+       {{"u_procp", "uprocp"}, "UPROCP",
+               USER, uvar, 6, UOFF(u_procp), KPTR, "x"},
+       {{"umask", "u_cmask"}, "UMASK",
+               USER, uvar, 3, UOFF(u_cmask), CHAR, "#o"},
+       {{"acflag", "acflg"}, "ACFLG",
+               USER, uvar, 3, UOFF(u_acflag), SHORT, "x"},
+       {{"start"}, "STARTED", USER|LJUST, started, 8},
+       {{"lstart"}, "STARTED", USER|LJUST, lstarted, 28},
+       {{"cputime", "time"}, "TIME", USER, cputime, 9},
+       {{"p_ru"}, "P_RU", 0, pvar, 6, POFF(p_ru), KPTR, "x"},
+       {{"pcpu", "%cpu"}, "%CPU", NLIST, pcpu, 4},
+       {{"pmem", "%mem"}, "%MEM", NLIST, pmem, 4},
+       {{"sl", "slp", "slptime"}, "SL",
+               0, pvar, 3, POFF(p_slptime), CHAR, "d"},
+       {{"re", "resident"}, "RE",
+               0, pvar, 3, POFF(p_time), CHAR, "d"},
+       {{"pagein", "majflt"}, "PAGEIN", USER, pagein, 6},
+       {{"lim", "maxrss"}, "LIM", 0, maxrss, 5},
+       {{"tsiz"}, "TSIZ", 0, tsize, 4},
+       {{"trs"}, "TRS", 0, trss, 3},
+       /***
+       {{"utime"}, "UTIME", USER, utime, 4},
+       {{"stime"}, "STIME", USER, stime, 4},
+       {{"ixrss"}, "IXRSS", USER, ixrss, 4},
+       {{"idrss"}, "IDRSS", USER, idrss, 4},
+       {{"isrss"}, "ISRSS", USER, isrss, 4},
+       ***/
+       {{"minflt"}, "MINFLT", 
+               USER, rvar, 4, ROFF(ru_minflt), LONG, "d"},
+       {{"majflt"}, "MAJFLT", 
+               USER, rvar, 4, ROFF(ru_majflt), LONG, "d"},
+       {{"nswap"}, "NSWAP",    
+               USER, rvar, 4, ROFF(ru_nswap), LONG, "d"},
+       {{"inblock", "inblk"}, "INBLK",         
+               USER, rvar, 4, ROFF(ru_inblock), LONG, "d"},
+       {{"oublock", "oublk"}, "OUBLK", 
+               USER, rvar, 4, ROFF(ru_oublock), LONG, "d"},
+       {{"msgsnd"}, "MSGSND", 
+               USER, rvar, 4, ROFF(ru_msgsnd), LONG, "d"},
+       {{"msgrcv"}, "MSGRCV", 
+               USER, rvar, 4, ROFF(ru_msgrcv), LONG, "d"},
+       {{"nsignals", "nsigs"}, "NSIGS", 
+               USER, rvar, 4, ROFF(ru_nsignals), LONG, "d"},
+       {{"nvcsw", "vcsw"}, "VCSW", 
+               USER, rvar, 5, ROFF(ru_nvcsw), LONG, "d"},
+       {{"nivcsw", "ivcsw"}, "IVCSW", 
+               USER, rvar, 5, ROFF(ru_nivcsw), LONG, "d"},
+       NULL
 };
 
 };
 
-char   *lhdr;
-struct lsav {
-       short   l_ppid;
-       char    l_cpu;
-       int     l_addr;
-       caddr_t l_wchan;
+/* 
+ * combination variables 
+ */
+struct combovar {
+       char *name;
+       char *replace;
+} combovar[] = {
+       "RUSAGE", "minflt majflt nswap inblock oublock \
+               msgsnd msgrcv nsigs nvcsw nivcsw",
+       0, 0
 };
 };
+#define DFMT   "pid tname state cputime comm"
+#define LFMT \
+       "uid pid ppid cp pri nice vsz rss wchan state tname cputime comm"
+#define        JFMT    "user pid ppid pgid sess jobc state tname cputime comm"
+#define        SFMT    "uid pid sig sigmask sigignore sigcatch stat tname comm"
+#define        VFMT \
+       "pid tt state time sl re pagein vsz rss lim tsiz trs %cpu %mem comm"
+#define UFMT \
+       "uname pid %cpu %mem vsz rss tt state start time comm"
+
+struct kinfo {
+       struct proc *ki_p;      /* proc structure */
+       struct eproc *ki_e;     /* extra stuff */
+       struct usave *ki_u;     /* interesting parts of user */
+       char *ki_args;          /* exec args (should be char **) */
+       char *ki_env;           /* environment (should be char **) */
+} *kinfo;
+
+struct var *vhead, *vtail;
+int    termwidth;      /* width of screen (0 == infinity) */
+#define UNLIMITED      0
+int    totwidth;       /* calculated width of requested variables */
+int    sumrusage;
+int    rawcpu;
+int    sortby;
+#define        SORTMEM 1
+#define        SORTCPU 2
+
+int    uid = -1;
+dev_t  ttydev = NODEV;
+int    pid = -1;
+int    all;
+int    xflg;
+int    prtheader;
+int    lineno;
 
 
-char   *uhdr;
-char   *shdr;
-
-char   *vhdr;
-struct vsav {
-       u_int   v_majflt;
-       size_t  v_swrss, v_txtswrss;
-       float   v_pctcpu;
+/*
+ * variables retrieved via nlist
+ */
+struct nlist psnl[] = {
+       {"_ecmx"},
+#define        X_ECMX          0
+       {"_fscale"},
+#define        X_FSCALE        1
+       {"_ccpu"},
+#define        X_CCPU          2
+       {NULL}
 };
 };
-
-#define        NPROC   16
-
-struct proc proc[NPROC];               /* a few, for less syscalls */
-struct proc *mproc;
-struct text *text;
-
-union {
-       struct  user user;
-       char    upages[UPAGES][NBPG];
-} user;
-#define u      user.user
-
-#ifndef        PSFILE
-char   *psdb   = "/etc/psdatabase";
-#else
-char   *psdb   = PSFILE;
-#endif
-
-int    chkpid;
-int    aflg, cflg, eflg, gflg, kflg, lflg, sflg,
-       uflg, vflg, xflg, Uflg;
-char   *tptr;
-char   *gettty(), *getcmd(), *getname(), *savestr(), *state();
-char   *rindex(), *calloc(), *sbrk(), *strcpy(), *strcat(), *strncat();
-char   *strncpy(), *index(), *ttyname(), mytty[16];
-long   lseek();
-off_t  vtophys();
-double pcpu(), pmem();
-int    pscomp();
-int    nswap, maxslp;
-struct text *atext;
-double ccpu;
+int    fscale;
 int    ecmx;
 int    ecmx;
-struct pte *Usrptmap, *usrpt;
-int    nproc, ntext;
-int    dmmin, dmmax;
-struct pte *Sysmap;
-int    Syssize;
-
-#ifndef        MAXTTYS
-#define        MAXTTYS         256
-#endif
-
-int    nttys;
-
-struct ttys {
-       dev_t   ttyd;
-       struct  ttys *cand;
-       char    name[MAXNAMLEN+1];
-} allttys[MAXTTYS], *cand[16];
-
-int    npr;
-
-int    cmdstart;
-int    twidth;
-char   *kmemf, *memf, *swapf, *nlistf;
-int    kmem, mem, swap = -1;
-int    rawcpu, sumcpu;
-
-int    pcbpf;
-int    argaddr;
-extern char _sobuf[];
+fixpt_t        ccpu;
 
 
-#define        pgtok(a)        ((a)/(1024/NBPG))
+#define USAGE  "ps [ -(o|O) fmt ] [ -wlvujnsaxSCLmcr ] [ -p pid ] [ -t tty ]"
 
 
-main(argc, argv)
-       char **argv;
+main (argc, argv) 
+       char *argv[];
 {
 {
-       register int i, j;
-       register char *ap;
-       int uid;
-       off_t procp;
-
-       twidth = 80;
-       argc--, argv++;
-       if (argc > 0) {
-               ap = argv[0];
-               while (*ap) switch (*ap++) {
-
-               case 'C':
-                       rawcpu++;
-                       break;
-               case 'S':
-                       sumcpu++;
-                       break;
-
-               case 'U':
-                       Uflg++;
+       extern char *optarg;
+       extern int optind;
+       int ch; 
+       register i;
+       register struct var *v;
+       register struct proc *p;
+       struct winsize ws;
+       struct kinfo_proc *kprocs;
+       int nentries;
+       int fmt = 0;
+       int pscomp();
+       int what, flag;
+       char *kludge_oldps_options();
+
+       if ((ioctl(1, TIOCGWINSZ, &ws) == -1 && 
+            ioctl(2, TIOCGWINSZ, &ws) == -1 &&
+            ioctl(0, TIOCGWINSZ, &ws) == -1) ||
+            ws.ws_col == 0)
+               termwidth = 79;
+       else
+               termwidth = ws.ws_col - 1;
+       if (argc > 1)
+               argv[1] = kludge_oldps_options(argv[1]);
+
+       while ((ch = getopt(argc, argv, "o:O:wlvujnsaxt:p:SCLmrhTg")) != EOF)
+               switch((char)ch) {
+               case 'o':
+                       parsefmt(optarg);
+                       fmt++;
                        break;
                        break;
-
-               case 'a':
-                       aflg++;
+               case 'O':
+                       parsefmt("pid");
+                       parsefmt(optarg);
+                       parsefmt("state tt time command");
+                       fmt++;
                        break;
                        break;
-               case 'c':
-                       cflg = !cflg;
+               case 'w':
+                       if (termwidth < 131)
+                               termwidth = 131;
+                       else
+                               termwidth = UNLIMITED;
                        break;
                        break;
-               case 'e':
-                       eflg++;
+               case 'l':
+                       parsefmt(LFMT);
+                       fmt++;
                        break;
                        break;
-               case 'g':
-                       gflg++;
+               case 'v':
+                       parsefmt(VFMT);
+                       sortby = SORTMEM;
+                       fmt++;
                        break;
                        break;
-               case 'k':
-                       kflg++;
+               case 'u':
+                       parsefmt(UFMT);
+                       sortby = SORTCPU;
+                       fmt++;
                        break;
                        break;
-               case 'l':
-                       lflg++;
+               case 'j':
+                       parsefmt(JFMT);
+                       fmt++;
                        break;
                case 's':
                        break;
                case 's':
-                       sflg++;
+                       parsefmt(SFMT);
+                       fmt++;
                        break;
                        break;
-               case 't':
-                       if (*ap)
-                               tptr = ap;
-                       else if ((tptr = ttyname(2)) != 0) {
-                               strcpy(mytty, tptr);
-                               if ((tptr = index(mytty,'y')) != 0)
-                                       tptr++;
-                       }
-                       aflg++;
-                       gflg++;
-                       if (tptr && *tptr == '?')
-                               xflg++;
-                       while (*ap)
-                               ap++;
+               case 'T':
+               case 't': {
+                       struct stat stbuf;
+                       char *tname, *ttyname();
+                       char termname[MAXPATHLEN+1];
+
+                       if (ch == 'T') {
+                               if ((tname = ttyname(0)) == NULL)
+                                       error("<stdin>: not a terminal");
+                       } else 
+                               tname = optarg;
+                       if (strlen(tname) == 2) {
+                               if (strcmp(tname, "co") == 0)
+                                       strcpy(termname, "/dev/console");
+                               else {
+                                       strcpy(termname, "/dev/tty");
+                                       strcat(termname, tname);
+                               }
+                       } else if (*tname != '/') {
+                               strcpy(termname, "/dev/");
+                               strcat(termname, tname);
+                       } else
+                               strcpy(termname, tname);
+                       if (stat(termname, &stbuf) == -1)
+                               syserror(termname);
+                       if ((stbuf.st_mode & S_IFMT) != S_IFCHR)
+                               error("%s: not a terminal", termname);
+                       ttydev = stbuf.st_rdev;
                        break;
                        break;
-               case 'u': 
-                       uflg++;
+               }
+               case 'p':
+                       pid = atoi(optarg);
+                       xflg++;
                        break;
                        break;
-               case 'v':
-                       cflg = 1;
-                       vflg++;
+               case 'S':
+                       sumrusage++;
                        break;
                        break;
-               case 'w':
-                       if (twidth == 80)
-                               twidth = 132;
-                       else
-                               twidth = BUFSIZ;
+               case 'C':
+                       rawcpu++;
+                       break;
+               case 'L': {
+                       int i = 0;
+                       struct combovar *cb = &combovar[0];
+                       char *cp;
+
+                       v = &var[0];
+                       for (;;) {
+                               if (v->name[0] != NULL) {
+                                       cp = v->name[0];
+                                       v++;
+                               } else if (cb->name != NULL) {
+                                       cp = cb->name;
+                                       cb++;
+                               } else
+                                       break;
+                               if (termwidth && 
+                                  (i += strlen(cp)+1) > termwidth)
+                                       i = strlen(cp), printf("\n");
+                               printf("%s ", cp);
+                       }
+                       printf("\n");
+                       exit(0);
+               }
+               case 'a':
+                       all++;
                        break;
                case 'x':
                        xflg++;
                        break;
                        break;
                case 'x':
                        xflg++;
                        break;
-               default:
-                       if (!isdigit(ap[-1]))
-                               break;
-                       chkpid = atoi(--ap);
-                       *ap = 0;
-                       aflg++;
-                       xflg++;
+               case 'm':
+                       sortby = SORTMEM;
                        break;
                        break;
-               }
-       }
-       openfiles(argc, argv);
-       getkvars(argc, argv);
-       uid = getuid();
-       printhdr();
-       procp = getw(nl[X_PROC].n_value);
-       nproc = getw(nl[X_NPROC].n_value);
-       savcom = (struct savcom *)calloc((unsigned) nproc, sizeof (*savcom));
-       for (i=0; i<nproc; i += NPROC) {
-               klseek(kmem, (long)procp, 0);
-               j = nproc - i;
-               if (j > NPROC)
-                       j = NPROC;
-               j *= sizeof (struct proc);
-               if (read(kmem, (char *)proc, j) != j) {
-                       cantread("proc table", kmemf);
+               case 'r':
+                       sortby = SORTCPU;
+                       break;
+               case 'h':
+                       prtheader = ws.ws_row > 5 ? ws.ws_row : 22;
+                       break;
+               case 'g':
+                       break;  /* no-op */
+               case '?':
+               default:
+                       fprintf(stderr, "usage: %s\n", USAGE);
                        exit(1);
                }
                        exit(1);
                }
-               procp += j;
-               for (j = j / sizeof (struct proc) - 1; j >= 0; j--) {
-                       mproc = &proc[j];
-                       if (mproc->p_stat == 0 ||
-                           mproc->p_pgrp == 0 && xflg == 0)
-                               continue;
-                       if (tptr == 0 && gflg == 0 && xflg == 0 &&
-                           mproc->p_ppid == 1)
-                               continue;
-                       if (uid != mproc->p_uid && aflg==0)
-                               continue;
-                       if (chkpid != 0 && chkpid != mproc->p_pid)
-                               continue;
-                       if (vflg && gflg == 0 && xflg == 0) {
-                               if (mproc->p_stat == SZOMB ||
-                                   mproc->p_flag&SWEXIT)
-                                       continue;
-                               if (mproc->p_slptime > MAXSLP &&
-                                   (mproc->p_stat == SSLEEP ||
-                                    mproc->p_stat == SSTOP))
-                               continue;
-                       }
-                       save();
+       argc -= optind;
+       argv += optind;
+       
+       if (*argv) {
+               char *nlistf, *memf = NULL, *swapf = NULL;
+
+               nlistf = *argv++;
+               if (*argv) {
+                       memf = *argv++;
+                       if (*argv)
+                               swapf = *argv++;
                }
                }
+               if (kvm_openfiles(nlistf, memf, swapf) == -1)
+                       error("kvm_openfiles: %s", kvm_geterr());
        }
        }
-       qsort((char *) savcom, npr, sizeof(savcom[0]), pscomp);
-       for (i=0; i<npr; i++) {
-               register struct savcom *sp = &savcom[i];
-               if (lflg)
-                       lpr(sp);
-               else if (vflg)
-                       vpr(sp);
-               else if (uflg)
-                       upr(sp);
-               else
-                       spr(sp);
-               if (sp->ap->a_flag & SWEXIT)
-                       printf(" <exiting>");
-               else if (sp->ap->a_stat == SZOMB)
-                       printf(" <defunct>");
-               else if (sp->ap->a_pid == 0)
-                       printf(" swapper");
-               else if (sp->ap->a_pid == 2)
-                       printf(" pagedaemon");
-               else if (sp->ap->a_pid == 3 && sp->ap->a_flag & SSYS)
-                       printf(" ip input");
-               else
-                       printf(" %.*s", twidth - cmdstart - 2, sp->ap->a_cmdp);
-               printf("\n");
+
+       if (!fmt)
+               parsefmt(DFMT);
+
+       if (!all && ttydev == NODEV && pid == -1)  /* XXX - should be cleaner */
+               uid = getuid();
+
+       /*
+        * scan requested variables, noting what structures are needed,
+        * and adjusting header widths as appropiate.
+        */
+       scanvars();
+#ifdef notdef
+       if (sortby == SORTCPU)
+               neednlist = 1;
+#endif
+       if (neednlist)
+               donlist();
+       /*
+        * get proc list
+        */
+       if (uid != -1) {
+               what = KINFO_PROC_UID;
+               flag = uid;
+       } else if (ttydev != NODEV) {
+               what = KINFO_PROC_TTY;
+               flag = ttydev;
+       } else if (pid != -1) {
+               what = KINFO_PROC_PID;
+               flag = pid;
+       } else
+               what = KINFO_PROC_ALL;
+       /*
+        * select procs
+        */
+       if ((nentries = kvm_getprocs(what, flag)) == -1) {
+               fprintf(stderr, "ps: %s\n", kvm_geterr());
+               exit(1);
+       }
+       kinfo = (struct kinfo *)malloc(nentries * sizeof (struct kinfo));
+       if (kinfo == NULL)
+               error("out of memory");
+       i = 0;
+       while ((p = kvm_nextproc()) != NULL) {
+               kinfo[i].ki_p = p;
+               kinfo[i].ki_e = kvm_geteproc(p);
+               if (needuser)
+                       saveuser(&kinfo[i]);
+               i++;
        }
        }
-       exit(npr == 0);
+       nentries = i;
+       /*
+        * print header
+        */
+       printheader();
+       if (nentries == 0)
+               exit(0);
+       /*
+        * sort proc list
+        */
+       qsort(kinfo, nentries, sizeof (struct kinfo), pscomp);
+       /*
+        * for each proc, call each variable output function.
+        */
+       for (i = 0; i < nentries; i++) {
+               if (xflg == 0 && (kinfo[i].ki_e->e_tdev == NODEV ||
+                   (kinfo[i].ki_p->p_flag & SCTTY ) == 0))
+                       continue;
+               for (v = vhead; v != NULL; v = v->next) {
+                       (*v->oproc)(&kinfo[i], v);
+                       if (v->next != NULL)
+                               putchar(' ');
+               }
+               putchar('\n');
+               if (prtheader && lineno++ == prtheader-4) {
+                       putchar('\n');
+                       printheader();
+                       lineno = 0;
+               }
+       }
+
+       exit(0);
 }
 
 }
 
-getw(loc)
-       unsigned long loc;
+#define FMTSEP " \t,\n"
+
+parsefmt(fmt)
+       char *fmt;
 {
 {
-       int word;
+       register char *f = fmt, *cp, *hp;
+       struct var *v;
+       char *strtok(), *index();
+       char newbuf[1024], *nb = newbuf; /* XXX */
+       char *lookupcombo();
+       struct var *lookupvar();
+       
+       /*
+        * strtok is not &^%^& re-entrant, so we have
+        * only one level of expansion, looking for combo
+        * variables once here, and expanding the string
+        * before really parsing it.  With strtok_r,
+        * you would move the expansion to before the
+        * lookupvar inside the 2nd while loop with a
+        * recursive call to parsefmt.
+        */
+       while ((cp = strtok(f, FMTSEP)) != NULL) {
+               if ((hp = lookupcombo(cp)) == NULL);
+                       hp = cp;
+               if (((nb + strlen(hp)) - newbuf) >= 1024)
+                       error("format too large");
+               strcpy(nb, hp);
+               while (*nb)
+                       nb++;
+               *nb++ = ' ';
+               *nb =  '\0';
+               f = NULL;
+       }
+       f = newbuf;
+       while ((cp = strtok(f, FMTSEP)) != NULL) {
+               if (hp = index(cp, '='))
+                       *hp++ = '\0';
+               v = lookupvar(cp);
+               if (v == NULL)
+                       error("unknown variable in format: %s", cp);
+               if (v->next != NULL || vtail == v)
+                       error("can't specify a variable twice: %s", cp);
+               if (hp)
+                       v->header = hp;
+               if (vhead == NULL)
+                       vhead = vtail = v;
+               else {
+                       vtail->next = v;
+                       vtail = v;
+               }
+               f = NULL;       /* for strtok */
+       }
 
 
-       klseek(kmem, (long)loc, 0);
-       if (read(kmem, (char *)&word, sizeof (word)) != sizeof (word))
-               printf("error reading kmem at %x\n", loc);
-       return (word);
 }
 
 }
 
-klseek(fd, loc, off)
-       int fd;
-       long loc;
-       int off;
+scanvars()
+{
+       register i;
+       register struct var *v;
+
+       for (v = vhead; v != NULL; v = v->next) {
+               i = strlen(v->header);
+               if (v->width < i)
+                       v->width = i;
+               totwidth += v->width + 1;       /* +1 for space */
+               if (v->flag & USER)
+                       needuser = 1;
+               if (v->flag & COMM)
+                       needcomm = 1;
+               if (v->flag & NLIST)
+                       neednlist = 1;
+       }
+       totwidth--;
+}
+printheader()
 {
 {
-       if (kflg) {
-               if ((loc = vtophys(loc)) == -1)
-                       return;
+       register struct var *v;
+
+       for (v = vhead; v != NULL; v = v->next) {
+               if (v->flag & LJUST) {
+                       if (v->next == NULL)    /* last one */
+                               printf("%s", v->header);
+                       else
+                               printf("%-*s",v->width, v->header);
+               } else
+                       printf("%*s",v->width, v->header);
+               if (v->next != NULL)
+                       putchar(' ');
        }
        }
-       (void) lseek(fd, (long)loc, off);
+       putchar('\n');
 }
 
 }
 
-writepsdb(unixname)
-       char *unixname;
+command(k, v) 
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       int nllen;
-       register FILE *fp;
 
 
-       setuid(getuid());
-       if ((fp = fopen(psdb, "w")) == NULL) {
-               perror(psdb);
-               exit(1);
+       if (v->next == NULL) {          
+               /* last field */
+               if (termwidth == UNLIMITED)
+                       printf("%s", k->ki_args);
+               else {
+                       register left = termwidth - (totwidth - v->width);
+                       register char *cp = k->ki_args;
+
+                       if (left < 1)   /* already wrapped, just use std width */
+                               left = v->width;
+                       while (left-- && *cp)
+                               putchar(*cp++);
+               }
        } else
        } else
-               fchmod(fileno(fp), 0644);
-       nllen = sizeof nl / sizeof (struct nlist);
-       fwrite((char *) &nllen, sizeof nllen, 1, fp);
-       fwrite((char *) nl, sizeof (struct nlist), nllen, fp);
-       fwrite((char *) &nttys, sizeof nttys, 1, fp);
-       fwrite((char *) allttys, sizeof (struct ttys), nttys, fp);
-       fwrite(unixname, strlen(unixname) + 1, 1, fp);
-       fclose(fp);
+               printf("%-*.*s", v->width, v->width, k->ki_args);
+               
 }
 
 }
 
-readpsdb(unixname)
-       char *unixname;
+ucomm(k, v) 
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       int nllen;
-       register i;
-       register FILE *fp;
-       char unamebuf[BUFSIZ];
-       char *p = unamebuf;
-       extern int errno;
-
-       if ((fp = fopen(psdb, "r")) == NULL) {
-               if (errno == ENOENT)
-                       return (0);
-               perror(psdb);
-               exit(1);
-       }
 
 
-       fread((char *) &nllen, sizeof nllen, 1, fp);
-       fread((char *) nl, sizeof (struct nlist), nllen, fp);
-       fread((char *) &nttys, sizeof nttys, 1, fp);
-       fread((char *) allttys, sizeof (struct ttys), nttys, fp);
-       while ((*p = getc(fp)) != '\0')
-               p++;
-       return (strcmp(unixname, unamebuf) == 0);
+       printf("%-*s", v->width, k->ki_p->p_comm);
 }
 
 }
 
-openfiles(argc, argv)
-       char **argv;
+logname(k, v) 
+       struct kinfo *k;
+       struct var *v;
 {
 
 {
 
-       kmemf = "/dev/kmem";
-       if (kflg)
-               kmemf = argc > 2 ? argv[2] : "/vmcore";
-       kmem = open(kmemf, 0);
-       if (kmem < 0) {
-               perror(kmemf);
-               exit(1);
-       }
-       if (kflg)  {
-               mem = kmem;
-               memf = kmemf;
-       } else {
-               memf = "/dev/mem";
-               mem = open(memf, 0);
-               if (mem < 0) {
-                       perror(memf);
-                       exit(1);
-               }
-       }
-       if (kflg == 0 || argc > 3) {
-               swapf = argc>3 ? argv[3]: "/dev/drum";
-               swap = open(swapf, 0);
-               if (swap < 0) {
-                       perror(swapf);
-                       exit(1);
-               }
-       }
+       printf("%-*s", v->width, k->ki_p->p_logname);
 }
 
 }
 
-getkvars(argc, argv)
-       char **argv;
+state(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
+       char buf[16];
+       register char *cp = buf;
+       register struct proc *p = k->ki_p;
+       register flag = p->p_flag;
 
 
-       nlistf = argc > 1 ? argv[1] : "/vmunix";
-       if (Uflg) {
-               nlist(nlistf, nl);
-               getdev();
-               writepsdb(nlistf);
-               exit (0);
-       } else if (!readpsdb(nlistf)) {
-               if (!kflg)
-                       nl[X_SYSMAP].n_name = "";
-               nlist(nlistf, nl);
-               getdev();
-       }
+       switch (p->p_stat) {
 
 
-       if (nl[0].n_type == 0) {
-               fprintf(stderr, "%s: No namelist\n", nlistf);
-               exit(1);
-       }
-       if (kflg) {
-               /* We must do the sys map first because klseek uses it */
-               long    addr;
-
-               Syssize = nl[X_SYSSIZE].n_value;
-               Sysmap = (struct pte *)
-                       calloc((unsigned) Syssize, sizeof (struct pte));
-               if (Sysmap == NULL) {
-                       fprintf(stderr, "Out of space for Sysmap\n");
-                       exit(1);
-               }
-               addr = (long) nl[X_SYSMAP].n_value;
-               addr &= ~0x80000000;
-               (void) lseek(kmem, addr, 0);
-               read(kmem, (char *) Sysmap, Syssize * sizeof (struct pte));
-       }
-       usrpt = (struct pte *)nl[X_USRPT].n_value;
-       Usrptmap = (struct pte *)nl[X_USRPTMAP].n_value;
-       klseek(kmem, (long)nl[X_NSWAP].n_value, 0);
-       if (read(kmem, (char *)&nswap, sizeof (nswap)) != sizeof (nswap)) {
-               cantread("nswap", kmemf);
-               exit(1);
-       }
-       klseek(kmem, (long)nl[X_MAXSLP].n_value, 0);
-       if (read(kmem, (char *)&maxslp, sizeof (maxslp)) != sizeof (maxslp)) {
-               cantread("maxslp", kmemf);
-               exit(1);
-       }
-       klseek(kmem, (long)nl[X_CCPU].n_value, 0);
-       if (read(kmem, (char *)&ccpu, sizeof (ccpu)) != sizeof (ccpu)) {
-               cantread("ccpu", kmemf);
-               exit(1);
-       }
-       klseek(kmem, (long)nl[X_ECMX].n_value, 0);
-       if (read(kmem, (char *)&ecmx, sizeof (ecmx)) != sizeof (ecmx)) {
-               cantread("ecmx", kmemf);
-               exit(1);
-       }
-       if (uflg || vflg) {
-               ntext = getw(nl[X_NTEXT].n_value);
-               text = (struct text *)
-                       calloc((unsigned) ntext, sizeof (struct text));
-               if (text == 0) {
-                       fprintf(stderr, "no room for text table\n");
-                       exit(1);
-               }
-               atext = (struct text *)getw(nl[X_TEXT].n_value);
-               klseek(kmem, (long)atext, 0);
-               if (read(kmem, (char *)text, ntext * sizeof (struct text))
-                   != ntext * sizeof (struct text)) {
-                       cantread("text table", kmemf);
-                       exit(1);
-               }
+       case SSTOP:
+               *cp = 'T';
+               break;
+
+       case SSLEEP:
+               if (flag & SSINTR)      /* interuptable (long) */
+                       *cp = p->p_slptime >= MAXSLP ? 'I' : 'S';
+               else 
+                       *cp = (flag & SPAGE) ? 'P' : 'D';
+               break;
+
+       case SRUN:
+       case SIDL:
+               *cp = 'R';
+               break;
+
+       case SZOMB:
+               *cp = 'Z';
+               break;
+
+       default:
+               *cp = '?';
        }
        }
-       dmmin = getw(nl[X_DMMIN].n_value);
-       dmmax = getw(nl[X_DMMAX].n_value);
+       cp++;
+       if (flag & SLOAD) {
+               if (p->p_rssize > p->p_maxrss)
+                       *cp++ = '>';
+       } else
+               *cp++ = 'W';
+       if (p->p_nice < NZERO)
+               *cp++ = '<';
+       else if (p->p_nice > NZERO)
+               *cp++ = 'N';
+       if (flag & SUANOM)
+               *cp++ = 'A';
+       else if (flag & SSEQL)
+               *cp++ = 'S';
+       if (flag & STRC)
+               *cp++ = 'X';
+       if (flag & SWEXIT)
+               *cp++ = 'E';
+       if (flag & SVFORK)
+               *cp++ = 'V';
+       if (flag & (SSYS|SLOCK|SULOCK|SKEEP|SPHYSIO))
+               *cp++ = 'L';
+       if (k->ki_e->e_flag & EPROC_SLEADER)
+               *cp++ = 's';
+       if ((flag & SCTTY) && k->ki_e->e_pgid == k->ki_e->e_tpgid)
+               *cp++ = '+';
+       *cp = '\0';
+       printf("%-*s", v->width, buf);
 }
 
 }
 
-printhdr()
+pri(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       char *hdr;
 
 
-       if (sflg+lflg+vflg+uflg > 1) {
-               fprintf(stderr, "ps: specify only one of s,l,v and u\n");
-               exit(1);
-       }
-       hdr = lflg ? lhdr : 
-                       (vflg ? vhdr : 
-                               (uflg ? uhdr : shdr));
-       if (lflg+vflg+uflg+sflg == 0)
-               hdr += strlen("SSIZ ");
-       cmdstart = strlen(hdr);
-       printf("%s COMMAND\n", hdr);
-       (void) fflush(stdout);
+       printf("%*d", v->width, k->ki_p->p_pri - PZERO);
 }
 
 }
 
-cantread(what, fromwhat)
-       char *what, *fromwhat;
+uname(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 
 {
 
-       fprintf(stderr, "ps: error reading %s from %s\n", what, fromwhat);
+       printf("%-*s", v->width, user_from_uid(k->ki_p->p_uid, 0));
 }
 
 }
 
-struct direct *dbuf;
-int    dialbase;
+runame(k, v)
+       struct kinfo *k;
+       struct var *v;
+{
+
+       printf("%-*s", v->width, user_from_uid(k->ki_p->p_ruid, 0));
+}
 
 
-getdev()
+tdev(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register DIR *df;
+       dev_t dev = k->ki_e->e_tdev;
 
 
-       if (chdir("/dev") < 0) {
-               perror("/dev");
-               exit(1);
-       }
-       dialbase = -1;
-       if ((df = opendir(".")) == NULL) {
-               fprintf(stderr, "Can't open . in /dev\n");
-               exit(1);
+       if (dev == NODEV)
+               printf("%*s", v->width, "??");
+       else {
+               char buff[16];
+
+               sprintf(buff, "%d/%d", major(dev), minor(dev));
+               printf("%*s", v->width, buff);
        }
        }
-       while ((dbuf = readdir(df)) != NULL) 
-               maybetty();
-       closedir(df);
 }
 
 }
 
-/*
- * Attempt to avoid stats by guessing minor device
- * numbers from tty names.  Console is known,
- * know that r(hp|up|mt) are unlikely as are different mem's,
- * floppy, null, tty, etc.
- */
-maybetty()
+extern char *devname();
+
+tname(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register char *cp = dbuf->d_name;
-       register struct ttys *dp;
-       int x;
-       struct stat stb;
+       dev_t dev = k->ki_e->e_tdev;
+       char *tname;
 
 
-       switch (cp[0]) {
+       if (dev == NODEV || (tname = devname(dev, S_IFCHR)) == NULL)
+               printf("%-*s", v->width, "??");
+       else {
+               if (strncmp(tname, "tty", 3) == 0)
+                       tname += 3;
+               printf("%*.*s%c", v->width-1, v->width-1, tname,
+                       k->ki_e->e_flag & EPROC_CTTY ? ' ' : '-');
+       }
+}
 
 
-       case 'c':
-               if (!strcmp(cp, "console")) {
-                       x = 0;
-                       goto donecand;
-               }
-               /* cu[la]? are possible!?! don't rule them out */
-               break;
+longtname(k, v)
+       struct kinfo *k;
+       struct var *v;
+{
+       dev_t dev = k->ki_e->e_tdev;
+       char *tname;
 
 
-       case 'd':
-               if (!strcmp(cp, "drum"))
-                       return;
-               break;
+       if (dev == NODEV || (tname = devname(dev, S_IFCHR)) == NULL)
+               printf("%-*s", v->width, "??");
+       else
+               printf("%-*s", v->width, tname);
+}
 
 
-       case 'f':
-               if (!strcmp(cp, "floppy"))
-                       return;
-               break;
+#include <sys/time.h>
 
 
-       case 'k':
-               cp++;
-               if (*cp == 'U')
-                       cp++;
-               goto trymem;
-
-       case 'r':
-               cp++;
-               if (*cp == 'r' || *cp == 'u' || *cp == 'h')
-                       cp++;
-#define is(a,b) cp[0] == 'a' && cp[1] == 'b'
-               if (is(r,p) || is(u,p) || is(r,k) || is(r,m) || is(m,t)) {
-                       cp += 2;
-                       if (isdigit(*cp) && cp[2] == 0)
-                               return;
-               }
-               break;
+started(k, v)
+       struct kinfo *k;
+       struct var *v;
+{
+       extern char *attime();
 
 
-       case 'm':
-trymem:
-               if (cp[0] == 'm' && cp[1] == 'e' && cp[2] == 'm' && cp[3] == 0)
-                       return;
-               if (cp[0] == 'm' && cp[1] == 't')
-                       return;
-               break;
+       printf("%-*s", v->width, k->ki_u ? 
+               attime(&k->ki_u->u_start.tv_sec) : "-");
+               
+}
 
 
-       case 'n':
-               if (!strcmp(cp, "null"))
-                       return;
-               break;
+lstarted(k, v)
+       struct kinfo *k;
+       struct var *v;
+{
+       extern char *ctime();
+       char *tp; 
 
 
-       case 'v':
-               if ((cp[1] == 'a' || cp[1] == 'p') && isdigit(cp[2]) &&
-                   cp[3] == 0)
-                       return;
-               break;
-       }
-       cp = dbuf->d_name + dbuf->d_namlen - 1;
-       x = 0;
-       if (cp[-1] == 'd') {
-               if (dialbase == -1) {
-                       if (stat("ttyd0", &stb) == 0)
-                               dialbase = stb.st_rdev & 017;
-                       else
-                               dialbase = -2;
-               }
-               if (dialbase == -2)
-                       x = 0;
-               else
-                       x = 11;
-       }
-       if (cp > dbuf->d_name && isdigit(cp[-1]) && isdigit(*cp))
-               x += 10 * (cp[-1] - ' ') + cp[0] - '0';
-       else if (*cp >= 'a' && *cp <= 'f')
-               x += 10 + *cp - 'a';
-       else if (isdigit(*cp))
-               x += *cp - '0';
+       if (k->ki_u)
+               (tp = ctime(&k->ki_u->u_start.tv_sec))[24] = '\0';
        else
        else
-               x = -1;
-donecand:
-       if (nttys >= MAXTTYS) {
-               fprintf(stderr, "ps: tty table overflow\n");
-               exit(1);
-       }
-       dp = &allttys[nttys++];
-       (void) strcpy(dp->name, dbuf->d_name);
-       if (Uflg) {
-               if (stat(dp->name, &stb) == 0 &&
-                  (stb.st_mode&S_IFMT)==S_IFCHR)
-                       dp->ttyd = x = stb.st_rdev;
-               else {
-                       nttys--;
-                       return;
-               }
-       } else
-               dp->ttyd = -1;
-       if (x == -1)
-               return;
-       x &= 017;
-       dp->cand = cand[x];
-       cand[x] = dp;
+               tp = "-";
+       printf("%-*s", v->width, tp);
 }
 
 }
 
-char *
-gettty()
+wchan(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register char *p;
-       register struct ttys *dp;
-       struct stat stb;
-       int x;
-
-       if (u.u_ttyp == 0)
-               return("?");
-       x = u.u_ttyd & 017;
-       for (dp = cand[x]; dp; dp = dp->cand) {
-               if (dp->ttyd == -1) {
-                       if (stat(dp->name, &stb) == 0 &&
-                          (stb.st_mode&S_IFMT)==S_IFCHR)
-                               dp->ttyd = stb.st_rdev;
-                       else
-                               dp->ttyd = -2;
-               }
-               if (dp->ttyd == u.u_ttyd)
-                       goto found;
-       }
-       /* ick */
-       for (dp = allttys; dp < &allttys[nttys]; dp++) {
-               if (dp->ttyd == -1) {
-                       if (stat(dp->name, &stb) == 0 &&
-                          (stb.st_mode&S_IFMT)==S_IFCHR)
-                               dp->ttyd = stb.st_rdev;
-                       else
-                               dp->ttyd = -2;
-               }
-               if (dp->ttyd == u.u_ttyd)
-                       goto found;
-       }
-       return ("?");
-found:
-       p = dp->name;
-       if (p[0]=='t' && p[1]=='t' && p[2]=='y')
-               p += 3;
-       return (p);
+
+       if (k->ki_p->p_wchan) {
+               if (k->ki_p->p_pri > PZERO)
+                       printf("%-*.*s", v->width, v->width, k->ki_e->e_wmesg);
+               else
+                       printf("%*x", v->width, 
+                               (int)k->ki_p->p_wchan &~ KERNBASE);
+       } else
+               printf("%-*s", v->width, "-");
 }
 
 }
 
-save()
+#define pgtok(a)        (((a)*NBPG)/1024)
+#define pgtok(a)        (((a)*NBPG)/1024)
+
+vsize(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register struct savcom *sp;
-       register struct asav *ap;
-       register char *cp;
-       register struct text *xp;
-       char *ttyp, *cmdp;
-
-       if (mproc->p_stat != SZOMB && getu() == 0)
-               return;
-       ttyp = gettty();
-       if (xflg == 0 && ttyp[0] == '?' || tptr && strncmp(tptr, ttyp, 2))
-               return;
-       sp = &savcom[npr];
-       cmdp = getcmd();
-       if (cmdp == 0)
-               return;
-       sp->ap = ap = (struct asav *)calloc(1, sizeof (struct asav));
-       sp->ap->a_cmdp = cmdp;
-#define e(a,b) ap->a = mproc->b
-       e(a_flag, p_flag); e(a_stat, p_stat); e(a_nice, p_nice);
-       e(a_uid, p_uid); e(a_pid, p_pid); e(a_pri, p_pri);
-       e(a_slptime, p_slptime); e(a_time, p_time);
-       ap->a_tty[0] = ttyp[0];
-       ap->a_tty[1] = ttyp[1] ? ttyp[1] : ' ';
-       if (ap->a_stat == SZOMB) {
-               ap->a_cpu = 0;
-       } else {
-               ap->a_size = mproc->p_dsize + mproc->p_ssize;
-               e(a_rss, p_rssize); 
-               ap->a_ttyd = u.u_ttyd;
-               ap->a_cpu = u.u_ru.ru_utime.tv_sec + u.u_ru.ru_stime.tv_sec;
-               if (sumcpu)
-                       ap->a_cpu += u.u_cru.ru_utime.tv_sec + u.u_cru.ru_stime.tv_sec;
-               if (mproc->p_textp && text) {
-                       xp = &text[mproc->p_textp - atext];
-                       ap->a_tsiz = xp->x_size;
-                       ap->a_txtrss = xp->x_rssize;
-                       ap->a_xccount = xp->x_ccount;
-               }
-       }
-#undef e
-       ap->a_maxrss = mproc->p_maxrss;
-       if (lflg) {
-               register struct lsav *lp;
-
-               sp->s_un.lp = lp = (struct lsav *)
-                       calloc(1, sizeof (struct lsav));
-#define e(a,b) lp->a = mproc->b
-               e(l_ppid, p_ppid); e(l_cpu, p_cpu);
-               if (ap->a_stat != SZOMB)
-                       e(l_wchan, p_wchan);
-#undef e
-               lp->l_addr = pcbpf;
-       } else if (vflg) {
-               register struct vsav *vp;
-
-               sp->s_un.vp = vp = (struct vsav *)
-                       calloc(1, sizeof (struct vsav));
-#define e(a,b) vp->a = mproc->b
-               if (ap->a_stat != SZOMB) {
-                       e(v_swrss, p_swrss);
-                       vp->v_majflt = u.u_ru.ru_majflt;
-                       if (mproc->p_textp)
-                               vp->v_txtswrss = xp->x_swrss;
-               }
-               vp->v_pctcpu = pcpu();
-#undef e
-       } else if (uflg)
-               sp->s_un.u_pctcpu = pcpu();
-       else if (sflg) {
-               if (ap->a_stat != SZOMB) {
-                       for (cp = (char *)u.u_stack;
-                           cp < &user.upages[UPAGES][0]; )
-                               if (*cp++)
-                                       break;
-                       sp->s_un.s_ssiz = (&user.upages[UPAGES][0] - cp);
-               }
-       }
 
 
-       npr++;
+       printf("%*d", v->width, 
+               pgtok(k->ki_p->p_dsize + k->ki_p->p_ssize + k->ki_e->e_xsize));
 }
 
 }
 
-double
-pmem(ap)
-       register struct asav *ap;
+rssize(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       double fracmem;
-       int szptudot;
 
 
-       if ((ap->a_flag&SLOAD) == 0)
-               fracmem = 0.0;
-       else {
-               szptudot = UPAGES + clrnd(ctopt(ap->a_size+ap->a_tsiz));
-               fracmem = ((float)ap->a_rss+szptudot)/CLSIZE/ecmx;
-               if (ap->a_xccount)
-                       fracmem += ((float)ap->a_txtrss)/CLSIZE/
-                           ap->a_xccount/ecmx;
-       }
-       return (100.0 * fracmem);
+       printf("%*d", v->width, 
+               pgtok(k->ki_p->p_rssize + (k->ki_e->e_xccount ? 
+                     (k->ki_e->e_xrssize / k->ki_e->e_xccount) : 0)));
 }
 
 }
 
-double
-pcpu()
+p_rssize(k, v)         /* doesn't account for text */
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       time_t time;
 
 
-       time = mproc->p_time;
-       if (time == 0 || (mproc->p_flag&SLOAD) == 0)
-               return (0.0);
-       if (rawcpu)
-               return (100.0 * mproc->p_pctcpu);
-       return (100.0 * mproc->p_pctcpu / (1.0 - exp(time * log(ccpu))));
+       printf("%*d", v->width, pgtok(k->ki_p->p_rssize));
 }
 
 }
 
-getu()
+cputime(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       struct pte *pteaddr, apte;
-       struct pte arguutl[UPAGES+CLSIZE];
-       register int i;
-       int ncl, size;
-
-       size = sflg ? ctob(UPAGES) : sizeof (struct user);
-       if ((mproc->p_flag & SLOAD) == 0) {
-               if (swap < 0)
-                       return (0);
-               (void) lseek(swap, (long)dtob(mproc->p_swaddr), 0);
-               if (read(swap, (char *)&user.user, size) != size) {
-                       fprintf(stderr, "ps: cant read u for pid %d from %s\n",
-                           mproc->p_pid, swapf);
-                       return (0);
+       long secs;
+       long psecs;     /* "parts" of a second. first micro, then centi */
+       char obuff[128];
+
+       if (k->ki_p->p_stat == SZOMB || k->ki_u == NULL) {
+               secs = 0;
+               psecs = 0;
+       } else {
+               secs = k->ki_p->p_utime.tv_sec + 
+                       k->ki_p->p_stime.tv_sec;
+               psecs = k->ki_p->p_utime.tv_usec + 
+                       k->ki_p->p_stime.tv_usec;
+               if (sumrusage) {
+                       secs += k->ki_u->u_cru.ru_utime.tv_sec + 
+                               k->ki_u->u_cru.ru_stime.tv_sec;
+                       psecs += k->ki_u->u_cru.ru_utime.tv_usec + 
+                               k->ki_u->u_cru.ru_stime.tv_usec;
                }
                }
-               pcbpf = 0;
-               argaddr = 0;
-               return (1);
-       }
-       pteaddr = &Usrptmap[btokmx(mproc->p_p0br) + mproc->p_szpt - 1];
-       klseek(kmem, (long)pteaddr, 0);
-       if (read(kmem, (char *)&apte, sizeof(apte)) != sizeof(apte)) {
-               printf("ps: cant read indir pte to get u for pid %d from %s\n",
-                   mproc->p_pid, kmemf);
-               return (0);
-       }
-       lseek(mem,
-           (long)ctob(apte.pg_pfnum+1) - (UPAGES+CLSIZE) * sizeof (struct pte),
-               0);
-       if (read(mem, (char *)arguutl, sizeof(arguutl)) != sizeof(arguutl)) {
-               printf("ps: cant read page table for u of pid %d from %s\n",
-                   mproc->p_pid, memf);
-               return (0);
-       }
-       if (arguutl[0].pg_fod == 0 && arguutl[0].pg_pfnum)
-               argaddr = ctob(arguutl[0].pg_pfnum);
-       else
-               argaddr = 0;
-       pcbpf = arguutl[CLSIZE].pg_pfnum;
-       ncl = (size + NBPG*CLSIZE - 1) / (NBPG*CLSIZE);
-       while (--ncl >= 0) {
-               i = ncl * CLSIZE;
-               lseek(mem, (long)ctob(arguutl[CLSIZE+i].pg_pfnum), 0);
-               if (read(mem, user.upages[i], CLSIZE*NBPG) != CLSIZE*NBPG) {
-                       printf("ps: cant read page %d of u of pid %d from %s\n",
-                           arguutl[CLSIZE+i].pg_pfnum, mproc->p_pid, memf);
-                       return(0);
+               /*
+                * round and scale to 100's
+                */
+               psecs = (psecs + 5000) / 10000;
+               if (psecs >= 100) {
+                       psecs -= 100;
+                       secs++;
                }
        }
                }
        }
-       return (1);
+       sprintf(obuff, "%3ld:%02ld.%02ld", secs/60, secs%60, psecs);
+       printf("%*s", v->width, obuff);
 }
 
 }
 
-char *
-getcmd()
+double
+getpcpu(k)
+       struct kinfo *k;
 {
 {
-       char cmdbuf[CLSIZE*NBPG];
-       union {
-               char    argc[CLSIZE*NBPG];
-               int     argi[CLSIZE*NBPG/sizeof (int)];
-       } argspac;
-       register char *cp;
-       register int *ip;
-       char c;
-       int nbad;
-       struct dblock db;
-       char *file;
-
-       if (mproc->p_stat == SZOMB || mproc->p_flag&(SSYS|SWEXIT))
-               return ("");
-       if (cflg) {
-               (void) strncpy(cmdbuf, u.u_comm, sizeof (u.u_comm));
-               return (savestr(cmdbuf));
-       }
-       if ((mproc->p_flag & SLOAD) == 0 || argaddr == 0) {
-               if (swap < 0)
-                       goto retucomm;
-               vstodb(0, CLSIZE, &u.u_smap, &db, 1);
-               (void) lseek(swap, (long)dtob(db.db_base), 0);
-               if (read(swap, (char *)&argspac, sizeof(argspac))
-                   != sizeof(argspac))
-                       goto bad;
-               file = swapf;
-       } else {
-               lseek(mem, (long)argaddr, 0);
-               if (read(mem, (char *)&argspac, sizeof (argspac))
-                   != sizeof (argspac))
-                       goto bad;
-               file = memf;
-       }
-       ip = &argspac.argi[CLSIZE*NBPG/sizeof (int)];
-       ip -= 2;                /* last arg word and .long 0 */
-       while (*--ip)
-               if (ip == argspac.argi)
-                       goto retucomm;
-       *(char *)ip = ' ';
-       ip++;
-       nbad = 0;
-       for (cp = (char *)ip; cp < &argspac.argc[CLSIZE*NBPG]; cp++) {
-               c = *cp & 0177;
-               if (c == 0)
-                       *cp = ' ';
-               else if (c < ' ' || c > 0176) {
-                       if (++nbad >= 5*(eflg+1)) {
-                               *cp++ = ' ';
-                               break;
-                       }
-                       *cp = '?';
-               } else if (eflg == 0 && c == '=') {
-                       while (*--cp != ' ')
-                               if (cp <= (char *)ip)
-                                       break;
-                       break;
-               }
-       }
-       *cp = 0;
-       while (*--cp == ' ')
-               *cp = 0;
-       cp = (char *)ip;
-       (void) strncpy(cmdbuf, cp, &argspac.argc[CLSIZE*NBPG] - cp);
-       if (cp[0] == '-' || cp[0] == '?' || cp[0] <= ' ') {
-               (void) strcat(cmdbuf, " (");
-               (void) strncat(cmdbuf, u.u_comm, sizeof(u.u_comm));
-               (void) strcat(cmdbuf, ")");
-       }
-       return (savestr(cmdbuf));
-
-bad:
-       fprintf(stderr, "ps: error locating command name for pid %d from %s\n",
-           mproc->p_pid, file);
-retucomm:
-       (void) strcpy(cmdbuf, " (");
-       (void) strncat(cmdbuf, u.u_comm, sizeof (u.u_comm));
-       (void) strcat(cmdbuf, ")");
-       return (savestr(cmdbuf));
+       /*
+        * note: this routine requires ccpu and fscale
+        * be initialized.  If you call this routine from
+        * somewhere new, insure that the "neednlist" flag
+        * gets set.
+        */
+       struct proc *p = k->ki_p;
+#define        fxtofl(fixpt)   ((double)(fixpt) / fscale)
+
+       if (p->p_time == 0 || (p->p_flag & SLOAD) == 0) /* XXX - I don't like this */
+               return (0.0);
+       if (rawcpu)
+               return (100.0 * fxtofl(p->p_pctcpu));
+       return (100.0 * fxtofl(p->p_pctcpu) /
+               (1.0 - exp(p->p_time * log(fxtofl(ccpu)))));
 }
 
 }
 
-char   *lhdr =
-"      F UID   PID  PPID CP PRI NI ADDR  SZ  RSS WCHAN  STAT TT  TIME";
-lpr(sp)
-       struct savcom *sp;
+pcpu(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register struct asav *ap = sp->ap;
-       register struct lsav *lp = sp->s_un.lp;
-
-       printf("%7x%4d%6u%6u%3d%4d%3d%5x%4d%5d",
-           ap->a_flag, ap->a_uid,
-           ap->a_pid, lp->l_ppid, lp->l_cpu&0377, ap->a_pri-PZERO,
-           ap->a_nice-NZERO, lp->l_addr, pgtok(ap->a_size), pgtok(ap->a_rss));
-       printf(lp->l_wchan ? " %6x" : "       ", (int)lp->l_wchan&0xffffff);
-       printf(" %4.4s ", state(ap));
-       ptty(ap->a_tty);
-       ptime(ap);
+
+       printf("%*.1f", v->width, getpcpu(k));
 }
 
 }
 
-ptty(tp)
-       char *tp;
+double
+getpmem(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
+       struct proc *p = k->ki_p;
+       struct eproc *e = k->ki_e;
+       double fracmem;
+       int szptudot;
+       /*
+        * note: this routine requires that ecmx
+        * be initialized.  If you call this routine from
+        * somewhere new, insure that the "neednlist" flag
+        * gets set.
+        */
 
 
-       printf("%-2.2s", tp);
+       if (p->p_flag & SLOAD == 0)
+               return (0.0);
+       szptudot = UPAGES + clrnd(ctopt(p->p_dsize + p->p_ssize + e->e_xsize));
+       fracmem = ((float)p->p_rssize + szptudot)/CLSIZE/ecmx;
+       if (p->p_textp && e->e_xccount)
+               fracmem += ((float)e->e_xrssize)/CLSIZE/e->e_xccount/ecmx;
+       return (100.0 * fracmem);
 }
 
 }
 
-ptime(ap)
-       struct asav *ap;
+pmem(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 
 {
 
-       printf("%3ld:%02ld", ap->a_cpu / 60, ap->a_cpu % 60);
+       printf("%*.1f", v->width, getpmem(k));
 }
 
 }
 
-char   *uhdr =
-"USER       PID %CPU %MEM   SZ  RSS TT STAT  TIME";
-upr(sp)
-       struct savcom *sp;
+pagein(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register struct asav *ap = sp->ap;
-       int vmsize, rmsize;
-
-       vmsize = pgtok((ap->a_size + ap->a_tsiz));
-       rmsize = pgtok(ap->a_rss);
-       if (ap->a_xccount)
-               rmsize += pgtok(ap->a_txtrss/ap->a_xccount);
-       printf("%-8.8s %5d%5.1f%5.1f%5d%5d",
-           getname(ap->a_uid), ap->a_pid, sp->s_un.u_pctcpu, pmem(ap),
-           vmsize, rmsize);
-       putchar(' ');
-       ptty(ap->a_tty);
-       printf(" %4.4s", state(ap));
-       ptime(ap);
+
+       printf("%*d", v->width, k->ki_u ? k->ki_u->u_ru.ru_majflt : 0);
 }
 
 }
 
-char *vhdr =
-" SIZE  PID TT STAT  TIME SL RE PAGEIN SIZE  RSS  LIM TSIZ TRS %CPU %MEM"+5;
-vpr(sp)
-       struct savcom *sp;
+maxrss(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register struct vsav *vp = sp->s_un.vp;
-       register struct asav *ap = sp->ap;
-
-       printf("%5u ", ap->a_pid);
-       ptty(ap->a_tty);
-       printf(" %4.4s", state(ap));
-       ptime(ap);
-       printf("%3d%3d%7d%5d%5d",
-          ap->a_slptime > 99 ? 99 : ap-> a_slptime,
-          ap->a_time > 99 ? 99 : ap->a_time, vp->v_majflt,
-          pgtok(ap->a_size), pgtok(ap->a_rss));
-       if (ap->a_maxrss == (RLIM_INFINITY/NBPG))
-               printf("   xx");
+
+       if (k->ki_p->p_maxrss != (RLIM_INFINITY/NBPG))
+               printf("%*d", v->width, pgtok(k->ki_p->p_maxrss));
        else
        else
-               printf("%5d", pgtok(ap->a_maxrss));
-       printf("%5d%4d%5.1f%5.1f",
-          pgtok(ap->a_tsiz), pgtok(ap->a_txtrss), vp->v_pctcpu, pmem(ap));
+               printf("%*s", v->width, "-");
 }
 
 }
 
-char   *shdr =
-"SSIZ   PID TT STAT  TIME";
-spr(sp)
-       struct savcom *sp;
+tsize(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register struct asav *ap = sp->ap;
-
-       if (sflg)
-               printf("%4d ", sp->s_un.s_ssiz);
-       printf("%5u", ap->a_pid);
-       putchar(' ');
-       ptty(ap->a_tty);
-       printf(" %4.4s", state(ap));
-       ptime(ap);
+       
+       printf("%*d", v->width, pgtok(k->ki_e->e_xsize));
 }
 
 }
 
-char *
-state(ap)
-       register struct asav *ap;
+trss(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       char stat, load, nice, anom;
-       static char res[5];
-
-       switch (ap->a_stat) {
 
 
-       case SSTOP:
-               stat = 'T';
-               break;
-
-       case SSLEEP:
-               if (ap->a_pri >= PZERO)
-                       if (ap->a_slptime >= MAXSLP)
-                               stat = 'I';
-                       else
-                               stat = 'S';
-               else if (ap->a_flag & SPAGE)
-                       stat = 'P';
-               else
-                       stat = 'D';
-               break;
+       printf("%*d", v->width, pgtok(k->ki_e->e_xrssize));
+}
 
 
-       case SWAIT:
-       case SRUN:
-       case SIDL:
-               stat = 'R';
-               break;
+/*
+ * Generic output routines.  Print fields from various prototype
+ * structures.
+ */
+pvar(k, v) 
+       struct kinfo *k;
+       struct var *v;
+{
+       printval((char *)((char *)k->ki_p + v->off), v);
+}
 
 
-       case SZOMB:
-               stat = 'Z';
-               break;
+evar(k, v) 
+       struct kinfo *k;
+       struct var *v;
+{
+       printval((char *)((char *)k->ki_e + v->off), v);
+}
 
 
-       default:
-               stat = '?';
-       }
-       load = ap->a_flag & SLOAD ? (ap->a_rss>ap->a_maxrss ? '>' : ' ') : 'W';
-       if (ap->a_nice < NZERO)
-               nice = '<';
-       else if (ap->a_nice > NZERO)
-               nice = 'N';
+uvar(k, v) 
+       struct kinfo *k;
+       struct var *v;
+{
+       if (k->ki_u)
+               printval((char *)((char *)k->ki_u + v->off), v);
        else
        else
-               nice = ' ';
-       anom = (ap->a_flag&SUANOM) ? 'A' : ((ap->a_flag&SSEQL) ? 'S' : ' ');
-       res[0] = stat; res[1] = load; res[2] = nice; res[3] = anom;
-       return (res);
+               printf("%*s", v->width, "-");
 }
 
 }
 
-/*
- * Given a base/size pair in virtual swap area,
- * return a physical base/size pair which is the
- * (largest) initial, physically contiguous block.
- */
-vstodb(vsbase, vssize, dmp, dbp, rev)
-       register int vsbase;
-       int vssize;
-       struct dmap *dmp;
-       register struct dblock *dbp;
+rvar(k, v)
+       struct kinfo *k;
+       struct var *v;
 {
 {
-       register int blk = dmmin;
-       register swblk_t *ip = dmp->dm_map;
-
-       vsbase = ctod(vsbase);
-       vssize = ctod(vssize);
-       if (vsbase < 0 || vsbase + vssize > dmp->dm_size)
-               panic("vstodb");
-       while (vsbase >= blk) {
-               vsbase -= blk;
-               if (blk < dmmax)
-                       blk *= 2;
-               ip++;
-       }
-       if (*ip <= 0 || *ip + blk > nswap)
-               panic("vstodb *ip");
-       dbp->db_size = min(vssize, blk - vsbase);
-       dbp->db_base = *ip + (rev ? blk - (vsbase + dbp->db_size) : vsbase);
+       
+       if (k->ki_u)
+               printval((char *)((char *)(&k->ki_u->u_ru) + v->off), v);
+       else
+               printf("%*s", v->width, "-");
 }
 
 }
 
-/*ARGSUSED*/
-panic(cp)
+char *
+lookupcombo(cp)
        char *cp;
 {
        char *cp;
 {
+       register struct combovar *cv = &combovar[0];
 
 
-#ifdef DEBUG
-       printf("%s\n", cp);
-#endif
+       for (; cv->name; cv++)
+               if (strcmp(cp, cv->name) == 0)
+                       return (cv->replace);
+       return (NULL);
 }
 
 }
 
-min(a, b)
+struct var *
+lookupvar(cp)
+       char *cp;
 {
 {
+       register int i, j;
 
 
-       return (a < b ? a : b);
+       for (i=0; var[i].name[0] != NULL; i++)
+               for (j=0; var[i].name[j] != NULL; j++)
+                       if (strcmp(cp, var[i].name[j]) == 0)
+                               return (&var[i]);
+       return (NULL);
 }
 
 }
 
-pscomp(s1, s2)
-       struct savcom *s1, *s2;
+printval(bp, v)
+       char *bp;
+       struct var *v;
 {
 {
-       register int i;
+       static char ofmt[32] = "%";
+       register char *cp = ofmt+1, *fcp = v->fmt;
+
+       if (v->flag & LJUST)
+               *cp++ = '-';
+       *cp++ = '*';
+       while (*cp++ = *fcp++)
+               ;
+
+       switch (v->type) {
+       case CHAR:
+               printf(ofmt, v->width, *(char *)bp);
+               break;
 
 
-       if (uflg)
-               return (s2->s_un.u_pctcpu > s1->s_un.u_pctcpu ? 1 : -1);
-       if (vflg)
-               return (vsize(s2) - vsize(s1));
-       i = s1->ap->a_ttyd - s2->ap->a_ttyd;
-       if (i == 0)
-               i = s1->ap->a_pid - s2->ap->a_pid;
-       return (i);
-}
+       case UCHAR:
+               printf(ofmt, v->width, *(u_char *)bp);
+               break;
 
 
-vsize(sp)
-       struct savcom *sp;
-{
-       register struct asav *ap = sp->ap;
-       register struct vsav *vp = sp->s_un.vp;
-       
-       if (ap->a_flag & SLOAD)
-               return (ap->a_rss +
-                   ap->a_txtrss / (ap->a_xccount ? ap->a_xccount : 1));
-       return (vp->v_swrss + (ap->a_xccount ? 0 : vp->v_txtswrss));
-}
+       case SHORT:
+               printf(ofmt, v->width, *(short *)bp);
+               break;
 
 
-#define        NMAX    8       /* sizeof loginname (should be sizeof (utmp.ut_name)) */
-#define NUID   2048    /* must not be a multiple of 5 */
+       case USHORT:
+               printf(ofmt, v->width, *(u_short *)bp);
+               break;
 
 
-struct nametable {
-       char    nt_name[NMAX+1];
-       int     nt_uid;
-} nametable[NUID];
+       case LONG:
+               printf(ofmt, v->width, *(long *)bp);
+               break;
 
 
-struct nametable *
-findslot(uid)
-int    uid;
-{
-       register struct nametable       *n, *start;
+       case ULONG:
+               printf(ofmt, v->width, *(u_long *)bp);
+               break;
+
+       case KPTR:
+               printf(ofmt, v->width, *(u_long *)bp &~ KERNBASE);
+               break;
 
 
+       default:
+               error("unknown type %d", v->type);
+       }
+}
+
+/* XXX - redo */
+struct usave *
+saveuser(ki) 
+       struct kinfo *ki;
+{
+       register struct usave *usp;
+       register struct user *up;
+       
+       if ((usp = (struct usave *)calloc(1, sizeof (struct usave))) == NULL) {
+               fprintf(stderr, "ps: out of memory\n");
+               exit(1);
+       }
+       ki->ki_u = usp;
+       up = kvm_getu(ki->ki_p);
        /*
        /*
-        * find the uid or an empty slot.
-        * return NULL if neither found.
+        * save arguments if needed
         */
         */
-
-       n = start = nametable + (uid % (NUID - 20));
-       while (n->nt_name[0] && n->nt_uid != uid) {
-               if ((n += 5) >= &nametable[NUID])
-                       n -= NUID;
-               if (n == start)
-                       return((struct nametable *)NULL);
+       if (needcomm)
+               ki->ki_args = saveargs(ki->ki_p, up);
+       else
+               ki->ki_args = NULL;
+       if (up != NULL) { 
+               /*
+                * save important fields
+                */
+               usp->u_procp = up->u_procp;
+               usp->u_start = up->u_start;
+               usp->u_ru = up->u_ru;
+               usp->u_cru = up->u_cru;
+               usp->u_cmask = up->u_cmask;
+               usp->u_acflag = up->u_acflag;
        }
        }
-       return(n);
+       return;
 }
 
 char *
 }
 
 char *
-getname(uid)
+saveargs(p, up)
+       struct proc *p;
+       struct user *up;
 {
 {
-       register struct passwd          *pw;
-       static                          init = 0;
-       struct passwd                   *getpwent();
-       register struct nametable       *n;
+       char *savestr();
 
 
-       /*
-        * find uid in hashed table; add it if not found.
-        * return pointer to name.
-        */
+       return(savestr(kvm_getargs(p, up)));
+}
+       
 
 
-       if ((n = findslot(uid)) == NULL)
-               return((char *)NULL);
-
-       if (n->nt_name[0])      /* occupied? */
-               return(n->nt_name);
-
-       switch (init) {
-               case 0:
-                       setpwent();
-                       init = 1;
-                       /* intentional fall-thru */
-               case 1:
-                       while (pw = getpwent()) {
-                               if (pw->pw_uid < 0)
-                                       continue;
-                               if ((n = findslot(pw->pw_uid)) == NULL) {
-                                       endpwent();
-                                       init = 2;
-                                       return((char *)NULL);
-                               }
-                               if (n->nt_name[0])
-                                       continue;       /* duplicate, not uid */
-                               strncpy(n->nt_name, pw->pw_name, NMAX);
-                               n->nt_uid = pw->pw_uid;
-                               if (pw->pw_uid == uid)
-                                       return (n->nt_name);
-                       }
-                       endpwent();
-                       init = 2;
-                       /* intentional fall-thru */
-               case 2:
-                       return ((char *)NULL);
-       }
-       /* NOTREACHED */
+pscomp(k1, k2)
+       struct kinfo *k1, *k2;
+{
+       int i;
+#define VSIZE(k) ((k)->ki_p->p_dsize + (k)->ki_p->p_ssize + (k)->ki_e->e_xsize)
+
+       if (sortby == SORTCPU)
+               return (getpcpu(k2) - getpcpu(k1));
+#ifdef notyet
+       if (sortby == SORTRUN)
+               return (proc_compare(k1->ki_p, k2->ki_p));
+#endif
+       if (sortby == SORTMEM)
+               return (VSIZE(k2) - VSIZE(k1));
+       i =  k1->ki_e->e_tdev - k2->ki_e->e_tdev;
+       if (i == 0)
+               i = k1->ki_p->p_pid - k2->ki_p->p_pid;
+       return (i);
+}
+
+donlist()
+{
+       if (kvm_nlist(psnl) != 0)
+               error("can't get namelist");
+       if (kvm_read(psnl[X_FSCALE].n_value, &fscale, sizeof(int)) !=
+           sizeof (int))
+               error("error reading fscale: %s", kvm_geterr());
+       if (kvm_read(psnl[X_ECMX].n_value, &ecmx, sizeof(int)) !=
+           sizeof (int))
+               error("error reading ecmx: %s", kvm_geterr());
+       if (kvm_read(psnl[X_CCPU].n_value, &ccpu, sizeof(fixpt_t)) !=
+           sizeof (fixpt_t))
+               error("error reading ccpu: %s", kvm_geterr());
 }
 
 char *
 }
 
 char *
@@ -1262,33 +1202,81 @@ savestr(cp)
        return (dp);
 }
 
        return (dp);
 }
 
+error(a, b, c, d, e)
+       char *a, *b, *c, *d, *e;
+{
+       fprintf(stderr, "ps: ");
+       fprintf(stderr, a, b, c, d, e);
+       fprintf(stderr, "\n");
+       exit(1);
+}
+
+syserror(a)
+       char *a;
+{
+       extern errno;
+
+       error("%s: %s", a, strerror(errno));
+}
+
 /*
 /*
- * This routine was stolen from adb to simulate memory management
- * on the VAX.
+ * ICK (all for getopt), would rather hide the ugliness
+ * here than taint the main code.
+ *
+ *  ps foo -> ps -foo
+ *  ps 34 -> ps -p34
+ *
+ * The old convention that 't' with no trailing tty arg means the users
+ * tty, is only supported if argv[1] doesn't begin with a '-'.  This same
+ * feature is available with the option 'T', which takes no argument.
  */
  */
-off_t
-vtophys(loc)
-long   loc;
+char *
+kludge_oldps_options(s)
+       char *s;
 {
 {
-       register        p;
-       off_t   newloc;
-
-       newloc = loc & ~0xc0000000;
-       p = btop(newloc);
-       if ((loc & 0xc0000000) == 0) {
-               fprintf(stderr, "Vtophys: translating non-kernel address\n");
-               return((off_t) -1);
-       }
-       if (p >= Syssize) {
-               fprintf(stderr, "Vtophys: page out of bound (%d>=%d)\n",
-                       p, Syssize);
-               return((off_t) -1);
-       }
-       if (Sysmap[p].pg_v == 0
-       && (Sysmap[p].pg_fod || Sysmap[p].pg_pfnum == 0)) {
-               fprintf(stderr, "Vtophys: page not valid\n");
-               return((off_t) -1);
+       int len = strlen(s), numlen = 0;
+       char *newopts, *ns, *cp;
+
+       if ((newopts = ns = (char *)malloc(len+2)) == NULL)
+               error("out of memory");
+       /*
+        * options begin with '-'
+        */
+       if (*s != '-')
+               *ns++ = '-';    /* add option flag */
+       /*
+        * gaze to end of argv[1]
+        */
+       cp = s + len - 1;
+       /*
+        * if last letter is a 't' flag with no argument (in the context
+        * of the oldps options -- option string NOT starting with a '-' --
+        * then convert to 'T' (meaning *this* terminal, i.e. ttyname(0).
+        */
+       if (*cp == 't' && *s != '-')
+               *cp = 'T';
+       else {
+               /*
+                * otherwise check for trailing number, which *may* be a
+                * pid.
+                */
+               while (isdigit(*cp)) {
+                       --cp;
+                       numlen++;
+               }
        }
        }
-       loc = (long) (ptob(Sysmap[p].pg_pfnum) + (loc & PGOFSET));
-       return(loc);
+       cp++;
+       bcopy(s, ns, cp - s);   /* copy everything up to trailing number */
+       while (*ns)
+               ns++;
+       /*
+        * if there's a trailing number, and not a preceding 'p' (pid) or
+        * 't' (tty) flag, then assume it's a pid and insert a 'p' flag.
+        */
+       if (isdigit(*cp) && (cp == s || *(cp-1) != 't' && *(cp-1) != 'p' &&
+          ((cp-1) == s || *(cp-2) != 't')))
+               *ns++ = 'p';
+       strcat(ns, cp);         /* and append the number */
+
+       return (newopts);
 }
 }