MFC r259054:

Performance and debugging enhancements:
+ Remove UNAME_P=$(...) from startup/misc -- already supplied by common.subr
+ Use f_getvar instead of $(eval echo \$$var) -- f_getvar is sub-shell free
+ Add `-e' and `-k var' options to f_eval_catch -- increasing use-cases
+ Use f_eval_catch to display errors on failure -- reducing duplicated code
+ Use f_eval_catch when we need output from a command -- improving debugging
+ Optimize f_isinter of strings.subr for performance -- now sub-shell free
+ Improve error checking on pidfiles -- using f_eval_catch and f_isinteger
+ Use $var_to_set arg of f_ifconfig_{inet,netmask} -- eliminate sub-shells
+ Use f_sprintf instead of $(printf ...) -- consolidate sub-shells
+ Use $var_to_set arg of f_route_get_default -- eliminate sub-shells
+ Add f_count to replace $(set -- ...;echo $#) -- eliminate sub-shells
+ Add f_count_ifs to replace $(IFS=x;set -- ...;echo $#) -- no sub-shells
+ Replace var="$var${var:+ }..." in loops with var="$var ..." with a follow-
  up var="${var# }" to trim leading whitespace -- optimize loops
+ Use $var_to_set arg of f_resolv_conf_nameservers -- eliminate sub-shells
+ Comments for the f_eval_catch function
+ Remove a duplicate `local ... desc ...' in f_device_get_all of device.subr
+ Use $var_to_set arg of f_device_capacity -- eliminate sub-shells
+ Whitespace fixes in f_dialog_init of dialog.subr
+ Optimize f_inet_atoi of media/tcpip.subr for performance -- sub-shell free
+ In several cases, send stderr to /dev/null -- clean up runtime execution
+ Change f_err of common.subr to go to program stderr not terminal stderr,
  allowing redirection of output from functions that use f_err
+ Disable debugging when using f_getvar to get variable argument to
  f_startup_rcconf_map_expand of startup/rcconf.subr
+ Use f_replace_all instead of $(echo ... | tr | sed) -- performance
+ Add a $var_to_set option to f_index_{file,menusel_{command,keyword}} of
  common.subr -- centralize sub-shells

1 files changed, 34 insertions, 67 deletions

diff --git a/usr.sbin/bsdconfig/startup/misc b/usr.sbin/bsdconfig/startup/misc
index 738f730..a792daf 100755
--- a/usr.sbin/bsdconfig/startup/misc
+++ b/usr.sbin/bsdconfig/startup/misc
@@ -38,15 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
-############################################################ GLOBALS
-
-#
-# Operating environment
-#
-UNAME_P=$( uname -p ) # Processor Architecture (i.e. i386)
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -346,87 +339,61 @@ while :; do
 
 	case "$mtag" in
 	"X $msg_exit") break ;;
-	?" [X] "*) toggled=1 ;;
-	        *) toggled=
+	?" [X] "*) toggled=1 reverse=NO ;;
+	        *) toggled= reverse=YES
 	esac
 
 	case "$mtag" in
 	# Simple On/Off toggle bits
 	?" ["?"] $msg_apm")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set apm_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set apm_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set apm_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_named")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set named_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set named_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set named_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_accounting")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set accounting_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set accounting_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set accounting_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_lpd")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set lpd_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set lpd_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set lpd_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_sco")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set ibcs2_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set ibcs2_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set ibcs2_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_svr4")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set svr4_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set svr4_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set svr4_enable "%s"' "$reverse" ;;
 	# Multi-variable On/Off toggle bits
 	?" ["?"] $msg_nis_client")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set nis_client_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set nis_client_enable YES 2>&1 ) \
-			&& err=$( f_sysrc_set rpcbind_enable YES 2>&1 )
-		fi
-		;;
+		if f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nis_client_enable "%s"' "$reverse"
+		then
+			[ "$reverse" = "NO" ] || f_eval_catch -dk err "$0" \
+				f_sysrc_set 'f_sysrc_set rpcbind_enable YES'
+		fi ;;
 	?" ["?"] $msg_nis_server")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set nis_server_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set nis_server_enable YES 2>&1 ) \
-			&& err=$( f_sysrc_set rpcbind_enable YES 2>&1 )
-		fi
-		;;
+		if f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nis_server_enable "%s"' "$reverse"
+		then
+			[ "$reverse" = "NO" ] || f_eval_catch -dk err "$0" \
+				f_sysrc_set 'f_sysrc_set rpcbind_enable YES'
+		fi ;;
 	# Checkboxes for non-boolean options
 	?" ["?"] $msg_nis_domainname")
 		dialog_input_value "$msg_nis_domainname_desc" \
 		                   "$( f_sysrc_get nisdomainname )" || continue
-		err=$( f_sysrc_set nisdomainname "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nisdomainname "%s"' "$value" ;;
 	?" ["?"] $msg_startup_dirs")
 		dialog_input_value "$msg_startup_dirs_desc" \
 		                   "$( f_sysrc_get local_startup )" || continue
-		err=$( f_sysrc_set local_startup "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set local_startup "%s"' "$value" ;;
 	?" ["?"] $msg_named_flags")
 		dialog_input_value "$msg_named_flags_desc" \
 		                   "$( f_sysrc_get named_flags )" || continue
-		err=$( f_sysrc_set named_flags "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set named_flags "%s"' "$value" ;;
 	esac
 
 	[ $? -eq $DIALOG_OK ] || f_dialog_msgbox "$err\n"