d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve portion of the dialog(1) API in dialog.subr responsible for

Browse Source 
calculating widget sizes. Instead of forking a sub-shell to calculate the
optimum size for a widget, use a byRef style call-out to set variables in
the parent namespace. For example, instead of:

	size=$( f_dialog_buttonbox_size title btitle msg )
	$DIALOG --title title --backtitle btitle --msgbox msg $size

The new API replaces the above with the following:

	f_dialog_buttonbox_size height width title btitle msg
	$DIALOG --title title --backtitle btitle --msgbox msg $height $width

This reduces the number of forks, improves performance, and makes the code
more readable by revealing the argument-order for widget sizing. It also
makes performing minor adjustments to the calculated values easier as
you no longer have to split-out the response (which required knowledge of
ordering so was counter-intuitive).
This commit is contained in:
Devin Teske 2013-05-31 19:07:17 +00:00
parent f2e6a017d5
commit 74036c4de9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=251190
38 changed files with 1725 additions and 1350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/bsdconfig/bsdconfig
View File

@ -145,7 +145,7 @@ dialog_menu_main()
local title="$DIALOG_TITLE"
local btitle="$DIALOG_BACKTITLE"
local prompt="$msg_menu_text"
local menu_list size
local menu_list
menu_list="
'X' '$msg_exit' '$msg_exit_bsdconfig'
@ -179,12 +179,13 @@ dialog_menu_main()
index=$(( $index + 1 ))
done
size=$( eval f_dialog_menu_with_help_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\" \
$menu_list )
local height width rows
eval f_dialog_menu_with_help_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -198,7 +199,9 @@ dialog_menu_main()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size $menu_list \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?

18
usr.sbin/bsdconfig/console/console
View File

@ -48,7 +48,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline="$hline_configure_system_console_settings"
local prompt="$msg_console_menu_text"
@ -62,12 +62,13 @@ dialog_menu_main()
'7 $msg_ttys' '$msg_choose_console_terminal_type'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -77,7 +78,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/console/font
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_choose_a_font"
local prompt="$msg_font_menu_text"
@ -70,12 +70,13 @@ dialog_menu_main()
'e $msg_swiss' '$msg_swiss_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get font8x8 )" in
[Nn][Oo]|'') defaultitem="1 $msg_none";;
@ -102,7 +103,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/console/keymap
View File

@ -77,7 +77,7 @@ KEYMAP_NAMES="
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_choose_a_keyboard_map"
local prompt="$msg_keymap_menu_text"
@ -110,12 +110,13 @@ dialog_menu_main()
}'
)
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get keymap )" in
be.iso) defaultitem="$msg_belgian";;
@ -200,7 +201,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/console/repeat
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_choose_a_keyboard_repeat_rate"
local prompt="$msg_repeat_menu_text"
@ -60,12 +60,13 @@ dialog_menu_main()
'$msg_fast' '$msg_fast_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get keyrate )" in
slow) defaultitem="$msg_slow";;
@ -82,7 +83,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/console/saver
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_choose_a_screen_saver"
local prompt="$msg_saver_menu_text"
@ -70,12 +70,13 @@ dialog_menu_main()
'$msg_timeout' '$msg_timeout_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get saver )" in
blank) defaultitem="1 $msg_blank" ;;
@ -101,7 +102,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/console/screenmap
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_choose_a_screen_map"
local prompt="$msg_screenmap_menu_text"
@ -62,12 +62,13 @@ dialog_menu_main()
'6 $msg_koi8_u_to_ibm866u' '$msg_koi8_u_to_ibm866u_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get scrnmap )" in
[Nn][Oo]|'') defaultitem="1 $msg_none" ;;
@ -86,7 +87,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

17
usr.sbin/bsdconfig/console/ttys
View File

@ -72,16 +72,16 @@ TTY_MENU_LIST="
#
dialog_menu_main()
{
local size
local hline="$hline_choose_a_terminal_type"
local prompt="$msg_ttys_menu_text"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$TTY_MENU_LIST )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$TTY_MENU_LIST
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -90,7 +90,8 @@ dialog_menu_main()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$TTY_MENU_LIST \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/mouse/disable
View File

