From owner-svn-src-head@freebsd.org  Tue Sep  1 22:37:34 2015
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 988F99C78AF;
 Tue,  1 Sep 2015 22:37:34 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 89698190E;
 Tue,  1 Sep 2015 22:37:34 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t81MbYcO044112;
 Tue, 1 Sep 2015 22:37:34 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t81MbYNW044111;
 Tue, 1 Sep 2015 22:37:34 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201509012237.t81MbYNW044111@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 1 Sep 2015 22:37:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r287389 - head/usr.sbin/sysrc
X-SVN-Group: head
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.20
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: Tue, 01 Sep 2015 22:37:34 -0000

Author: dteske
Date: Tue Sep  1 22:37:33 2015
New Revision: 287389
URL: https://svnweb.freebsd.org/changeset/base/287389

Log:
  Simplify long-option processing
  
  MFC after:	3 days
  X-MFC-to:	stable/10

Modified:
  head/usr.sbin/sysrc/sysrc

Modified: head/usr.sbin/sysrc/sysrc
==============================================================================
--- head/usr.sbin/sysrc/sysrc	Tue Sep  1 22:35:53 2015	(r287388)
+++ head/usr.sbin/sysrc/sysrc	Tue Sep  1 22:37:33 2015	(r287389)
@@ -231,20 +231,16 @@ escape()
 #
 # Check for `--help' and `--version' command-line option
 #
-( # Operate in sub-shell to protect $@ in parent
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		--help) help ;;
-		--version) # see GLOBALS
-			echo "$SYSRC_VERSION"
-			exit 1 ;;
-		-[fRj]) # These flags take an argument
-			shift 1 ;;
-		esac
-		shift 1
-	done
-	exit 0
-) || die
+for arg in "$@"; do
+	case "$arg" in
+	--) break ;;
+	--help) help ;; # NOTREACHED
+	--version) # see GLOBALS
+		echo "$SYSRC_VERSION"
+		exit $FAILURE ;;
+	esac
+done
+unset arg
 
 #
 # Process command-line flags