From owner-svn-src-all@FreeBSD.ORG  Wed Oct 19 15:35:41 2011
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 70EFB1065670;
	Wed, 19 Oct 2011 15:35:41 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 607608FC08;
	Wed, 19 Oct 2011 15:35:41 +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 p9JFZfbR031035;
	Wed, 19 Oct 2011 15:35:41 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9JFZfUu031033;
	Wed, 19 Oct 2011 15:35:41 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201110191535.p9JFZfUu031033@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Wed, 19 Oct 2011 15:35:41 +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: r226546 - head/bin/ls
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: Wed, 19 Oct 2011 15:35:41 -0000

Author: des
Date: Wed Oct 19 15:35:41 2011
New Revision: 226546
URL: http://svn.freebsd.org/changeset/base/226546

Log:
  If ls was invoked with -i but neither -l nor -s, blocksize was used in
  display() to calculate column widths, but was not initialized in
  main().  This resulted in a division by zero.
  
  Noticed by:	Michael Butler <imb@protected-networks.net>

Modified:
  head/bin/ls/ls.c

Modified: head/bin/ls/ls.c
==============================================================================
--- head/bin/ls/ls.c	Wed Oct 19 14:38:01 2011	(r226545)
+++ head/bin/ls/ls.c	Wed Oct 19 15:35:41 2011	(r226546)
@@ -414,8 +414,8 @@ main(int argc, char *argv[])
 		fts_options |= FTS_WHITEOUT;
 #endif
 
-	/* If -l or -s, figure out block size. */
-	if (f_longform || f_size) {
+	/* If -i, -l or -s, figure out block size. */
+	if (f_inode || f_longform || f_size) {
 		if (f_kblocks)
 			blocksize = 2;
 		else {