From owner-svn-src-projects@FreeBSD.ORG  Sun Aug  2 13:25:11 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 E9CDB106566B;
	Sun,  2 Aug 2009 13:25:11 +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 D86988FC19;
	Sun,  2 Aug 2009 13:25:11 +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 n72DPBYL015659;
	Sun, 2 Aug 2009 13:25:11 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n72DPBvC015656;
	Sun, 2 Aug 2009 13:25:11 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200908021325.n72DPBvC015656@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 2 Aug 2009 13:25:11 +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: r196034 - in projects/libprocstat: sys/kern
	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 &quot; projects&quot;
	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: Sun, 02 Aug 2009 13:25:12 -0000

Author: stas
Date: Sun Aug  2 13:25:11 2009
New Revision: 196034
URL: http://svn.freebsd.org/changeset/base/196034

Log:
  - Do not fail if fullpath of the file could not be retrieved.
  - Print "-" for mntdir in fstat in that case.

Modified:
  projects/libprocstat/sys/kern/kern_descrip.c
  projects/libprocstat/usr.bin/fstat/libprocstat.c

Modified: projects/libprocstat/sys/kern/kern_descrip.c
==============================================================================
--- projects/libprocstat/sys/kern/kern_descrip.c	Sun Aug  2 11:26:23 2009	(r196033)
+++ projects/libprocstat/sys/kern/kern_descrip.c	Sun Aug  2 13:25:11 2009	(r196034)
@@ -3185,10 +3185,11 @@ fill_vnode_info(struct vnode *vp, struct
 	freepath = NULL;
 	fullpath = "-";
 	error = vn_fullpath(curthread, vp, &fullpath, &freepath);
-	if (error != 0)
-		return (error);
-	strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
-	free(freepath, M_TEMP);
+	if (error == 0) {
+		strlcpy(kif->kf_path, fullpath, sizeof(kif->kf_path));
+	}
+	if (freepath != NULL)
+		free(freepath, M_TEMP);
 
 	/*
 	 * Retrieve vnode attributes.

Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c
==============================================================================
--- projects/libprocstat/usr.bin/fstat/libprocstat.c	Sun Aug  2 11:26:23 2009	(r196033)
+++ projects/libprocstat/usr.bin/fstat/libprocstat.c	Sun Aug  2 13:25:11 2009	(r196034)
@@ -986,7 +986,8 @@ procstat_get_vnode_info_sysctl(struct fi
 	if (path && *path) {
 		statfs(path, &stbuf);
 		vn->vn_mntdir = strdup(stbuf.f_mntonname);
-	}
+	} else
+		vn->vn_mntdir = strdup("-");
 	vn->vn_dev = rdev;
 	if (vntype == PS_FST_VTYPE_VBLK) {
 		name = devname(rdev, S_IFBLK);