new calling convention for devname()

SCCS-vsn: usr.bin/fstat/fstat.c 5.24

diff --git a/usr/src/usr.bin/fstat/fstat.c b/usr/src/usr.bin/fstat/fstat.c
index 6a0a9f9..d85b436 100644 (file)
--- a/usr/src/usr.bin/fstat/fstat.c
+++ b/usr/src/usr.bin/fstat/fstat.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-char sccsid[] = "@(#)fstat.c   5.23 (Berkeley) %G%";
+char sccsid[] = "@(#)fstat.c   5.24 (Berkeley) %G%";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -296,6 +296,7 @@ vtrans(vp, i)
        char *fstype;
        char *getmnton(), *vtype();
        int nodata = 0;
        char *fstype;
        char *getmnton(), *vtype();
        int nodata = 0;

+       extern char *devname();

 
        if (kvm_read((off_t)vp, &vn, sizeof (struct vnode)) != 
            sizeof (struct vnode)) {
 
        if (kvm_read((off_t)vp, &vn, sizeof (struct vnode)) != 
            sizeof (struct vnode)) {


@@ -357,17 +358,16 @@ vtrans(vp, i)
        printf(" %6d %3s", fst.fileid, vtype(vn.v_type));
        switch (vn.v_type) {
        case VBLK:
        printf(" %6d %3s", fst.fileid, vtype(vn.v_type));
        switch (vn.v_type) {
        case VBLK:

-               if (nflg)
+       case VCHR: {
+               char *name;
+
+               if (nflg || ((name = devname(fst.rdev, vn.v_type == VCHR ? 
+                   S_IFCHR : S_IFBLK)) == NULL))

                        printf("  %2d,%-2d", major(fst.rdev), minor(fst.rdev));
                else
                        printf("  %2d,%-2d", major(fst.rdev), minor(fst.rdev));
                else

-                       printf(" %-6s", devname(fst.rdev, 0));
-               break;
-       case VCHR:
-               if (nflg)
-                       printf("  %2d/%-2d", major(fst.rdev), minor(fst.rdev));
-               else
-                       printf(" %-6s", devname(fst.rdev, 1));
+                       printf(" %6s", name);

                break;
                break;

+       }

        default:
                printf(" %6d", fst.size);
        }
        default:
                printf(" %6d", fst.size);
        }


@@ -397,7 +397,7 @@ nfs_filestat(vp, fsp)
 
        fsp->fsid = np->n_vattr.va_fsid;
        fsp->fileid = np->n_vattr.va_fileid;
 
        fsp->fsid = np->n_vattr.va_fsid;
        fsp->fileid = np->n_vattr.va_fileid;

-       fsp->size = np->n_vattr.va_size;
+       fsp->size = np->n_size;

        fsp->rdev = np->n_vattr.va_rdev;
 }
 
        fsp->rdev = np->n_vattr.va_rdev;
 }