d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1127aea3e7
freebsd-nq/usr.sbin/bsdconfig/startup/rcconf
Devin Teske d4ae33f072 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
2013-12-07 00:31:01 +00:00

265 lines
7.6 KiB
Bash
Executable File
Raw Blame History

#!/bin/sh
#-
# Copyright (c) 2012-2013 Devin Teske
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
# $FreeBSD$
#
############################################################ INCLUDES
BSDCFG_SHARE="/usr/share/bsdconfig"
. $BSDCFG_SHARE/common.subr || exit 1
f_dprintf "%s: loading includes..." "$0"
f_include $BSDCFG_SHARE/dialog.subr
f_include $BSDCFG_SHARE/mustberoot.subr
f_include $BSDCFG_SHARE/sysrc.subr
f_include $BSDCFG_SHARE/startup/rcconf.subr
BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
pgm="${ipgm:-$pgm}"
############################################################ GLOBALS
#
# Global map/menu-list for the main menu
#
RCCONF_MAP=
_RCCONF_MAP=
#
# Options
#
# Inherit SHOW_DESC value if set, otherwise default to 1
[ "${SHOW_DESC+set}" ] || SHOW_DESC=1
# Selectively inherit SHOW_* value (in order of preference)
if [ "$SHOW_DEFAULT_VALUE" ]; then
SHOW_DEFAULT_VALUE=1
SHOW_CONFIGURED=
SHOW_VALUE=
elif [ "$SHOW_CONFIGURED" ]; then
SHOW_DEFAULT_VALUE=
SHOW_CONFIGURED=1
SHOW_VALUE=
else
SHOW_DEFAULT_VALUE=
SHOW_CONFIGURED=
SHOW_VALUE=1
fi
############################################################ FUNCTIONS
# dialog_menu_main
#
# Display the dialog(1)-based application main menu.
#
dialog_menu_main()
{
local prompt=
local menu_list="
'X $msg_exit' '$msg_exit_desc'
${SHOW_DESC:+'$msg_exit_this_menu'}
'> $msg_add_new' '$msg_add_new_desc'
${SHOW_DESC:+'$msg_add_new_help'}
'> $msg_delete' '$msg_delete_desc'
${SHOW_DESC:+'$msg_delete_help'}
${USE_XDIALOG:+
'> $msg_view_details' '$msg_view_details_desc'
${SHOW_DESC:+'$msg_view_details_help'}
}
" # END-QUOTE
local defaultitem= # Calculated below
local hline="$hline_arrows_tab_enter"
if [ ! "$_RCCONF_MAP" ]; then
# Genreate RCCONF_MAP of `var desc ...' per-line
f_dialog_info "$msg_creating_rcconf_map"
f_startup_rcconf_map RCCONF_MAP
export RCCONF_MAP
# Generate _${var}_desc variables from $RCCONF_MAP
f_startup_rcconf_map_expand RCCONF_MAP
export _RCCONF_MAP=1
fi
# Show infobox for modes that take a while to calculate/display
[ "$SHOW_DEFAULT_VALUE" -o "$SHOW_CONFIGURED" ] &&
f_dialog_info "$msg_creating_menu_list"
menu_list="$menu_list $(
. "$RC_DEFAULTS" > /dev/null
source_rc_confs > /dev/null
var_list=$( f_startup_rcconf_list )
for var in $var_list; do
eval export $var
[ "$SHOW_DEFAULT_VALUE" ] && export \
_${var}_default="$( f_sysrc_get_default $var )"
[ "$SHOW_CONFIGURED" ] && export \
_${var}_file="$( f_sysrc_find $var )"
done
export SHOW_VALUE SHOW_DESC SHOW_DEFAULT_VALUE SHOW_CONFIGURED
export msg_default_value
echo "$var_list" | awk '
BEGIN {
prefix = ""
}
{
cur_prefix = tolower(substr($1, 1, 1))
printf "'\''"
if ( prefix != cur_prefix )
prefix = cur_prefix
else
printf " "
var = $1
printf "%s'\'' '\''", var
if ( ENVIRON["SHOW_DEFAULT_VALUE"] ) {
default = ENVIRON["_" var "_default"]
gsub(/'\''/, "'\''\\'\'\''", default)
value = ENVIRON[var]
gsub(/'\''/, "'\''\\'\'\''", value)
printf ENVIRON["msg_default_value"] "; %s",
default, value
} else if ( ENVIRON["SHOW_CONFIGURED"] ) {
printf "%s", ENVIRON["_" var "_file"]
} else { # SHOW_VALUE (default behavior)
value = ENVIRON[var]
gsub(/'\''/, "'\''\\'\'\''", value)
printf "%s", value
}
printf "'\''"
if ( ENVIRON["SHOW_DESC"] ) {
desc = ENVIRON["_" var "_desc"]
gsub(/'\''/, "'\''\\'\'\''", desc)
printf " '\''%s'\''", desc
}
printf "\n"
}'
)"
set -f # set noglob because descriptions in the $menu_list may contain
# `*' and get expanded by dialog(1) (doesn't affect Xdialog(1)).
# This prevents dialog(1) from expanding wildcards in help line.
local height width rows
eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
# Obtain default-item from previously stored selection
f_dialog_default_fetch defaultitem
local menu_choice
menu_choice=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--help-button \
--help-label \"\$msg_details\" \
${SHOW_DESC:+--item-help} \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?
f_dialog_data_sanitize menu_choice
f_dialog_menutag_store "$menu_choice"
# Only update default-item on success
[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
return $retval
}
############################################################ MAIN
# Incorporate rc-file if it exists
[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
#
# Process command-line arguments
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))
#
# Initialize
#
f_dialog_title "$msg_view_edit_startup_configuration"
f_dialog_backtitle "${ipgm:+bsdconfig }$pgm"
f_mustberoot_init
#
# Launch application main menu
#
while :; do
dialog_menu_main
retval=$?
f_dialog_menutag_fetch mtag
if [ "$USE_XDIALOG" ]; then
case "$mtag" in
"> $msg_view_details")
f_dialog_input_view_details
continue
esac
elif [ $retval -eq $DIALOG_HELP ]; then
# The ``Help'' button (labeled "Details") was pressed
f_dialog_input_view_details
continue
fi
[ $retval -eq $DIALOG_OK ] || f_die
case "$mtag" in
"X $msg_exit") break ;;
"> $msg_add_new") $BSDCFG_LIBE/$APP_DIR/rcadd ${USE_XDIALOG:+-X} ;;
"> $msg_delete")
# rcdelete has a similar interface that can inherit the below:
export SHOW_VALUE SHOW_DESC SHOW_DEFAULT_VALUE SHOW_CONFIGURED
$BSDCFG_LIBE/$APP_DIR/rcdelete ${USE_XDIALOG:+-X}
;;
*) # Anything else is a variable to edit
$BSDCFG_LIBE/$APP_DIR/rcedit ${USE_XDIALOG:+-X} "${mtag# }"
esac
done
exit $SUCCESS
################################################################################
# END
################################################################################
Reference in New Issue View Git Blame Copy Permalink