get screen width ioctl added and hold passwd file open

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

diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index 1efc4ff..3f17c09 100644 (file)
--- a/usr/src/bin/ps/ps.c
+++ b/usr/src/bin/ps/ps.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)ps.c        4.22 (Berkeley) %G%";
+static char *sccsid = "@(#)ps.c        4.30 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -10,8 +10,9 @@ static        char *sccsid = "@(#)ps.c        4.22 (Berkeley) %G%";
 #include <nlist.h>
 #include <pwd.h>
 #include <sys/param.h>
 #include <nlist.h>
 #include <pwd.h>
 #include <sys/param.h>

+#include <sys/ioctl.h>

 #include <sys/tty.h>
 #include <sys/tty.h>

-#include <dir.h>
+#include <sys/dir.h>

 #include <sys/user.h>
 #include <sys/proc.h>
 #include <machine/pte.h>
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <machine/pte.h>


@@ -20,12 +21,13 @@ static      char *sccsid = "@(#)ps.c        4.22 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <sys/mbuf.h>
 #include <math.h>
 #include <sys/stat.h>
 #include <sys/mbuf.h>
 #include <math.h>

+#include <errno.h>

 
 struct nlist nl[] = {
        { "_proc" },
 #define        X_PROC          0
        { "_Usrptmap" },
 
 struct nlist nl[] = {
        { "_proc" },
 #define        X_PROC          0
        { "_Usrptmap" },

-#define        X_USRPTMA       1
+#define        X_USRPTMAP      1

        { "_usrpt" },
 #define        X_USRPT         2
        { "_text" },
        { "_usrpt" },
 #define        X_USRPT         2
        { "_text" },


@@ -42,6 +44,14 @@ struct nlist nl[] = {
 #define        X_NPROC         8
        { "_ntext" },
 #define        X_NTEXT         9
 #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

        { "" },
 };
 
        { "" },
 };
 


@@ -85,7 +95,9 @@ struct        vsav {
        float   v_pctcpu;
 };
 
        float   v_pctcpu;
 };
 

-struct proc proc[8];           /* 8 = a few, for less syscalls */
+#define        NPROC   16
+
+struct proc proc[NPROC];               /* a few, for less syscalls */

 struct proc *mproc;
 struct text *text;
 
 struct proc *mproc;
 struct text *text;
 


@@ -95,36 +107,50 @@ union {
 } user;
 #define u      user.user
 
 } user;
 #define u      user.user
 

-#define clear(x)       ((int)x & 0x7fffffff)
+#ifndef        PSFILE
+char   *psdb   = "/etc/psdatabase";
+#else
+char   *psdb   = PSFILE;
+#endif

 
 int    chkpid;
 int    aflg, cflg, eflg, gflg, kflg, lflg, sflg,
 
 int    chkpid;
 int    aflg, cflg, eflg, gflg, kflg, lflg, sflg,

-       uflg, vflg, xflg;
+       uflg, vflg, xflg, Uflg;

 char   *tptr;
 char   *tptr;

-char   *gettty(), *getcmd(), *getname(), *savestr(), *alloc(), *state();
+char   *gettty(), *getcmd(), *getname(), *savestr(), *state();

 char   *rindex(), *calloc(), *sbrk(), *strcpy(), *strcat(), *strncat();
 char   *rindex(), *calloc(), *sbrk(), *strcpy(), *strcat(), *strncat();

-char   *index(), *ttyname(), mytty[16];
+char   *strncpy(), *index(), *ttyname(), mytty[16];

 long   lseek();
 long   lseek();

+off_t  vtophys();

 double pcpu(), pmem();
 int    pscomp();
 int    nswap, maxslp;
 struct text *atext;
 double ccpu;
 int    ecmx;
 double pcpu(), pmem();
 int    pscomp();
 int    nswap, maxslp;
 struct text *atext;
 double ccpu;
 int    ecmx;

-struct pte *Usrptma, *usrpt;
+struct pte *Usrptmap, *usrpt;

 int    nproc, ntext;
 int    nproc, ntext;

