Perform some code consolidation and add some additional error

checking/reporting. (similar to SVN revisions 251919 and 251928)

2 files changed, 12 insertions, 8 deletions

diff --git a/usr.sbin/bsdconfig/startup/include/messages.subr b/usr.sbin/bsdconfig/startup/include/messages.subr
index 26253de..87bde26 100644
--- a/usr.sbin/bsdconfig/startup/include/messages.subr
+++ b/usr.sbin/bsdconfig/startup/include/messages.subr
@@ -104,6 +104,7 @@ msg_startup_dirs_desc="Set the list of dirs to look for startup scripts"
 msg_svr4="SVR4"
 msg_svr4_desc="This host wants to be able to run SVR4 binaries."
 msg_toggle_startup_services="Toggle Startup Services"
+msg_unknown_startup_menu_selection="Unknown startup menu selection"
 msg_value_required="Value Required"
 msg_view_details="View Details"
 msg_view_details_desc="Choose view details"
diff --git a/usr.sbin/bsdconfig/startup/startup b/usr.sbin/bsdconfig/startup/startup
index 55a78a6..e539d00 100755
--- a/usr.sbin/bsdconfig/startup/startup
+++ b/usr.sbin/bsdconfig/startup/startup
@@ -118,16 +118,19 @@ while :; do
 	dialog_menu_main || f_die
 	f_dialog_menutag_fetch mtag
 
+	command=
 	case "$mtag" in
-	X) # Exit
-		break ;;
-	1) # Toggle Startup Services
-		$BSDCFG_LIBE/$APP_DIR/rcvar ${USE_XDIALOG:+-X} ;;
-	2) # View/Edit Startup Configuration
-		$BSDCFG_LIBE/$APP_DIR/rcconf ${USE_XDIALOG:+-X} ;;
-	3) # Miscellaneous Startup Services
-		$BSDCFG_LIBE/$APP_DIR/misc ${USE_XDIALOG:+-X} ;;
+	X) break ;;
+	1) command=rcvar  ;; # Toggle Startup Services
+	2) command=rcconf ;; # View/Edit Startup Configuration
+	3) command=misc   ;; # Miscellaneous Startup Services
 	esac
+
+	if [ "$command" ]; then
+		$BSDCFG_LIBE/$APP_DIR/$command ${USE_XDIALOG:+-X} ;;
+	else
+		f_die 1 "$msg_unknown_startup_menu_selection"
+	fi
 done
 
 exit $SUCCESS