minor cleanups: get disk names right, avoid pty masters

SCCS-vsn: bin/ps/ps.c 4.31

diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index 3f17c09..e3a5c89 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.30 (Berkeley) %G%";
+static char *sccsid = "@(#)ps.c        4.31 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -150,14 +150,13 @@ int       npr;
 
 int    cmdstart;
 int    twidth;
 
 int    cmdstart;
 int    twidth;

-struct winsize win;
+struct winsize win;

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

-extern char _sobuf[];

 
 #define        pgtok(a)        ((a)/(1024/NBPG))
 
 
 #define        pgtok(a)        ((a)/(1024/NBPG))
 


@@ -596,8 +595,8 @@ maybetty()
        case 'r':
                cp++;
 #define is(a,b) cp[0] == 'a' && cp[1] == 'b'
        case 'r':
                cp++;
 #define is(a,b) cp[0] == 'a' && cp[1] == 'b'

-               if (is(h,p) || is(r,a) || is(u,p) || is(r,k) 
-                   || is(r,m) || is(m,t)) {
+               if (is(h,p) || is(r,a) || is(u,p) || is(h,k) 
+                   || is(r,b) || is(m,t)) {

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


@@ -615,6 +614,13 @@ trymem:
        case 'n':
                if (!strcmp(cp, "null"))
                        return;
        case 'n':
                if (!strcmp(cp, "null"))
                        return;

+               if (!strncmp(cp, "nrmt", 4))
+                       return;
+               break;
+
+       case 'p':
+               if (cp[1] && cp[1] == 't' && cp[2] == 'y')
+                       return;

                break;
 
        case 'v':
                break;
 
        case 'v':