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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to