+int    dmmin, dmmax;
+struct pte *Sysmap;
+int    Syssize;
+
+#ifndef        MAXTTYS
+#define        MAXTTYS         256
+#endif
+
+int    nttys;

 
 struct ttys {
 
 struct ttys {

-       char    name[MAXNAMLEN+1];

        dev_t   ttyd;
        dev_t   ttyd;

-       struct  ttys *next;

        struct  ttys *cand;
        struct  ttys *cand;

-} *allttys, *cand[16];
+       char    name[MAXNAMLEN+1];
+} allttys[MAXTTYS], *cand[16];

 
 int    npr;
 
 int    cmdstart;
 int    twidth;
 
 int    npr;
 
 int    cmdstart;
 int    twidth;

+struct winsize win;

 char   *kmemf, *memf, *swapf, *nlistf;
 int    kmem, mem, swap = -1;
 int    rawcpu, sumcpu;
 char   *kmemf, *memf, *swapf, *nlistf;
 int    kmem, mem, swap = -1;
 int    rawcpu, sumcpu;


@@ -133,7 +159,7 @@ int pcbpf;
 int    argaddr;
 extern char _sobuf[];
 
 int    argaddr;
 extern char _sobuf[];
 

-#define        pgtok(a)        ((a)*CLBYTES/1024)
+#define        pgtok(a)        ((a)/(1024/NBPG))

 
 main(argc, argv)
        char **argv;
 
 main(argc, argv)
        char **argv;


@@ -142,8 +168,12 @@ main(argc, argv)
        register char *ap;
        int uid;
        off_t procp;
        register char *ap;
        int uid;
        off_t procp;

+       int width;

 
 

-       twidth = 80;
+       if (ioctl(0, TIOCGWINSZ, &win) == -1)
+               twidth = 80;
+       else
+               twidth = (win.ws_col == 0 ? 80 : win.ws_col);

        argc--, argv++;
        if (argc > 0) {
                ap = argv[0];
        argc--, argv++;
        if (argc > 0) {
                ap = argv[0];


@@ -155,6 +185,11 @@ main(argc, argv)
                case 'S':
                        sumcpu++;
                        break;
                case 'S':
                        sumcpu++;
                        break;

+
+               case 'U':
+                       Uflg++;
+                       break;
+

                case 'a':
                        aflg++;
                        break;
                case 'a':
                        aflg++;
                        break;


@@ -199,7 +234,7 @@ main(argc, argv)
                        vflg++;
                        break;
                case 'w':
                        vflg++;
                        break;
                case 'w':

-                       if (twidth == 80)
+                       if (twidth < 132)

                                twidth = 132;
                        else
                                twidth = BUFSIZ;
                                twidth = 132;
                        else
                                twidth = BUFSIZ;


@@ -219,21 +254,16 @@ main(argc, argv)
        }
        openfiles(argc, argv);
        getkvars(argc, argv);
        }
        openfiles(argc, argv);
        getkvars(argc, argv);

-       if (chdir("/dev") < 0) {
-               perror("/dev");
-               exit(1);
-       }
-       getdev();

        uid = getuid();
        printhdr();
        procp = getw(nl[X_PROC].n_value);
        nproc = getw(nl[X_NPROC].n_value);
        uid = getuid();
        printhdr();
        procp = getw(nl[X_PROC].n_value);
        nproc = getw(nl[X_NPROC].n_value);

