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

Change the f_dialog_{yesno,noyes}() function-arguments in `dialog.subr' to

Browse Source 
accomodate an $hline value for overriding the default. This change does
not effect any current modules as it turns out that not one single usage of
either f_dialog_yesno() or f_dialog_noyes() relied on accepting more than a
first argument (read: all occurrences quoted the first parameter; so $* was
never depended upon).

This will allow some custom invocations of --yesno and --noyes to roll over
to these functions (for example, in `timezone/timezone').
This commit is contained in:
Devin Teske 2013-06-18 23:48:05 +00:00
parent 1e2751ddeb
commit 68d5c9afb9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1562,7 +1562,7 @@ f_dialog_textbox()
############################################################ YESNO FUNCTIONS
# f_dialog_yesno $msg_text ...
# f_dialog_yesno $msg_text [$hline]
#
# Display a dialog(1) Yes/No prompt to allow the user to make some decision.
# The yesno prompt remains until the user presses ENTER or ESC, acknowledging
@ -1573,8 +1573,8 @@ f_dialog_textbox()
#
f_dialog_yesno()
{
local msg_text="$*" height width
local hline="$hline_arrows_tab_enter"
local msg_text="$1" height width
local hline="${2-$hline_arrows_tab_enter}"
f_interactive || return 0 # If non-interactive, return YES all the time
@ -1600,7 +1600,7 @@ f_dialog_yesno()
fi
}
# f_dialog_noyes $msg_text ...
# f_dialog_noyes $msg_text [$hline]
#
# Display a dialog(1) No/Yes prompt to allow the user to make some decision.
# The noyes prompt remains until the user presses ENTER or ESC, acknowledging
@ -1613,8 +1613,8 @@ f_dialog_yesno()
#
f_dialog_noyes()
{
local msg_text="$*" height width
local hline="$hline_arrows_tab_enter"
local msg_text="$1" height width
local hline="${2-$hline_arrows_tab_enter}"
f_interactive || return 1 # If non-interactive, return NO all the time