@ -86,16 +86,14 @@ f_sysrc_delete moused_flags || f_die
f_dialog_title "$msg_message"
hline="$hline_press_enter_or_space"
prompt="$msg_mouse_daemon_is_disabled"
size=$( f_dialog_buttonbox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$prompt" )
eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$prompt\" $size
f_dialog_buttonbox_size height width \
"$DIALOG_TITLE" "$DIALOG_BACKTITLE" "$prompt"
$DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--msgbox "$prompt" $height $width
exit $SUCCESS

18
usr.sbin/bsdconfig/mouse/mouse
View File

@ -48,7 +48,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline=""
local prompt="$msg_menu_text"
@ -61,12 +61,13 @@ dialog_menu_main()
'6 $msg_disable' '$msg_disable_the_mouse_daemon'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -76,7 +77,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/mouse/port
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline=""
local prompt="$msg_port_menu_text"
@ -62,12 +62,13 @@ dialog_menu_main()
'6 $msg_busmouse' '$msg_busmouse_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get moused_port )" in
/dev/psm0) defaultitem="1 $msg_ps2" ;;
@ -86,7 +87,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/mouse/type
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline=""
local prompt="$msg_protocol_menu_text"
@ -66,12 +66,13 @@ dialog_menu_main()
'A $msg_thinkingmouse' '$msg_thinkingmouse_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get moused_type )" in
auto) defaultitem="1 $msg_auto" ;;
@ -94,7 +95,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

19
usr.sbin/bsdconfig/networking/networking
View File

@ -48,7 +48,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline="$hline_arrows_tab_enter"
menu_list="
@ -59,12 +59,13 @@ dialog_menu_main()
'4' '$msg_dns_nameservers'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -74,7 +75,9 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\" $size $menu_list \
--menu \"\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?

35
usr.sbin/bsdconfig/networking/share/device.subr
View File

