From owner-svn-src-all@FreeBSD.ORG  Mon Feb  6 21:50:13 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0692B106564A;
	Mon,  6 Feb 2012 21:50:13 +0000 (UTC)
	(envelope-from truckman@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5D348FC0A;
	Mon,  6 Feb 2012 21:50:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q16LoCuU055115;
	Mon, 6 Feb 2012 21:50:12 GMT (envelope-from truckman@svn.freebsd.org)
Received: (from truckman@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q16LoCJd055113;
	Mon, 6 Feb 2012 21:50:12 GMT (envelope-from truckman@svn.freebsd.org)
Message-Id: <201202062150.q16LoCJd055113@svn.freebsd.org>
From: Don Lewis <truckman@FreeBSD.org>
Date: Mon, 6 Feb 2012 21:50:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231102 - head/sbin/fsdb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2012 21:50:13 -0000

Author: truckman
Date: Mon Feb  6 21:50:11 2012
New Revision: 231102
URL: http://svn.freebsd.org/changeset/base/231102

Log:
  Improve sparse file handling when printing the block list for an inode by
  not bailing out early when a hole is encountered in the direct block list.
  Print NULL block pointers in the direct block list.  Simplify the
  code that prints the fragment count.
  
  Match the style of the existing code.
  
  Reviewed by:	mckusick
  MFC after:	1 week

Modified:
  head/sbin/fsdb/fsdbutil.c

Modified: head/sbin/fsdb/fsdbutil.c
==============================================================================
--- head/sbin/fsdb/fsdbutil.c	Mon Feb  6 21:35:11 2012	(r231101)
+++ head/sbin/fsdb/fsdbutil.c	Mon Feb  6 21:50:11 2012	(r231102)
@@ -293,22 +293,21 @@ printblocks(ino_t inum, union dinode *dp
     printf("Blocks for inode %d:\n", inum);
     printf("Direct blocks:\n");
     ndb = howmany(DIP(dp, di_size), sblock.fs_bsize);
-    for (i = 0; i < NDADDR; i++) {
-	if (DIP(dp, di_db[i]) == 0) {
-	    putchar('\n');
-	    return;
-	}
+    for (i = 0; i < NDADDR && i < ndb; i++) {
 	if (i > 0)
 	    printf(", ");
 	blkno = DIP(dp, di_db[i]);
 	printf("%jd", (intmax_t)blkno);
-	if (--ndb == 0 && (offset = blkoff(&sblock, DIP(dp, di_size))) != 0) {
+    }
+    if (ndb <= NDADDR) {
+	offset = blkoff(&sblock, DIP(dp, di_size));
+	if (offset != 0) {
 	    nfrags = numfrags(&sblock, fragroundup(&sblock, offset));
 	    printf(" (%d frag%s)", nfrags, nfrags > 1? "s": "");
 	}
     }
     putchar('\n');
-    if (ndb == 0)
+    if (ndb <= NDADDR)
 	return;
 
     bufp = malloc((unsigned int)sblock.fs_bsize);