From owner-svn-src-projects@FreeBSD.ORG Thu Jul 16 14:24:07 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 14DF41065670;
Thu, 16 Jul 2009 14:24:07 +0000 (UTC)
(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 03AF08FC15;
Thu, 16 Jul 2009 14:24:07 +0000 (UTC)
(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6GEO6VL031641;
Thu, 16 Jul 2009 14:24:06 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6GEO6WG031639;
Thu, 16 Jul 2009 14:24:06 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200907161424.n6GEO6WG031639@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Thu, 16 Jul 2009 14:24:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r195719 - projects/libprocstat/usr.bin/fstat
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jul 2009 14:24:07 -0000
Author: stas
Date: Thu Jul 16 14:24:06 2009
New Revision: 195719
URL: http://svn.freebsd.org/changeset/base/195719
Log:
- When retrieving special node data, check if the vnode is actually VCHR/VBLK.
Suggested by: kib
Modified:
projects/libprocstat/usr.bin/fstat/libprocstat.c
Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 13:26:03 2009 (r195718)
+++ projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 14:24:06 2009 (r195719)
@@ -558,10 +558,8 @@ procstat_get_pts_info_kvm(kvm_t *kd, str
warnx("can't read tty at %p", (void *)ttyp);
goto fail;
}
- if (tty.t_dev != NULL) {
- pts->dev = dev2udev(kd, tty.t_dev);
- (void)kdevtoname(kd, tty.t_dev, pts->devname);
- }
+ pts->dev = dev2udev(kd, tty.t_dev);
+ (void)kdevtoname(kd, tty.t_dev, pts->devname);
return (0);
fail:
@@ -645,7 +643,8 @@ procstat_get_vnode_info_kvm(kvm_t *kd, s
return (1);
}
vn->mntdir = getmnton(kd, vnode.v_mount);
- if (vnode.v_rdev != NULL) {
+ if ((vnode.v_type == VBLK || vnode.v_type == VCHR) &&
+ vnode.v_rdev != NULL){
vn->vn_dev = dev2udev(kd, vnode.v_rdev);
(void)kdevtoname(kd, vnode.v_rdev, vn->vn_devname);
}