@ -142,14 +142,15 @@ f_dialog_menu_netdev()
#
# Ask user to select an interface
#
local prompt size
local prompt
prompt="$msg_select_network_interface"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$interfaces )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$interfaces
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -158,7 +159,8 @@ f_dialog_menu_netdev()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$interfaces \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -175,7 +177,7 @@ f_dialog_menu_netdev()
f_dialog_menu_netdev_edit()
{
local interface="$1" ipaddr="$2" netmask="$3" options="$4" dhcp="$5"
local prompt menu_list size
local prompt menu_list height width rows
#
# Create a duplicate set of variables for change-tracking...
@ -216,12 +218,12 @@ f_dialog_menu_netdev_edit()
'4 $msg_netmask' '$netmask'
'5 $msg_options' '$options'
"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -233,7 +235,8 @@ f_dialog_menu_netdev_edit()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

19
usr.sbin/bsdconfig/networking/share/resolv.subr
View File

@ -393,10 +393,12 @@ f_dialog_input_nameserver()
#
f_dialog_menu_nameservers()
{
local height width rows
local opt_exit="$msg_return_to_previous_menu"
local opt_add="$msg_add_nameserver"
local hline="$hline_arrows_tab_enter"
local prompt size defaultitem=
local prompt defaultitem=
#
# Loop forever until the user has finished configuring nameservers
@ -427,12 +429,12 @@ f_dialog_menu_nameservers()
#
# Display configuration-edit menu
#
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -441,7 +443,8 @@ f_dialog_menu_nameservers()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

62
usr.sbin/bsdconfig/password/share/password.subr
View File

@ -46,23 +46,25 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
f_dialog_input_password()
{
local hline="$hline_alnum_punc_tab_enter"
local msg size rmsg rsize
local msg rmsg
msg=$( printf "$msg_enter_new_password" )
size=$( f_dialog_inputbox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"" \
"$hline" )
local height1 width1
f_dialog_inputbox_size height1 width1 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"" \
"$hline"
rmsg=$( printf "$msg_reenter_password" )
rsize=$( f_dialog_inputbox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$rmsg" \
"" \
"$hline" )
local height2 width2
f_dialog_inputbox_size height2 width2 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$rmsg" \
"" \
"$hline"
#
# Loop until the user provides taint-free/valid input
@ -70,14 +72,15 @@ f_dialog_input_password()
local retval _password1 _password2
while :; do
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$msg\" $size \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$msg" \
$height1 $width1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -88,14 +91,15 @@ f_dialog_input_password()
# Return if user has either pressed ESC or chosen Cancel/No
[ $retval -eq $SUCCESS ] || return $retval
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$rmsg\" $rsize \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$rmsg" \
$height2 $width2 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/security/kern_securelevel
View File

@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size defaultitem=
local menu_list defaultitem=
local hline="$hline_select_securelevel_to_operate_at"
local prompt="$msg_securelevels_menu_text"
@ -62,12 +62,13 @@ dialog_menu_main()
'$msg_network_secure' '$msg_network_secure_mode'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
case "$( f_sysrc_get kern_securelevel_enable )" in
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
@ -91,7 +92,8 @@ dialog_menu_main()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/security/security
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size mark=" " defaultitem=
local menu_list mark=" " defaultitem=
local hline="$hline_arrows_tab_enter"
local prompt="$msg_menu_text"
@ -97,12 +97,13 @@ dialog_menu_main()
# Update default-item if appropriate
[ "$ditem" = 3 ] && defaultitem="3 [$mark] $msg_nfs_port"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -112,7 +113,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

17
usr.sbin/bsdconfig/share/device.subr
View File

@ -607,13 +607,13 @@ f_device_menu()
menu_list="$menu_list '$dev' '$desc'"
done
local size mtag
size=$( eval f_dialog_menu_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local errexit=
case $- in *e*) errexit=1; esac
@ -630,7 +630,8 @@ f_device_menu()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
} \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

1768
usr.sbin/bsdconfig/share/dialog.subr
View File

File diff suppressed because it is too large Load Diff

35
usr.sbin/bsdconfig/share/media/any.subr
View File

@ -69,7 +69,7 @@ f_media_get_type()
f_dialog_title_restore
local prompt="$msg_choose_installation_media_description"
local hline="$hline_choose_help_for_more_information_on_media_types"
local menu_list size
local menu_list
menu_list="
'1 $msg_cd_dvd' '$msg_install_from_a_freebsd_cd_dvd'
@ -86,26 +86,29 @@ f_media_get_type()
'X $msg_options' '$msg_view_set_various_media_options'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
while :; do
dialog_menu=$( eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--help-button \
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--menu \"\$prompt\" $size $menu_list \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--help-button \
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?

17
usr.sbin/bsdconfig/share/media/ftp.subr
View File

@ -229,13 +229,13 @@ f_dialog_menu_media_ftp()
' $msg_usa #15' 'ftp15.us.freebsd.org'
" # END-QUOTE
local size
size=$( eval f_dialog_menu_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu retval mtag value
dialog_menu=$( eval $DIALOG \
@ -244,7 +244,8 @@ f_dialog_menu_media_ftp()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

39
usr.sbin/bsdconfig/share/media/options.subr
View File

@ -55,7 +55,7 @@ f_media_options_menu()
f_dialog_title_restore
local prompt=""
local hline="$hline_arrows_tab_enter"
local menu_list size cp
local menu_list cp
#
# A hack so that the dialogs below are always interactive in a script
@ -200,27 +200,30 @@ f_media_options_menu()
'$msg_reset_all_values_to_startup_defaults'
" # END-QUOTE
size=$( eval f_dialog_menu_with_help_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_with_help_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--hline \"\$hline\" \
--item-help \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_done\" \
--help-button \
--help-label \"\$msg_help\" \
--default-item \"\$defaultitem\" \
${USE_XDIALOG:+--help \"\"} \
--menu \"\$prompt\" $size $menu_list \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--hline \"\$hline\" \
--item-help \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_done\" \
--help-button \
--help-label \"\$msg_help\" \
--default-item \"\$defaultitem\" \
${USE_XDIALOG:+--help \"\"} \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?

59
usr.sbin/bsdconfig/share/mustberoot.subr
View File

@ -77,7 +77,7 @@ SECURE_DIVULGE_UNKNOWN_USER=
#
f_become_root_via_sudo()
{
local msg hline size
local msg hline height width rows
[ "$( id -u )" = "0" ] && return $SUCCESS
@ -98,12 +98,12 @@ f_become_root_via_sudo()
" # END-QUOTE
msg=$( printf "$msg_you_are_not_root_but" bsdconfig )
hline="$hline_arrows_tab_enter"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list )
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list
local dialog_menu mtag retval
dialog_menu=$( eval $DIALOG \
@ -112,7 +112,8 @@ f_become_root_via_sudo()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$msg\" $size \
--menu \"\$msg\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -152,11 +153,11 @@ f_become_root_via_sudo()
#
msg="$msg_please_enter_password"
hline="$hline_alnum_punc_tab_enter"
size=$( f_dialog_inputbox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline" )
f_dialog_inputbox_size height width \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline"
#
# Continue prompting until they either Cancel, succeed
@ -166,12 +167,13 @@ f_become_root_via_sudo()
while [ $nfailures -lt $PASSWD_TRIES ]; do
if [ "$USE_XDIALOG" ]; then
password=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--password --inputbox "$msg" $size \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--password --inputbox "$msg" \
$height $width \
2>&1 > /dev/null )
retval=$?
@ -187,7 +189,8 @@ f_become_root_via_sudo()
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$msg" $size \
--passwordbox "$msg" \
$height $width \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
retval=$?
@ -272,7 +275,7 @@ f_become_root_via_sudo()
#
f_authenticate_some_user()
{
local msg hline size width height
local msg hline height width
f_have sudo || f_die 1 "$msg_must_be_root_to_execute" "$pgm"
@ -289,14 +292,12 @@ f_authenticate_some_user()
msg="$msg_please_enter_username_password"
hline="$hline_alnum_punc_tab_enter"
size=$( f_xdialog_2inputsbox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$field_username" "" \
"$field_password" "" )
width="${size##*[$IFS]}"
height="${size%%[$IFS]*}"
f_xdialog_2inputsbox_size height width \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$field_username" "" \
"$field_password" ""
height=$(( $height + 2 )) # Add height for --password
#

18
usr.sbin/bsdconfig/startup/misc
View File

@ -56,7 +56,7 @@ UNAME_P=$( uname -p ) # Processor Architecture (i.e. i386)
#
dialog_menu_main()
{
local menu_list var_list size defaultitem=
local menu_list var_list defaultitem=
local hline="$hline_arrows_tab_enter"
local prompt="$msg_miscellaneous_menu_text"
@ -265,12 +265,13 @@ dialog_menu_main()
}'
)"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -280,7 +281,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/startup/rcadd
View File

@ -57,7 +57,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -66,12 +66,13 @@ dialog_menu_main()
'2' '$msg_add_custom'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -80,7 +81,8 @@ dialog_menu_main()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

18
usr.sbin/bsdconfig/startup/rcconf
View File

@ -79,7 +79,6 @@ fi
#
dialog_menu_main()
{
local size
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -162,12 +161,14 @@ dialog_menu_main()
set -f # noglob
size=$( eval f_dialog_menu_${SHOW_DESC:+with_help_}size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$RCCONF_MENU_LIST )
local height width rows
eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$RCCONF_MENU_LIST
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -180,7 +181,8 @@ dialog_menu_main()
--help-label \"\$msg_details\" \
${SHOW_DESC:+--item-help} \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$RCCONF_MENU_LIST \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

35
usr.sbin/bsdconfig/startup/rcdelete
View File

@ -146,7 +146,6 @@ dialog_create_main()
#
dialog_menu_main()
{
local size
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -197,12 +196,14 @@ dialog_menu_main()
set -f # noglob (descriptions in $RCCONF_MENU_LIST may contain *)
size=$( eval f_dialog_menu_${SHOW_DESC:+with_help_}size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -216,7 +217,8 @@ dialog_menu_main()
--help-label \"\$msg_details\" \
${SHOW_DESC:+--item-help} \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -237,7 +239,6 @@ dialog_menu_main()
#
dialog_menu_confirm_delete()
{
local size
local hline="$hline_arrows_tab_enter"
local prompt="$msg_are_you_sure_you_want_delete_the_following"
local var_list menu_list
@ -269,12 +270,13 @@ dialog_menu_confirm_delete()
}'
)
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local defaultno="defaultno"
[ "$USE_XDIALOG" ] && defaultno="default-no"
@ -286,7 +288,8 @@ dialog_menu_confirm_delete()
--$defaultno \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2> /dev/null

18
usr.sbin/bsdconfig/startup/rcvar
View File

@ -65,7 +65,6 @@ RCVAR_MENU_LIST=
#
dialog_menu_main()
{
local size
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -126,12 +125,14 @@ dialog_menu_main()
set -f # noglob
size=$( eval f_dialog_menu_${SHOW_DESC:+with_help_}size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$RCVAR_MENU_LIST )
local height width rows
eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$RCVAR_MENU_LIST
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -143,7 +144,8 @@ dialog_menu_main()
--cancel-label \"\$msg_cancel\" \
${SHOW_DESC:+--item-help} \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$RCVAR_MENU_LIST \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

33
usr.sbin/bsdconfig/startup/share/rcconf.subr
View File

@ -273,7 +273,7 @@ f_startup_rcconf_map_expand()
#
f_dialog_input_view_details()
{
local menu_list size
local menu_list
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -301,12 +301,13 @@ f_dialog_input_view_details()
'3 ($m3) $msg_show_configured' '$msg_show_configured_desc'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
f_dialog_title "$msg_choose_view_details"
@ -318,7 +319,8 @@ f_dialog_input_view_details()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -367,7 +369,6 @@ f_dialog_input_view_details()
#
f_dialog_input_rclist()
{
local size
local hline="$hline_arrows_tab_enter"
local prompt="$msg_please_select_an_rcconf_directive"
local menu_list
@ -414,12 +415,14 @@ f_dialog_input_rclist()
set -f # noglob
size=$( eval f_dialog_menu_${SHOW_DESC:+with_help_}size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu${SHOW_DESC:+_with_help}_size \
height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \

18
usr.sbin/bsdconfig/startup/startup
View File

@ -48,7 +48,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline="$hline_arrows_tab_enter"
local prompt=""
@ -59,12 +59,13 @@ dialog_menu_main()
'3' '$msg_miscellaneous_startup_services'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -74,7 +75,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

192
usr.sbin/bsdconfig/timezone/share/zones.subr
View File

@ -348,7 +348,7 @@ f_read_zones()
f_install_zoneinfo_file()
{
local zoneinfo_file="$1"
local copymode title msg err size
local copymode title msg err height width
if [ -L "$_PATH_LOCALTIME" ]; then
copymode=
@ -374,13 +374,13 @@ f_install_zoneinfo_file()
title="$DIALOG_TITLE"
btitle="$DIALOG_BACKTITLE"
f_dialog_title_restore
size=$( f_dialog_buttonbox_size "$title" \
"$btitle" "$msg" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$msg\" $size
f_dialog_buttonbox_size height width \
"$title" "$btitle" "$msg"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$msg" $height $width
else
printf "%s\n" "$msg"
fi
@ -397,15 +397,15 @@ f_install_zoneinfo_file()
err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -415,15 +415,15 @@ f_install_zoneinfo_file()
err=$( rm -f "$_PATH_DB" 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -435,15 +435,15 @@ f_install_zoneinfo_file()
msg=$( printf "$msg_removed_file" \
"$_PATH_LOCALTIME" )
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$msg" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$msg\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$msg"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$msg" $height $width
else
printf "%s\n" "$msg"
fi
@ -458,15 +458,15 @@ f_install_zoneinfo_file()
err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -476,15 +476,15 @@ f_install_zoneinfo_file()
err=$( umask 222 && : 2>&1 > "$_PATH_LOCALTIME" )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -494,15 +494,15 @@ f_install_zoneinfo_file()
err=$( cat "$zoneinfo_file" 2>&1 > "$_PATH_LOCALTIME" )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -514,15 +514,15 @@ f_install_zoneinfo_file()
err=$( ( :< "$zoneinfo_file" ) 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -532,15 +532,15 @@ f_install_zoneinfo_file()
err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -550,15 +550,15 @@ f_install_zoneinfo_file()
err=$( ln -s "$zoneinfo_file" "$_PATH_LOCALTIME" 2>&1 )
if [ "$err" ]; then
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" \
"$btitle" \
"$err" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$err\" $size
f_dialog_buttonbox_size height $width \
"$title" \
"$btitle" \
"$err"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$err" $height $width
else
f_err "%s\n" "$err"
fi
@ -579,13 +579,13 @@ f_install_zoneinfo_file()
"$zoneinfo_file" )
fi
if [ "$USEDIALOG" ]; then
size=$( f_dialog_buttonbox_size \
"$title" "$btitle" "$msg" )
eval $DIALOG \
--title \"\$title\" \
--backtitle \"\$btitle\" \
--ok-label \"\$msg_ok\" \
--msgbox \"\$msg\" $size
f_dialog_buttonbox_size height width \
"$title" "$btitle" "$msg"
$DIALOG \
--title "$title" \
--backtitle "$btitle" \
--ok-label "$msg_ok" \
--msgbox "$msg" $height $width
else
printf "%s\n" "$msg"
fi

45
usr.sbin/bsdconfig/timezone/timezone
View File

@ -83,14 +83,14 @@ dialog_menu_main()
local title="$DIALOG_TITLE"
local btitle="$DIALOG_BACKTITLE"
local prompt="$msg_select_region"
local size
size=$( eval f_dialog_menu_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\" \
$continent_menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\$\" \
$continent_menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -99,7 +99,8 @@ dialog_menu_main()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$continent_menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -240,7 +241,7 @@ if [ $# -ge 1 ]; then
btitle="$DIALOG_BACKTITLE"
f_dialog_title_restore
msg=$( printf "\n$msg_use_default_zone" "$default" )
size=$( f_dialog_buttonbox_size "$title" "$btitle" "$msg" )
f_dialog_buttonbox_size height width "$title" "$btitle" "$msg"
if [ "$USE_XDIALOG" ]; then
eval $DIALOG \
@ -248,7 +249,7 @@ if [ $# -ge 1 ]; then
--backtitle \"\$btitle\" \
--ok-label \"\$msg_yes\" \
--cancel-label \"\$msg_no\" \
--yesno \"\$msg\" $size
--yesno \"\$msg\" $height $width
result=$?
else
eval $DIALOG \
@ -256,7 +257,7 @@ if [ $# -ge 1 ]; then
--backtitle \"\$btitle\" \
--yes-label \"\$msg_yes\" \
--no-label \"\$msg_no\" \
--yesno \"\$msg\" $size
--yesno \"\$msg\" $height $width
result=$?
fi
@ -353,12 +354,12 @@ while :; do
# Calculate size of menu
#
menu_list=$( f_continent $cont menu_list )
size=$( eval f_dialog_menu_size \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\" \
$menu_list )
eval f_dialog_menu_size height width rows \
\"\$title\" \
\"\$btitle\" \
\"\$prompt\" \
\"\" \
$menu_list
#
# Launch the country selection menu
@ -369,7 +370,8 @@ while :; do
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultctry\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -415,8 +417,8 @@ while :; do
f_dialog_title_restore
prompt="$msg_select_zone"
menu_list=$( f_country $tlc menu_list )
size=$( eval f_dialog_menu_size \"\$title\" \"\$btitle\" \
\"\$prompt\" \"\" $menu_list )
eval f_dialog_menu_size height width rows \
\"\$title\" \"\$btitle\" \"\$prompt\" \"\" $menu_list
#
# Launch the zone selection menu
@ -428,7 +430,8 @@ while :; do
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultzone\" \
--menu \"\$prompt\" $size \
--menu \"\$prompt\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

15
usr.sbin/bsdconfig/usermgmt/groupinput
View File

@ -221,12 +221,12 @@ while :; do
" # END-QUOTE
esac
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$menu_text\" \
\"\$hline\" \
$menu_items )
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$menu_text\" \
\"\$hline\" \
$menu_items
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -235,7 +235,8 @@ while :; do
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$menu_text\" $size \
--menu \"\$menu_text\" \
$height $width $rows \
$menu_items \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

102
usr.sbin/bsdconfig/usermgmt/share/group_input.subr
View File

@ -66,7 +66,7 @@ f_input_group()
f_dialog_menu_group_list()
{
local defaultitem="$1"
local menu_list size
local menu_list
local hline="$hline_alnum_punc_tab_enter"
menu_list="
@ -80,12 +80,13 @@ f_dialog_menu_group_list()
}'
)"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -95,7 +96,9 @@ f_dialog_menu_group_list()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\" $size $menu_list \
--menu \"\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?
@ -170,23 +173,25 @@ f_dialog_input_group_name()
f_dialog_input_group_password()
{
local hline="$hline_alnum_punc_tab_enter"
local msg size rmsg rsize
local msg rmsg
msg=$( printf "$msg_group_password" )
size=$( f_dialog_inputbox_size \
local height1 width1
f_dialog_inputbox_size height1 width1 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"" \
"$hline" )
"$hline"
rmsg=$( printf "$msg_reenter_group_password" )
rsize=$( f_dialog_inputbox_size \
local height2 width2
f_dialog_inputbox_size height2 width2 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$rmsg" \
"" \
"$hline" )
"$hline"
#
# Loop until the user provides taint-free/valid input
@ -194,14 +199,15 @@ f_dialog_input_group_password()
local retval _password1 _password2
while :; do
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$msg\" $size \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$msg" \
$height1 $width1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -212,14 +218,15 @@ f_dialog_input_group_password()
# Return if user has either pressed ESC or chosen Cancel/No
[ $retval -eq $SUCCESS ] || return $retval
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$rmsg\" $rsize \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$rmsg" \
$height2 $width2 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -288,7 +295,8 @@ f_dialog_input_group_gid()
#
f_dialog_input_group_members()
{
local menu_choice msg size retval _input="$1"
local menu_choice retval _input="$1"
local msg="$msg_group_members:"
local hline="$hline_num_arrows_tab_enter"
local user
local menu_list
@ -303,14 +311,15 @@ f_dialog_input_group_members()
" # END-QUOTE
local dialog_menu defaultitem=
local mheight mwidth mrows
eval f_dialog_menu_size mheight mwidth mrows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list
while :; do
msg="$msg_group_members:"
menu_size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list )
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
@ -318,7 +327,8 @@ f_dialog_input_group_members()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\$msg\" $menu_size \
--menu \"\$msg\" \
$mheight $mwidth $mrows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -347,12 +357,13 @@ f_dialog_input_group_members()
fi
done
size=$( eval f_dialog_radiolist_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$checklist_users )
local cheight cwidth crows
eval f_dialog_checklist_size cheight cwidth crows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$checklist_users
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -361,7 +372,8 @@ f_dialog_input_group_members()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--checklist \"\$msg\" $size \
--checklist \"\$msg\" \
$cheight $cwidth $crows \
$checklist_users \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

198
usr.sbin/bsdconfig/usermgmt/share/user_input.subr
View File

@ -91,7 +91,7 @@ f_input_user()
f_dialog_menu_user_list()
{
local defaultitem="$1"
local menu_list size
local menu_list
local hline="$hline_alnum_punc_tab_enter"
menu_list="
@ -105,12 +105,13 @@ f_dialog_menu_user_list()
}'
)"
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -120,7 +121,9 @@ f_dialog_menu_user_list()
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$defaultitem\" \
--menu \"\" $size $menu_list \
--menu \"\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?
@ -142,7 +145,7 @@ f_dialog_input_member_groups()
#
# Loop until the user provides taint-free/valid input
#
local size retval all_groups checklist_groups="" _member_groups="$1"
local retval all_groups checklist_groups="" _member_groups="$1"
all_groups=$( pw groupshow -a | awk -F: '
!/^[[:space:]]*(#|$)/ {
printf "%s\n", $1
@ -157,13 +160,14 @@ f_dialog_input_member_groups()
fi
done
local height width rows
while :; do
size=$( eval f_dialog_radiolist_size \
eval f_dialog_checklist_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$checklist_groups )
$checklist_groups
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -172,7 +176,8 @@ f_dialog_input_member_groups()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--checklist \"\$msg\" $size \
--checklist \"\$msg\" \
$height $width $rows \
$checklist_groups \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -275,23 +280,25 @@ f_dialog_input_name()
f_dialog_input_password()
{
local hline="$hline_alnum_punc_tab_enter"
local msg size rmsg rsize
local msg rmsg
msg=$( printf "$msg_password" )
size=$( f_dialog_inputbox_size \
local height1 width1
f_dialog_inputbox_size height1 width1 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"" \
"$hline" )
"$hline"
rmsg=$( printf "$msg_reenter_password" )
rsize=$( f_dialog_inputbox_size \
local height2 width2
f_dialog_inputbox_size height2 width2 \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$rmsg" \
"" \
"$hline" )
"$hline"
#
# Loop until the user provides taint-free/valid input
@ -299,14 +306,15 @@ f_dialog_input_password()
local retval _password1 _password2
while :; do
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$msg\" $size \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$msg" \
$height1 $width1 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -314,17 +322,15 @@ f_dialog_input_password()
setvar DIALOG_INPUTBOX_$$ "$dialog_inputbox"
_password1=$( f_dialog_inputstr )
# Return if user has either pressed ESC or chosen Cancel/No
[ $retval -eq $SUCCESS ] || return $retval
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--insecure \
--passwordbox \"\$rmsg\" $rsize \
dialog_inputbox=$( $DIALOG \
--title "$DIALOG_TITLE" \
--backtitle "$DIALOG_BACKTITLE" \
--hline "$hline" \
--ok-label "$msg_ok" \
--cancel-label "$msg_cancel" \
--insecure \
--passwordbox "$rmsg" \
$height2 $width2 \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -463,8 +469,8 @@ f_dialog_input_class()
#
f_dialog_input_change()
{
local calendar_size timebox_size
local msg menu_size size retval _input="$1"
local retval _input="$1"
local msg="$msg_password_expires_on"
local hline="$hline_num_arrows_tab_enter"
local menu_list="
@ -474,18 +480,30 @@ f_dialog_input_change()
'4' '$msg_enter_value_manually'
" # END-QUOTE
local mheight mwidth mrows
eval f_dialog_menu_size mheight mwidth mrows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list
local cheight cwidth
f_dialog_calendar_size cheight cwidth \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline"
local theight twidth
f_dialog_timebox_size theight twidth \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline"
#
# Loop until the user provides taint-free/cancellation-free input
#
while :; do
msg="$msg_password_expires_on"
menu_size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list )
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -493,7 +511,8 @@ f_dialog_input_change()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$msg\" $menu_size \
--menu \"\$msg\" \
$mheight $mwidth $mrows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -517,11 +536,6 @@ f_dialog_input_change()
{ f_isinteger "$secs" && [ $secs -gt 0 ]; } || secs=
_input_date=$( date -j -f "%s" -- "$secs" \
"+%d %m %Y" 2> /dev/null )
calendar_size=$( f_dialog_calendar_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline" )
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -529,7 +543,8 @@ f_dialog_input_change()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--calendar \"\$msg\" $calendar_size \
--calendar \"\$msg\" \
$cheight $cwidth \
$_input_date \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -544,11 +559,6 @@ f_dialog_input_change()
_input_time=
[ "$secs" ] && _input_time=$( date -j \
-f %s -- "$_input" "+%H %M %S" 2> /dev/null )
timebox_size=$( f_dialog_timebox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline" )
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -556,7 +566,8 @@ f_dialog_input_change()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--timebox \"\$msg\" $timebox_size \
--timebox \"\$msg\" \
$theight $twidth \
$_input_time \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -649,8 +660,8 @@ f_dialog_input_change()
#
f_dialog_input_expire()
{
local calendar_size timebox_size
local msg menu_size size retval _input="$1"
local retval _input="$1"
local msg="$msg_account_expires_on"
local hline="$hline_num_arrows_tab_enter"
local menu_list="
@ -660,18 +671,30 @@ f_dialog_input_expire()
'4' '$msg_enter_value_manually'
" # END-QUOTE
local mheight mwidth mrows
eval f_dialog_menu_size mheight mwidth mrows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list
local cheight cwidth
f_dialog_calendar_size cheight cwidth \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline"
local theight twidth
f_dialog_timebox_size theight twidth \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline"
#
# Loop until the user provides taint-free/cancellation-free input
#
while :; do
msg="$msg_account_expires_on"
menu_size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$msg\" \
\"\$hline\" \
$menu_list )
local dialog_menu
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -679,7 +702,8 @@ f_dialog_input_expire()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--menu \"\$msg\" $menu_size \
--menu \"\$msg\" \
$mheight $mwidth $mrows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -703,11 +727,6 @@ f_dialog_input_expire()
{ f_isinteger "$secs" && [ $secs -gt 0 ]; } || secs=
_input_date=$( date -j -f "%s" -- "$secs" \
"+%d %m %Y" 2> /dev/null )
calendar_size=$( f_dialog_calendar_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline" )
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -715,7 +734,8 @@ f_dialog_input_expire()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--calendar \"\$msg\" $calendar_size \
--calendar \"\$msg\" \
$cheight $cwidth \
$_input_date \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -730,18 +750,14 @@ f_dialog_input_expire()
_input_time=
[ "$secs" ] && _input_time=$( date -j \
-f %s -- "$_input" "+%H %M %S" 2> /dev/null )
timebox_size=$( f_dialog_timebox_size \
"$DIALOG_TITLE" \
"$DIALOG_BACKTITLE" \
"$msg" \
"$hline" )
dialog_inputbox=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
--backtitle \"\$DIALOG_BACKTITLE\" \
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--timebox \"\$msg\" $timebox_size \
--timebox \"\$msg\" \
$theight $twidth \
$_input_time \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
@ -982,7 +998,7 @@ f_dialog_input_dotfiles_create()
#
f_dialog_input_shell()
{
local size retval shells shell_list _input="$1"
local retval shells shell_list _input="$1"
local hline="$hline_arrows_space_tab_enter"
local prompt="$msg_select_login_shell"
@ -997,12 +1013,13 @@ f_dialog_input_shell()
done
)
size=$( eval f_dialog_radiolist_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$shell_list )
local height width rows
eval f_dialog_radiolist_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$prompt\" \
\"\$hline\" \
$shell_list
local dialog_inputbox
dialog_inputbox=$( eval $DIALOG \
@ -1011,7 +1028,8 @@ f_dialog_input_shell()
--hline \"\$hline\" \
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--radiolist \"\$prompt\" $size \
--radiolist \"\$prompt\" \
$height $width $rows \
$shell_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

15
usr.sbin/bsdconfig/usermgmt/userinput
View File

@ -384,12 +384,12 @@ while :; do
;;
esac
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$menu_text\" \
\"\$hline\" \
$menu_items )
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\$menu_text\" \
\"\$hline\" \
$menu_items
dialog_menu=$( eval $DIALOG \
--title \"\$DIALOG_TITLE\" \
@ -398,7 +398,8 @@ while :; do
--ok-label \"\$msg_ok\" \
--cancel-label \"\$msg_cancel\" \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\$menu_text\" $size \
--menu \"\$menu_text\" \
$height $width $rows \
$menu_items \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)

28
usr.sbin/bsdconfig/usermgmt/usermgmt
View File

@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
dialog_menu_main()
{
local menu_list size
local menu_list
local hline="$hline_arrows_tab_enter"
menu_list="
@ -65,20 +65,16 @@ dialog_menu_main()
'6' '$msg_delete_group'
" # END-QUOTE
size=$( eval f_dialog_menu_size \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list )
local height width rows
eval f_dialog_menu_size height width rows \
\"\$DIALOG_TITLE\" \
\"\$DIALOG_BACKTITLE\" \
\"\" \
\"\$hline\" \
$menu_list
if [ "$USE_XDIALOG" ]; then
# need to bump the width for the buttons
local height menu_height
height="${size%%[$IFS]*}" # first word
menu_height="${size##*[$IFS]}" # last word
size="$height 40 $menu_height"
fi
# When using Xdialog(1) we need to bump the width for the buttons
[ "$USE_XDIALOG" ] && width=40
local dialog_menu
dialog_menu=$( eval $DIALOG \
@ -91,7 +87,9 @@ dialog_menu_main()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--default-item \"\$DEFAULTITEM_$$\" \
--menu \"\" $size $menu_list \
--menu \"\" \
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?