use value S_IFCHR or S_IFBLK for specifying type of device

SCCS-vsn: bin/ps/ps.c 5.23
SCCS-vsn: lib/libc/gen/devname.c 5.3

diff --git a/usr/src/bin/ps/ps.c b/usr/src/bin/ps/ps.c
index 222c10f..f3efb40 100644 (file)
--- a/usr/src/bin/ps/ps.c
+++ b/usr/src/bin/ps/ps.c
@@ -749,7 +749,7 @@ tdev(k, v)
        }
 }
 
        }
 }
 

-char *devname();
+extern char *devname();

 
 tname(k, v)
        struct kinfo *k;
 
 tname(k, v)
        struct kinfo *k;


@@ -758,7 +758,7 @@ tname(k, v)
        dev_t dev = k->ki_e->e_tdev;
        char *tname;
 
        dev_t dev = k->ki_e->e_tdev;
        char *tname;
 

-       if (dev == NODEV || (tname = devname(dev, 1)) == NULL)
+       if (dev == NODEV || (tname = devname(dev, S_IFCHR)) == NULL)

                printf("%-*s", v->width, "??");
        else {
                if (strncmp(tname, "tty", 3) == 0)
                printf("%-*s", v->width, "??");
        else {
                if (strncmp(tname, "tty", 3) == 0)


@@ -775,7 +775,7 @@ longtname(k, v)
        dev_t dev = k->ki_e->e_tdev;
        char *tname;
 
        dev_t dev = k->ki_e->e_tdev;
        char *tname;
 

-       if (dev == NODEV || (tname = devname(dev, 1)) == NULL)
+       if (dev == NODEV || (tname = devname(dev, S_IFCHR)) == NULL)

                printf("%-*s", v->width, "??");
        else
                printf("%-*s", v->width, tname);
                printf("%-*s", v->width, "??");
        else
                printf("%-*s", v->width, tname);

diff --git a/usr/src/lib/libc/gen/devname.c b/usr/src/lib/libc/gen/devname.c
index 0f5a593..b036696 100644 (file)
--- a/usr/src/lib/libc/gen/devname.c
+++ b/usr/src/lib/libc/gen/devname.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)devname.c  5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)devname.c  5.3 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>