-       savcom = (struct savcom *)calloc(nproc, sizeof (*savcom));
-       for (i=0; i<nproc; i += 8) {
+       savcom = (struct savcom *)calloc((unsigned) nproc, sizeof (*savcom));
+       for (i=0; i<nproc; i += NPROC) {

                klseek(kmem, (long)procp, 0);
                j = nproc - i;
                klseek(kmem, (long)procp, 0);
                j = nproc - i;

-               if (j > 8)
-                       j = 8;
+               if (j > NPROC)
+                       j = NPROC;

                j *= sizeof (struct proc);
                if (read(kmem, (char *)proc, j) != j) {
                        cantread("proc table", kmemf);
                j *= sizeof (struct proc);
                if (read(kmem, (char *)proc, j) != j) {
                        cantread("proc table", kmemf);


@@ -248,8 +278,9 @@ main(argc, argv)
                        if (tptr == 0 && gflg == 0 && xflg == 0 &&
                            mproc->p_ppid == 1)
                                continue;
                        if (tptr == 0 && gflg == 0 && xflg == 0 &&
                            mproc->p_ppid == 1)
                                continue;

-                       if (uid != mproc->p_uid && aflg==0 ||
-                           chkpid != 0 && chkpid != mproc->p_pid)
+                       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 ||
                                continue;
                        if (vflg && gflg == 0 && xflg == 0) {
                                if (mproc->p_stat == SZOMB ||


@@ -263,7 +294,10 @@ main(argc, argv)
                        save();
                }
        }
                        save();
                }
        }

-       qsort(savcom, npr, sizeof(savcom[0]), pscomp);
+       width = twidth - cmdstart - 2;
+       if (width < 0)
+               width = 0;
+       qsort((char *) savcom, npr, sizeof(savcom[0]), pscomp);

        for (i=0; i<npr; i++) {
                register struct savcom *sp = &savcom[i];
                if (lflg)
        for (i=0; i<npr; i++) {
                register struct savcom *sp = &savcom[i];
                if (lflg)


@@ -294,7 +328,7 @@ main(argc, argv)
 getw(loc)
        unsigned long loc;
 {
 getw(loc)
        unsigned long loc;
 {

-       long word;
+       int word;

 
        klseek(kmem, (long)loc, 0);
        if (read(kmem, (char *)&word, sizeof (word)) != sizeof (word))
 
        klseek(kmem, (long)loc, 0);
        if (read(kmem, (char *)&word, sizeof (word)) != sizeof (word))


@@ -307,12 +341,60 @@ klseek(fd, loc, off)
        long loc;
        int off;
 {
        long loc;
        int off;
 {

-
-       if (kflg)
-               loc &= 0x7fffffff;
+       if (kflg) {
+               if ((loc = vtophys(loc)) == -1)
+                       return;
+       }

        (void) lseek(fd, (long)loc, off);
 }
 
        (void) lseek(fd, (long)loc, off);
 }
 

+writepsdb(unixname)
+       char *unixname;
+{
+       int nllen;
+       register FILE *fp;
+
+       setuid(getuid());
+       if ((fp = fopen(psdb, "w")) == NULL) {
+               perror(psdb);
+               exit(1);
+       } 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);
+}
+
+readpsdb(unixname)
+       char *unixname;
+{
+       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);
+}
+

 openfiles(argc, argv)
        char **argv;
 {
 openfiles(argc, argv)
        char **argv;
 {


@@ -349,19 +431,43 @@ openfiles(argc, argv)
 getkvars(argc, argv)
        char **argv;
 {
 getkvars(argc, argv)
        char **argv;
 {

-       register struct nlist *nlp;

 
        nlistf = argc > 1 ? argv[1] : "/vmunix";
 
        nlistf = argc > 1 ? argv[1] : "/vmunix";

-       nlist(nlistf, nl);
+       if (Uflg) {
+               nlist(nlistf, nl);
+               getdev();
+               writepsdb(nlistf);
+               exit (0);
+       } else if (!readpsdb(nlistf)) {
+               if (!kflg)
+                       nl[X_SYSMAP].n_name = "";
+               nlist(nlistf, nl);
+               nttys =  0;
+               getdev();
+       }
+

        if (nl[0].n_type == 0) {
                fprintf(stderr, "%s: No namelist\n", nlistf);
                exit(1);
        }
        if (nl[0].n_type == 0) {
                fprintf(stderr, "%s: No namelist\n", nlistf);
                exit(1);
        }

-       if (kflg)
-               for (nlp = nl; nlp < &nl[sizeof (nl)/sizeof (nl[0])]; nlp++)
-                       nlp->n_value = clear(nlp->n_value);
-       usrpt = (struct pte *)nl[X_USRPT].n_value;      /* don't clear!! */
-       Usrptma = (struct pte *)nl[X_USRPTMA].n_value;
+       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);
        klseek(kmem, (long)nl[X_NSWAP].n_value, 0);
        if (read(kmem, (char *)&nswap, sizeof (nswap)) != sizeof (nswap)) {
                cantread("nswap", kmemf);


@@ -384,7 +490,8 @@ getkvars(argc, argv)
        }
        if (uflg || vflg) {
                ntext = getw(nl[X_NTEXT].n_value);
        }
        if (uflg || vflg) {
                ntext = getw(nl[X_NTEXT].n_value);

-               text = (struct text *)alloc(ntext * sizeof (struct text));
+               text = (struct text *)
+                       calloc((unsigned) ntext, sizeof (struct text));

                if (text == 0) {
                        fprintf(stderr, "no room for text table\n");
                        exit(1);
                if (text == 0) {
                        fprintf(stderr, "no room for text table\n");
                        exit(1);


@@ -397,6 +504,8 @@ getkvars(argc, argv)
                        exit(1);
                }
        }
                        exit(1);
                }
        }

+       dmmin = getw(nl[X_DMMIN].n_value);
+       dmmax = getw(nl[X_DMMAX].n_value);

 }
 
 printhdr()
 }
 
 printhdr()


@@ -431,6 +540,10 @@ getdev()
 {
        register DIR *df;
 
 {
        register DIR *df;
 

+       if (chdir("/dev") < 0) {
+               perror("/dev");
+               exit(1);
+       }

        dialbase = -1;
        if ((df = opendir(".")) == NULL) {
                fprintf(stderr, "Can't open . in /dev\n");
        dialbase = -1;
        if ((df = opendir(".")) == NULL) {
                fprintf(stderr, "Can't open . in /dev\n");


@@ -482,10 +595,9 @@ maybetty()
 
        case 'r':
                cp++;
 
        case 'r':
                cp++;

-               if (*cp == 'r' || *cp == 'u' || *cp == 'h')
-                       cp++;

 #define is(a,b) cp[0] == 'a' && cp[1] == 'b'
 #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)) {
+               if (is(h,p) || is(r,a) || is(u,p) || is(r,k) 
+                   || is(r,m) || is(m,t)) {

                        cp += 2;
                        if (isdigit(*cp) && cp[2] == 0)
                                return;
                        cp += 2;
                        if (isdigit(*cp) && cp[2] == 0)
                                return;


@@ -534,11 +646,22 @@ trymem:
        else
                x = -1;
 donecand:
        else
                x = -1;
 donecand:

-       dp = (struct ttys *)alloc(sizeof (struct ttys));
+       if (nttys >= MAXTTYS) {
+               fprintf(stderr, "ps: tty table overflow\n");
+               exit(1);
+       }
+       dp = &allttys[nttys++];

        (void) strcpy(dp->name, dbuf->d_name);
        (void) strcpy(dp->name, dbuf->d_name);

-       dp->next = allttys;
-       dp->ttyd = -1;
-       allttys = dp;
+       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;
        if (x == -1)
                return;
        x &= 017;


@@ -569,7 +692,7 @@ gettty()
                        goto found;
        }
        /* ick */
                        goto found;
        }
        /* ick */

-       for (dp = allttys; dp; dp = dp->next) {
+       for (dp = allttys; dp < &allttys[nttys]; dp++) {

                if (dp->ttyd == -1) {
                        if (stat(dp->name, &stb) == 0 &&
                           (stb.st_mode&S_IFMT)==S_IFCHR)
                if (dp->ttyd == -1) {
                        if (stat(dp->name, &stb) == 0 &&
                           (stb.st_mode&S_IFMT)==S_IFCHR)


@@ -605,7 +728,7 @@ save()
        cmdp = getcmd();
        if (cmdp == 0)
                return;
        cmdp = getcmd();
        if (cmdp == 0)
                return;

-       sp->ap = ap = (struct asav *)alloc(sizeof (struct asav));
+       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);
        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);


@@ -634,7 +757,8 @@ save()
        if (lflg) {
                register struct lsav *lp;
 
        if (lflg) {
                register struct lsav *lp;
 

-               sp->s_un.lp = lp = (struct lsav *)alloc(sizeof (struct lsav));
+               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)
 #define e(a,b) lp->a = mproc->b
                e(l_ppid, p_ppid); e(l_cpu, p_cpu);
                if (ap->a_stat != SZOMB)


@@ -644,7 +768,8 @@ save()
        } else if (vflg) {
                register struct vsav *vp;
 
        } else if (vflg) {
                register struct vsav *vp;
 

-               sp->s_un.vp = vp = (struct vsav *)alloc(sizeof (struct vsav));
+               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);
 #define e(a,b) vp->a = mproc->b
                if (ap->a_stat != SZOMB) {
                        e(v_swrss, p_swrss);


@@ -722,21 +847,19 @@ getu()
                argaddr = 0;
                return (1);
        }
                argaddr = 0;
                return (1);
        }

-       if (kflg)
-               mproc->p_p0br = (struct pte *)clear(mproc->p_p0br);
-       pteaddr = &Usrptma[btokmx(mproc->p_p0br) + mproc->p_szpt - 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",
        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, swapf);
+                   mproc->p_pid, kmemf);

                return (0);
        }
                return (0);
        }

-       klseek(mem,
+       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",
            (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, kmemf);
+                   mproc->p_pid, memf);

                return (0);
        }
        if (arguutl[0].pg_fod == 0 && arguutl[0].pg_pfnum)
                return (0);
        }
        if (arguutl[0].pg_fod == 0 && arguutl[0].pg_pfnum)


@@ -747,7 +870,7 @@ getu()
        ncl = (size + NBPG*CLSIZE - 1) / (NBPG*CLSIZE);
        while (--ncl >= 0) {
                i = ncl * CLSIZE;
        ncl = (size + NBPG*CLSIZE - 1) / (NBPG*CLSIZE);
        while (--ncl >= 0) {
                i = ncl * CLSIZE;

-               klseek(mem, (long)ctob(arguutl[CLSIZE+i].pg_pfnum), 0);
+               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);
                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);


@@ -788,7 +911,7 @@ getcmd()
                        goto bad;
                file = swapf;
        } else {
                        goto bad;
                file = swapf;
        } else {

-               klseek(mem, (long)argaddr, 0);
+               lseek(mem, (long)argaddr, 0);

                if (read(mem, (char *)&argspac, sizeof (argspac))
                    != sizeof (argspac))
                        goto bad;
                if (read(mem, (char *)&argspac, sizeof (argspac))
                    != sizeof (argspac))
                        goto bad;


@@ -829,10 +952,6 @@ getcmd()
                (void) strncat(cmdbuf, u.u_comm, sizeof(u.u_comm));
                (void) strcat(cmdbuf, ")");
        }
                (void) strncat(cmdbuf, u.u_comm, sizeof(u.u_comm));
                (void) strcat(cmdbuf, ")");
        }

-/*
-       if (xflg == 0 && gflg == 0 && tptr == 0 && cp[0] == '-')
-               return (0);
-*/

        return (savestr(cmdbuf));
 
 bad:
        return (savestr(cmdbuf));
 
 bad:


@@ -846,7 +965,7 @@ retucomm:
 }
 
 char   *lhdr =
 }
 
 char   *lhdr =

