From owner-svn-src-all@freebsd.org  Thu Apr  5 15:00:09 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7AF70F8BB12;
 Thu,  5 Apr 2018 15:00:09 +0000 (UTC)
 (envelope-from rgrimes@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 2947580373;
 Thu,  5 Apr 2018 15:00:09 +0000 (UTC)
 (envelope-from rgrimes@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 2000A241DF;
 Thu,  5 Apr 2018 15:00:09 +0000 (UTC)
 (envelope-from rgrimes@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w35F08J4059483;
 Thu, 5 Apr 2018 15:00:08 GMT (envelope-from rgrimes@FreeBSD.org)
Received: (from rgrimes@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w35F08kG059482;
 Thu, 5 Apr 2018 15:00:08 GMT (envelope-from rgrimes@FreeBSD.org)
Message-Id: <201804051500.w35F08kG059482@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rgrimes set sender to
 rgrimes@FreeBSD.org using -f
From: "Rodney W. Grimes" <rgrimes@FreeBSD.org>
Date: Thu, 5 Apr 2018 15:00:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332075 - head/sbin/reboot
X-SVN-Group: head
X-SVN-Commit-Author: rgrimes
X-SVN-Commit-Paths: head/sbin/reboot
X-SVN-Commit-Revision: 332075
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2018 15:00:09 -0000

Author: rgrimes
Date: Thu Apr  5 15:00:08 2018
New Revision: 332075
URL: https://svnweb.freebsd.org/changeset/base/332075

Log:
  Exit with usage when extra arguments are on command line
  preventing mistakes such as "halt 0p" for "halt -p".
  Approved by:	bde (mentor), phk (mentor)
  MFC after:	1 week

Modified:
  head/sbin/reboot/reboot.c

Modified: head/sbin/reboot/reboot.c
==============================================================================
--- head/sbin/reboot/reboot.c	Thu Apr  5 14:55:44 2018	(r332074)
+++ head/sbin/reboot/reboot.c	Thu Apr  5 15:00:08 2018	(r332075)
@@ -116,6 +116,8 @@ main(int argc, char *argv[])
 		}
 	argc -= optind;
 	argv += optind;
+	if (argc != 0)
+		usage();
 
 	if ((howto & (RB_DUMP | RB_HALT)) == (RB_DUMP | RB_HALT))
 		errx(1, "cannot dump (-d) when halting; must reboot instead");