From fd3d4fec40f196388eec4c6ea805cd0faae8a3a5 Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 20 Jun 2013 05:48:08 +0000
Subject: [PATCH] When the fall-back of a case-statement is the last thing
 executed in a while-loop _and_ all prior matches in the same case-statement
 either break or continue, we can safely break the fall-back out of the
 case-statement. This should improve readability and allow for longer-lines by
 reducing the level of indentation by-one for the fall-back case.

---
 usr.sbin/bsdconfig/bsdconfig          | 26 +++++++++++---------------
 usr.sbin/bsdconfig/startup/rcadd      | 13 ++++++-------
 usr.sbin/bsdconfig/usermgmt/groupedit | 13 ++++++-------
 usr.sbin/bsdconfig/usermgmt/userdel   | 13 ++++++-------
 usr.sbin/bsdconfig/usermgmt/useredit  | 13 ++++++-------
 5 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig
index fb728f74b83..959efa0bac1 100755
--- a/usr.sbin/bsdconfig/bsdconfig
+++ b/usr.sbin/bsdconfig/bsdconfig
@@ -330,25 +330,21 @@ while :; do
 	fi
 
 	case "$mtag" in
-	X) # Exit
-	   break
-	   ;;
-
+	X) break ;;
 	1) # Usage
 	   f_show_help "$USAGE_HELPFILE"
 	   continue
-	   ;;
-
-	*) # Dynamically loaded menuitem
-	   f_getvar menu_program$mtag menu_program
-	   case "$menu_program" in
-	   /*) cmd="$menu_program";;
-	    *) cmd="$BSDCFG_LIBE/$menu_program"
-	   esac
-	   f_dprintf "cmd=[%s]" "$cmd"
-	   $cmd ${USE_XDIALOG:+-X}
-
 	esac
+
+	# Anything else is a dynamically loaded menuitem
+
+	f_getvar menu_program$mtag menu_program
+	case "$menu_program" in
+	/*) cmd="$menu_program";;
+	 *) cmd="$BSDCFG_LIBE/$menu_program"
+	esac
+	f_dprintf "cmd=[%s]" "$cmd"
+	$cmd ${USE_XDIALOG:+-X}
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/startup/rcadd b/usr.sbin/bsdconfig/startup/rcadd
index eb4c3d9ef1c..4a591f49f87 100755
--- a/usr.sbin/bsdconfig/startup/rcadd
+++ b/usr.sbin/bsdconfig/startup/rcadd
@@ -127,13 +127,12 @@ while :; do
 			f_dialog_menutag_fetch mtag
 			defaultitem="$mtag"
 
-			case "$mtag" in
-			"X $msg_exit" ) break ;;
-			*) # Anything else is a directive
-				rcvar="${mtag# }"
-				$BSDCFG_LIBE/$APP_DIR/rcedit \
-					${USE_XDIALOG:+-X} "$rcvar"
-			esac
+			[ "$mtag" = "X $msg_exit" ] && break
+
+			# Anything else is a directive
+
+			$BSDCFG_LIBE/$APP_DIR/rcedit ${USE_XDIALOG:+-X} \
+			                             "${mtag# }"
 		done
 		;;
 	2) # Add Custom
diff --git a/usr.sbin/bsdconfig/usermgmt/groupedit b/usr.sbin/bsdconfig/usermgmt/groupedit
index eab3bbf4bc9..032d656f8b6 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupedit
+++ b/usr.sbin/bsdconfig/usermgmt/groupedit
@@ -77,13 +77,12 @@ while :; do
 
 	[ $retval -eq 0 ] || f_die
 
-	case "$mtag" in
-	"X $msg_exit") break ;;
-	*) # anything else is a group name
-	   $BSDCFG_LIBE/$APP_DIR/groupinput \
-	   	${USE_XDIALOG:+-X} mode="Edit/View" group="$mtag"
-	   ;;
-	esac
+	[ "$mtag" = "X $msg_exit" ] && break
+
+	# Anything else is a group name
+
+	$BSDCFG_LIBE/$APP_DIR/groupinput \
+		${USE_XDIALOG:+-X} mode="Edit/View" group="$mtag"
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/usermgmt/userdel b/usr.sbin/bsdconfig/usermgmt/userdel
index 2a34ba1c3d5..73357bd88a1 100755
--- a/usr.sbin/bsdconfig/usermgmt/userdel
+++ b/usr.sbin/bsdconfig/usermgmt/userdel
@@ -77,13 +77,12 @@ while :; do
 
 	[ $retval -eq 0 ] || f_die
 
-	case "$mtag" in
-	"X $msg_exit") break ;;
-	*) # anything else is a userid
-	   $BSDCFG_LIBE/$APP_DIR/userinput \
-	   	${USE_XDIALOG:+-X} mode="Delete" user="$mtag"
-	   ;;
-	esac
+	[ "$mtag" = "X $msg_exit" ] && break
+
+	# Anything else is a userid
+
+	$BSDCFG_LIBE/$APP_DIR/userinput \
+		${USE_XDIALOG:+-X} mode="Delete" user="$mtag"
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/usermgmt/useredit b/usr.sbin/bsdconfig/usermgmt/useredit
index 0e8fd1228ad..e34fd2ecad3 100755
--- a/usr.sbin/bsdconfig/usermgmt/useredit
+++ b/usr.sbin/bsdconfig/usermgmt/useredit
@@ -77,13 +77,12 @@ while :; do
 
 	[ $retval -eq 0 ] || f_die
 
-	case "$mtag" in
-	"X $msg_exit") break ;;
-	*) # anything else is a userid
-	   $BSDCFG_LIBE/$APP_DIR/userinput \
-	   	${USE_XDIALOG:+-X} mode="Edit/View" user="$mtag"
-	   ;;
-	esac
+	[ "$mtag" = "X $msg_exit" ] && break
+
+	# Anything else is a userid
+
+	$BSDCFG_LIBE/$APP_DIR/userinput \
+		${USE_XDIALOG:+-X} mode="Edit/View" user="$mtag"
 done
 
 exit $SUCCESS