-"      F UID   PID  PPID CP PRI NI ADDR  SZ  RSS WCHAN STAT TT  TIME";
+"      F UID   PID  PPID CP PRI NI ADDR  SZ  RSS WCHAN  STAT TT  TIME";

 lpr(sp)
        struct savcom *sp;
 {
 lpr(sp)
        struct savcom *sp;
 {


@@ -857,7 +976,7 @@ lpr(sp)
            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));
            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 ? " %5x" : "      ", (int)lp->l_wchan&0xfffff);
+       printf(lp->l_wchan ? " %6x" : "       ", (int)lp->l_wchan&0xffffff);

        printf(" %4.4s ", state(ap));
        ptty(ap->a_tty);
        ptime(ap);
        printf(" %4.4s ", state(ap));
        ptty(ap->a_tty);
        ptime(ap);


@@ -999,7 +1118,7 @@ vstodb(vsbase, vssize, dmp, dbp, rev)
        struct dmap *dmp;
        register struct dblock *dbp;
 {
        struct dmap *dmp;
        register struct dblock *dbp;
 {

-       register int blk = DMMIN;
+       register int blk = dmmin;

        register swblk_t *ip = dmp->dm_map;
 
        vsbase = ctod(vsbase);
        register swblk_t *ip = dmp->dm_map;
 
        vsbase = ctod(vsbase);


@@ -1008,7 +1127,7 @@ vstodb(vsbase, vssize, dmp, dbp, rev)
                panic("vstodb");
        while (vsbase >= blk) {
                vsbase -= blk;
                panic("vstodb");
        while (vsbase >= blk) {
                vsbase -= blk;

-               if (blk < DMMAX)
+               if (blk < dmmax)

                        blk *= 2;
                ip++;
        }
                        blk *= 2;
                ip++;
        }


@@ -1061,79 +1180,126 @@ vsize(sp)
        return (vp->v_swrss + (ap->a_xccount ? 0 : vp->v_txtswrss));
 }
 
        return (vp->v_swrss + (ap->a_xccount ? 0 : vp->v_txtswrss));
 }
 

