From a4cdc0452ab0e239991b45eb2170029e1c25fd12 Mon Sep 17 00:00:00 2001
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Sat, 30 Jul 2005 20:00:13 +0000
Subject: [PATCH] Introduce kdevtoname, which when given the kernel address of
 a cdev structure, returns the device name associated with it through the
 __si_namebuf member. This un-breaks the processing of devices.

This is a RELENG_6 candidate.

Reviewed by:	phk
---
 usr.bin/fstat/fstat.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index b835a93faaaa..9c247977215e 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -154,7 +154,7 @@ void socktrans(struct socket *sock, int i);
 void getinetproto(int number);
 int  getfname(const char *filename);
 void usage(void);
-
+char *kdevtoname(struct cdev *dev);
 
 int
 main(int argc, char **argv)
@@ -472,6 +472,16 @@ dommap(struct kinfo_proc *kp)
 	}
 }
 
+char *
+kdevtoname(struct cdev *dev)
+{
+	struct cdev si;
+
+	if (!KVM_READ(dev, &si, sizeof si))
+		return (NULL);
+	return (strdup(si.__si_namebuf));
+}
+
 void
 vtrans(struct vnode *vp, int i, int flag)
 {
@@ -555,11 +565,13 @@ vtrans(struct vnode *vp, int i, int flag)
 	case VCHR: {
 		char *name;
 
-		if (nflg || ((name = devname(fst.rdev, vn.v_type == VCHR ?
-		    S_IFCHR : S_IFBLK)) == NULL))
+		name = kdevtoname(vn.v_rdev);
+		if (nflg || !name)
 			printf("  %2d,%-2d", major(fst.rdev), minor(fst.rdev));
-		else
+		else {
 			printf(" %6s", name);
+			free(name);
+		}
 		break;
 	}
 	default: