From owner-svn-src-head@freebsd.org  Mon Jun 11 05:05:22 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 02EAE1004FE4;
 Mon, 11 Jun 2018 05:05:22 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 97EA76CEB8;
 Mon, 11 Jun 2018 05:05:21 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 791AB16F9F;
 Mon, 11 Jun 2018 05:05:21 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5B55LV9002127;
 Mon, 11 Jun 2018 05:05:21 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5B55LjF002125;
 Mon, 11 Jun 2018 05:05:21 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201806110505.w5B55LjF002125@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: eadler set sender to
 eadler@FreeBSD.org using -f
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 11 Jun 2018 05:05:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334941 - head/usr.bin/top
X-SVN-Group: head
X-SVN-Commit-Author: eadler
X-SVN-Commit-Paths: head/usr.bin/top
X-SVN-Commit-Revision: 334941
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Jun 2018 05:05:22 -0000

Author: eadler
Date: Mon Jun 11 05:05:20 2018
New Revision: 334941
URL: https://svnweb.freebsd.org/changeset/base/334941

Log:
  top(1): handle 0 in "digits" functions

Modified:
  head/usr.bin/top/Makefile
  head/usr.bin/top/utils.c

Modified: head/usr.bin/top/Makefile
==============================================================================
--- head/usr.bin/top/Makefile	Mon Jun 11 02:09:20 2018	(r334940)
+++ head/usr.bin/top/Makefile	Mon Jun 11 05:05:20 2018	(r334941)
@@ -5,7 +5,6 @@
 PROG=	top
 SRCS=	commands.c display.c machine.c screen.c top.c \
 	username.c utils.c
-CFLAGS+= -I ${.OBJDIR}
 MAN=	top.1
 
 .if ${COMPILER_TYPE} == "gcc"

Modified: head/usr.bin/top/utils.c
==============================================================================
--- head/usr.bin/top/utils.c	Mon Jun 11 02:09:20 2018	(r334940)
+++ head/usr.bin/top/utils.c	Mon Jun 11 05:05:20 2018	(r334941)
@@ -124,16 +124,18 @@ itoa7(int val)
 
 /*
  *  digits(val) - return number of decimal digits in val.  Only works for
- *	positive numbers.  If val <= 0 then digits(val) == 0.
+ *	non-negative numbers.  If val <= 0 then digits(val) == 0.
  */
 
-int
+int __pure2
 digits(int val)
 {
     int cnt = 0;
+	if (val == 0) {
+		return 1;
+	}
 
-    while (val > 0)
-    {
+    while (val > 0) {
 		cnt++;
 		val /= 10;
     }