-#define        NMAX    8
-#define        NUID    2048
+#define        NMAX    8       /* sizeof loginname (should be sizeof (utmp.ut_name)) */
+#define NUID   2048    /* must not be a multiple of 5 */

 
 

-char   names[NUID][NMAX+1];
+struct nametable {
+       char    nt_name[NMAX+1];
+       int     nt_uid;
+} nametable[NUID];

 
 

-/*
- * Stolen from ls...
- */
-char *
-getname(uid)
+struct nametable *
+findslot(uid)
+int    uid;

 {
 {

-       register struct passwd *pw;
-       static init;
-       struct passwd *getpwent();
-
-       if (uid >= 0 && uid < NUID && names[uid][0])
-               return (&names[uid][0]);
-       if (init == 2)
-               return (0);
-       if (init == 0)
-               setpwent(), init = 1;
-       while (pw = getpwent()) {
-               if (pw->pw_uid >= NUID)
-                       continue;
-               if (names[pw->pw_uid][0])
-                       continue;
-               (void) strncpy(names[pw->pw_uid], pw->pw_name, NMAX);
-               if (pw->pw_uid == uid)
-                       return (&names[uid][0]);
+       register struct nametable       *n, *start;
+
+       /*
+        * find the uid or an empty slot.
+        * return NULL if neither found.
+        */
+
+       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);

        }
        }

