From owner-svn-src-head@freebsd.org  Wed Aug 22 09:49:39 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 7CE35108378D;
 Wed, 22 Aug 2018 09:49:39 +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 24C618C899;
 Wed, 22 Aug 2018 09:49:39 +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 018FE114C4;
 Wed, 22 Aug 2018 09:49:39 +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 w7M9ncTm058444;
 Wed, 22 Aug 2018 09:49:38 GMT (envelope-from eadler@FreeBSD.org)
Received: (from eadler@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7M9ncmU058443;
 Wed, 22 Aug 2018 09:49:38 GMT (envelope-from eadler@FreeBSD.org)
Message-Id: <201808220949.w7M9ncmU058443@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: Wed, 22 Aug 2018 09:49:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r338187 - 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: 338187
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.27
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: Wed, 22 Aug 2018 09:49:39 -0000

Author: eadler
Date: Wed Aug 22 09:49:38 2018
New Revision: 338187
URL: https://svnweb.freebsd.org/changeset/base/338187

Log:
  top(1): issue warning on invalid delay
  
  When top -sH is run it continually updates. It should issue an warning
  instead.
  
  Reported by:	jmg
  PR:		230803

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

Modified: head/usr.bin/top/top.c
==============================================================================
--- head/usr.bin/top/top.c	Wed Aug 22 09:27:40 2018	(r338186)
+++ head/usr.bin/top/top.c	Wed Aug 22 09:49:38 2018	(r338187)
@@ -21,6 +21,7 @@
 #include <sys/signal.h>
 
 #include <assert.h>
+#include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <jail.h>
@@ -253,6 +254,7 @@ main(int argc, char *argv[])
     char *order_name = NULL;
     int order_index = 0;
     fd_set readfds;
+	char *nptr;
 
     /* set the buffer for stdout */
 #ifdef DEBUG
@@ -386,7 +388,12 @@ main(int argc, char *argv[])
 	      }
 
 		  case 's':
-			delay = strtod(optarg, NULL);
+			delay = strtod(optarg, &nptr);
+			if (nptr == optarg) {
+				warnx("warning: invalid delay");
+				delay = 2;
+				warnings++;
+			}
 			if (delay < 0) {
 				fprintf(stderr,
 						"%s: warning: seconds delay should be positive -- using default\n",