svn commit: r290310 - stable/10/usr.sbin/sysrc

[Devin Teske]

Author: dteske
Date: Mon Nov  2 22:54:45 2015
New Revision: 290310
URL: https://svnweb.freebsd.org/changeset/base/290310

Log:
  MFC r287389: Simplify long-option processing

Modified:
  stable/10/usr.sbin/sysrc/sysrc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/sysrc/sysrc
==============================================================================
--- stable/10/usr.sbin/sysrc/sysrc	Mon Nov  2 22:49:39 2015	(r290309)
+++ stable/10/usr.sbin/sysrc/sysrc	Mon Nov  2 22:54:45 2015	(r290310)
@@ -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