aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin Teske <dteske@FreeBSD.org>2015-09-01 22:37:33 +0000
committerDevin Teske <dteske@FreeBSD.org>2015-09-01 22:37:33 +0000
commitb98a26bf4319b4d91369a05d2010b1b0ecac75fd (patch)
treeefa8734d17bd61d15ca9e5067d339fe484ba5034
parentded3e7f08e465f3abef2491a3ab5940291489453 (diff)
downloadsrc-b98a26bf4319b4d91369a05d2010b1b0ecac75fd.tar.gz
src-b98a26bf4319b4d91369a05d2010b1b0ecac75fd.zip
Simplify long-option processing
MFC after: 3 days X-MFC-to: stable/10
Notes
Notes: svn path=/head/; revision=287389
-rw-r--r--usr.sbin/sysrc/sysrc24
1 files changed, 10 insertions, 14 deletions
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index 4ee903180f7d..c672dd1bf412 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -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