-       init = 2;
-       endpwent();
-       return (0);
+       return(n);

 }
 
 }
 

-char   *freebase;
-int    nleft;
-

 char *
 char *

-alloc(size)
-       int size;
+getname(uid)

 {
 {

-       register char *cp;
-       register int i;
-
-#ifdef sun
-       size = (size+1)&~1;
-#endif
-       if (size > nleft) {
-               freebase = (char *)sbrk((int)(i = size > 2048 ? size : 2048));
-               if (freebase == 0) {
-                       fprintf(stderr, "ps: ran out of memory\n");
-                       exit(1);
-               }
-               nleft = i - size;
-       } else
-               nleft -= size;
-       cp = freebase;
-       for (i = size; --i >= 0; )
-               *cp++ = 0;
-       freebase = cp;
-       return (cp - size);
+       register struct passwd          *pw;
+       static                          init = 0;
+       struct passwd                   *getpwent();
+       register struct nametable       *n;
+       extern int                      _pw_stayopen;
+
+       /*
+        * find uid in hashed table; add it if not found.
+        * return pointer to name.
+        */
+
+       if ((n = findslot(uid)) == NULL)
+               return((char *)NULL);
+
+       if (n->nt_name[0])      /* occupied? */
+               return(n->nt_name);
+
+       switch (init) {
+               case 0:
+                       setpwent();
+                       _pw_stayopen = 1;
+                       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 */

 }
 
 char *
 savestr(cp)
        char *cp;
 {
 }
 
 char *
 savestr(cp)
        char *cp;
 {

-       register int len;
+       register unsigned len;

        register char *dp;
 
        len = strlen(cp);
        register char *dp;
 
        len = strlen(cp);

-       dp = (char *)alloc(len+1);
+       dp = (char *)calloc(len+1, sizeof (char));

        (void) strcpy(dp, cp);
        return (dp);
 }
        (void) strcpy(dp, cp);
        return (dp);
 }

+
+/*
+ * This routine was stolen from adb to simulate memory management
+ * on the VAX.
+ */
+off_t
+vtophys(loc)
+long   loc;
+{
+       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);
+       }
+       loc = (long) (ptob(Sysmap[p].pg_pfnum) + (loc & PGOFSET));
+       return(loc);
+}