summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdconfig/usermgmt/share
diff options
context:
space:
mode:
authordteske <dteske@FreeBSD.org>2013-12-07 00:31:01 +0000
committerdteske <dteske@FreeBSD.org>2013-12-07 00:31:01 +0000
commitea67b8239d4b9fc5ec66acb0b55c08b6724c220c (patch)
tree2bf3a34e8912087de92cb6b8e1a3cdfe286c7877 /usr.sbin/bsdconfig/usermgmt/share
parent553f713863e06db13e30699129b501901c7ad3de (diff)
downloadFreeBSD-src-ea67b8239d4b9fc5ec66acb0b55c08b6724c220c.zip
FreeBSD-src-ea67b8239d4b9fc5ec66acb0b55c08b6724c220c.tar.gz
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
Diffstat (limited to 'usr.sbin/bsdconfig/usermgmt/share')
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/group_input.subr9
-rw-r--r--usr.sbin/bsdconfig/usermgmt/share/user_input.subr8
2 files changed, 7 insertions, 10 deletions
diff --git a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
index 2ca141e..e0f47f7 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
@@ -371,15 +371,12 @@ f_dialog_input_group_members()
# pressed ESC or chose Cancel/No
f_dialog_data_sanitize _group_members
+ #
# Convert the newline separated list into a comma-
# separated one so that if the user switches over to
# manual editing, list reflects checklist selections
- _group_members=$( echo "$_group_members" |
- tr '\n' ' ' |
- sed -e 's/[[:space:]]\{1,\}/,/g;s/^,//;s/,$//'
- )
-
- _input="$_group_members"
+ #
+ f_replaceall "$_group_members" "[$IFS]" "," _input
;;
2) # Enter Group Members manually
local p="$msg_group_members ($msg_separated_by_commas)"
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
index bd2fc9b..c95685c 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
@@ -599,8 +599,8 @@ f_dialog_input_expire_password()
4) # Enter value manually
local msg ret_secs
- msg=$( printf "$msg_number_of_seconds_since_epoch" \
- "$( date -r 1 "+%c %Z" )" )
+ f_sprintf msg "$msg_number_of_seconds_since_epoch" \
+ "$( date -r 1 "+%c %Z" )"
# Return to menu if either ESC or Cancel/No
f_dialog_input ret_secs \
@@ -783,8 +783,8 @@ f_dialog_input_expire_account()
4) # Enter value manually
local msg ret_secs
- msg=$( printf "$msg_number_of_seconds_since_epoch" \
- "$( date -r 1 "+%c %Z" )" )
+ f_sprintf msg "$msg_number_of_seconds_since_epoch" \
+ "$( date -r 1 "+%c %Z" )"
# Return to menu if either ESC or Cancel/No
f_dialog_input ret_secs "$msg" \
OpenPOWER on IntegriCloud