Author: dteske
Date: Wed Oct 9 08:12:26 2013
New Revision: 256181
URL: http://svnweb.freebsd.org/changeset/base/256181
Log:
Introduce centralized [X]dialog(1) exit codes to `dialog.subr' and make-use
throughout the bsdconfig(8) code. While we're here, add an explicit argument
to lvalue-seeking invocations of "return" that previously had no argument.
Also, consolidate a single instance of double-newline and remove some
comments that are no longer required (given increased readability with new
exit codes).
Approved by: re (glebius)
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/console/ttys
head/usr.sbin/bsdconfig/mouse/enable
head/usr.sbin/bsdconfig/networking/devices
head/usr.sbin/bsdconfig/networking/share/device.subr
head/usr.sbin/bsdconfig/networking/share/hostname.subr
head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
head/usr.sbin/bsdconfig/networking/share/media.subr
head/usr.sbin/bsdconfig/networking/share/netmask.subr
head/usr.sbin/bsdconfig/networking/share/resolv.subr
head/usr.sbin/bsdconfig/networking/share/routing.subr
head/usr.sbin/bsdconfig/password/share/password.subr
head/usr.sbin/bsdconfig/security/kern_securelevel
head/usr.sbin/bsdconfig/security/security
head/usr.sbin/bsdconfig/share/common.subr
head/usr.sbin/bsdconfig/share/device.subr
head/usr.sbin/bsdconfig/share/dialog.subr
head/usr.sbin/bsdconfig/share/media/any.subr
head/usr.sbin/bsdconfig/share/media/cdrom.subr
head/usr.sbin/bsdconfig/share/media/common.subr
head/usr.sbin/bsdconfig/share/media/dos.subr
head/usr.sbin/bsdconfig/share/media/floppy.subr
head/usr.sbin/bsdconfig/share/media/ftp.subr
head/usr.sbin/bsdconfig/share/media/http.subr
head/usr.sbin/bsdconfig/share/media/nfs.subr
head/usr.sbin/bsdconfig/share/media/options.subr
head/usr.sbin/bsdconfig/share/media/tcpip.subr
head/usr.sbin/bsdconfig/share/media/ufs.subr
head/usr.sbin/bsdconfig/share/media/usb.subr
head/usr.sbin/bsdconfig/share/mustberoot.subr
head/usr.sbin/bsdconfig/share/packages/packages.subr
head/usr.sbin/bsdconfig/startup/misc
head/usr.sbin/bsdconfig/startup/rcconf
head/usr.sbin/bsdconfig/startup/rcdelete
head/usr.sbin/bsdconfig/startup/rcvar
head/usr.sbin/bsdconfig/startup/share/rcconf.subr
head/usr.sbin/bsdconfig/startup/share/rcedit.subr
head/usr.sbin/bsdconfig/timezone/timezone
head/usr.sbin/bsdconfig/usermgmt/groupdel
head/usr.sbin/bsdconfig/usermgmt/groupedit
head/usr.sbin/bsdconfig/usermgmt/groupinput
head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
head/usr.sbin/bsdconfig/usermgmt/userdel
head/usr.sbin/bsdconfig/usermgmt/useredit
head/usr.sbin/bsdconfig/usermgmt/userinput
head/usr.sbin/bsdconfig/usermgmt/usermgmt
Modified: head/usr.sbin/bsdconfig/bsdconfig
==============================================================================
--- head/usr.sbin/bsdconfig/bsdconfig Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/bsdconfig Wed Oct 9 08:12:26 2013
(r256181)
@@ -300,7 +300,7 @@ dialog_menu_main()
f_dialog_menutag_store "$menu_choice"
# Only update default-item on success
- [ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+ [ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
return $retval
}
@@ -396,11 +396,10 @@ while :; do
f_dialog_menutag_fetch mtag
f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$BSDCONFIG_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
f_die
fi
Modified: head/usr.sbin/bsdconfig/console/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/console/ttys Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/console/ttys Wed Oct 9 08:12:26 2013
(r256181)
@@ -92,7 +92,7 @@ dialog_menu_main()
local retval=$?
f_dialog_menutag_store -s "$menu_choice"
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
local item
item=$( eval f_dialog_menutag2item \
\"\$menu_choice\" $menu_list )
Modified: head/usr.sbin/bsdconfig/mouse/enable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/enable Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/mouse/enable Wed Oct 9 08:12:26 2013
(r256181)
@@ -102,7 +102,7 @@ f_dialog_title_restore
# Stop the mouse daemon
#
f_quietly vidcontrol -m off
-if [ $retval -eq $SUCCESS ]; then
+if [ $retval -eq $DIALOG_OK ]; then
f_sysrc_set moused_enable "YES" || f_die
ln -fs /dev/sysmouse /dev/mouse || f_die # backwards compat
else
Modified: head/usr.sbin/bsdconfig/networking/devices
==============================================================================
--- head/usr.sbin/bsdconfig/networking/devices Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/networking/devices Wed Oct 9 08:12:26 2013
(r256181)
@@ -148,7 +148,7 @@ while :; do
"$interface" "$_ipaddr" "$_netmask" "$_options" $dhcp
# Return to root menu if above returns success
- [ $? -eq $SUCCESS ] && break
+ [ $? -eq $DIALOG_OK ] && break
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/device.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/device.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -125,7 +125,7 @@ f_dialog_menu_netdev()
)
if [ ! "$interfaces" ]; then
f_show_msg "$msg_no_network_interfaces"
- return $FAILURE
+ return $DIALOG_CANCEL
fi
#
@@ -242,12 +242,10 @@ f_dialog_menu_netdev_edit()
local retval=$?
f_dialog_data_sanitize tag
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$TCP_HELPFILE"
continue
- elif [ $retval -ne $SUCCESS ]; then
- # "Cancel" was chosen (-1) or ESC was pressed (255)
+ elif [ $retval -ne $DIALOG_OK ]; then
return $retval
else
# Only update default-item on success
@@ -298,7 +296,7 @@ f_dialog_menu_netdev_edit()
)
retval=$?
trap 'interrupt' SIGINT
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
dhcp=1
ipaddr=$( f_ifconfig_inet $interface )
netmask=$( f_ifconfig_netmask $interface )
@@ -312,11 +310,11 @@ f_dialog_menu_netdev_edit()
fi
;;
3\ *) f_dialog_input_ipaddr "$interface" "$ipaddr"
- [ $? -eq $SUCCESS ] && dhcp= ;;
+ [ $? -eq $DIALOG_OK ] && dhcp= ;;
4\ *) f_dialog_input_netmask "$interface" "$netmask"
- [ $? -eq $SUCCESS -a "$_netmask" ] && dhcp= ;;
+ [ $? -eq $DIALOG_OK -a "$_netmask" ] && dhcp= ;;
5\ *) f_dialog_menu_media_options "$interface" "$options"
- [ $? -eq $SUCCESS ] && dhcp= ;;
+ [ $? -eq $DIALOG_OK ] && dhcp= ;;
esac
done
@@ -383,7 +381,7 @@ f_dialog_menu_netdev_edit()
fi
fi
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
Modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/hostname.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/hostname.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -110,7 +110,7 @@ f_dialog_input_hostname()
#
while :; do
f_dialog_input hostname "$msg" "$hostname" \
- "$hline_alnum_punc_tab_enter" || return
+ "$hline_alnum_punc_tab_enter" || return $?
# Taint-check the user's input
f_dialog_validate_hostname "$hostname" && break
done
@@ -150,7 +150,7 @@ f_dialog_input_hostname()
fi
fi
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/ipaddr.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -147,7 +147,7 @@ f_dialog_input_ipaddr()
local setting="$( printf "$msg_current_ipaddr" \
"$interface" "$_ipaddr" )"
f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
- return $FAILURE
+ return $DIALOG_CANCEL
fi
local msg="$( printf "$msg_please_enter_new_ip_addr" "$interface" )"
@@ -163,11 +163,11 @@ f_dialog_input_ipaddr()
# - User has not made any changes to the given value
#
f_dialog_input _input "$msg" "$_ipaddr" \
- "$hline_num_punc_tab_enter" || return
- [ "$_ipaddr" = "$_input" ] && return $FAILURE
+ "$hline_num_punc_tab_enter" || return $?
+ [ "$_ipaddr" = "$_input" ] && return $DIALOG_CANCEL
# Return success if NULL value was entered
- [ "$_input" ] || return $SUCCESS
+ [ "$_input" ] || return $DIALOG_OK
# Take only the first "word" of the user's input
_ipaddr="$_input"
@@ -208,7 +208,7 @@ f_dialog_input_ipaddr()
ipaddr="$_ipaddr"
[ "$_netmask" ] && netmask="$_netmask"
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
Modified: head/usr.sbin/bsdconfig/networking/share/media.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/media.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/media.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -118,7 +118,7 @@ f_dialog_input_options()
local setting="$( printf "$msg_current_options" \
"$interface" "$options" )"
f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
- return $FAILURE
+ return $DIALOG_CANCEL
fi
local msg="$( printf "$msg_please_enter_mediaopts" "$interface" )"
@@ -138,7 +138,7 @@ f_dialog_input_options()
local retval=$?
f_dialog_line_sanitize _options
- [ $retval -eq $SUCCESS ] && options="$_options"
+ [ $retval -eq $DIALOG_OK ] && options="$_options"
return $retval
}
@@ -165,7 +165,7 @@ f_dialog_menu_media_options()
local setting="$( printf "$msg_current_options" \
"$interface" "$_options" )"
f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
- return $FAILURE
+ return $DIALOG_CANCEL
fi
#
@@ -219,7 +219,7 @@ f_dialog_menu_media_options()
local retval=$?
f_dialog_data_sanitize tag
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
options=$( eval f_dialog_menutag2item \"\$tag\" \
$supported_media )
case "$options" in
Modified: head/usr.sbin/bsdconfig/networking/share/netmask.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/netmask.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/netmask.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -97,7 +97,7 @@ f_dialog_input_netmask()
local setting="$( printf "$msg_current_subnet" \
"$interface" "$_netmask" )"
f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
- return $FAILURE
+ return $DIALOG_CANCEL
fi
#
@@ -111,11 +111,11 @@ f_dialog_input_netmask()
# - User has not made any changes to the given value
#
f_dialog_input _input "$msg" "$_netmask" \
- "$hline_num_punc_tab_enter" || return
- [ "$_netmask" = "$_input" ] && return $FAILURE
+ "$hline_num_punc_tab_enter" || return $?
+ [ "$_netmask" = "$_input" ] && return $DIALOG_CANCEL
# Return success if NULL value was entered
- [ "$_input" ] || return $SUCCESS
+ [ "$_input" ] || return $DIALOG_OK
# Take only the first "word" of the user's input
_netmask="$_input"
Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/resolv.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/resolv.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -195,7 +195,7 @@ f_dialog_resolv_conf_update()
# update with our new `domain' and `search' directives.
#
local tmpfile="$( mktemp -t "$pgm" )"
- [ "$tmpfile" ] || return $FAILURE
+ [ "$tmpfile" ] || return $DIALOG_CANCEL
#
# Fixup permissions and ownership (mktemp(1) creates the
@@ -235,7 +235,8 @@ f_dialog_resolv_conf_update()
# Write the temporary file contents and move the temporary
# file into place.
#
- echo "$new_contents" | tail -r > "$tmpfile" || return $FAILURE
+ echo "$new_contents" | tail -r > "$tmpfile" ||
+ return $DIALOG_CANCEL
f_quietly mv "$tmpfile" "$RESOLV_CONF"
fi
@@ -293,8 +294,8 @@ f_dialog_input_nameserver()
#
# Perform sanity checks
#
- f_isinteger "$index" || return $FAILURE
- [ $index -ge 0 ] || return $FAILURE
+ f_isinteger "$index" || return $DIALOG_CANCEL
+ [ $index -ge 0 ] || return $DIALOG_CANCEL
local msg
if [ $index -gt 0 ]; then
@@ -312,7 +313,7 @@ f_dialog_input_nameserver()
#
while :; do
f_dialog_input new_ns "$msg" "$ns" \
- "$hline_num_punc_tab_enter" || return
+ "$hline_num_punc_tab_enter" || return $?
# Take only the first "word" of the user's input
new_ns="${new_ns%%[$IFS]*}"
@@ -331,7 +332,7 @@ f_dialog_input_nameserver()
if [ $index -eq "0" -a "$new_ns" ]; then
f_dialog_info "$msg_saving_nameserver"
printf "nameserver\t%s\n" "$new_ns" >> "$RESOLV_CONF"
- return $SUCCESS
+ return $DIALOG_OK
elif [ $index -gt 0 -a "$old_ns" != "$new_ns" ]; then
if [ "$new_ns" ]; then
msg="$msg_saving_nameserver_existing"
@@ -344,7 +345,7 @@ f_dialog_input_nameserver()
# Create a new temporary file to write our new resolv.conf(5)
#
local tmpfile="$( mktemp -t "$pgm" )"
- [ "$tmpfile" ] || return $FAILURE
+ [ "$tmpfile" ] || return $DIALOG_CANCEL
#
# Quietly fixup permissions and ownership
@@ -381,7 +382,7 @@ f_dialog_input_nameserver()
# Write the temporary file contents and move the temporary
# file into place.
#
- echo "$new_contents" > "$tmpfile" || return $FAILURE
+ echo "$new_contents" > "$tmpfile" || return $DIALOG_CANCEL
f_quietly mv "$tmpfile" "$RESOLV_CONF"
fi
}
@@ -452,7 +453,7 @@ f_dialog_menu_nameservers()
f_dialog_data_sanitize tag
# Return if "Cancel" was chosen (-1) or ESC was pressed (255)
- if [ $retval -ne $SUCCESS ]; then
+ if [ $retval -ne $DIALOG_OK ]; then
return $retval
else
# Only update default-item on success
Modified: head/usr.sbin/bsdconfig/networking/share/routing.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/routing.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/networking/share/routing.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -75,7 +75,7 @@ f_dialog_input_defaultrouter()
local setting="$( printf "$msg_current_default_router" \
"$defaultrouter" )"
f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
- return $FAILURE
+ return $DIALOG_CANCEL
fi
#
@@ -87,8 +87,8 @@ f_dialog_input_defaultrouter()
"$msg_please_enter_default_router" \
"$defaultrouter" "$hline_num_punc_tab_enter"
retval=$?
- [ "$defaultrouter" ] || return $SUCCESS
- [ $retval -eq $SUCCESS ] || return $retval
+ [ "$defaultrouter" ] || return $DIALOG_OK
+ [ $retval -eq $DIALOG_OK ] || return $retval
# Taint-check the user's input
f_dialog_validate_ipaddr "$defaultrouter" && break
@@ -112,7 +112,7 @@ f_dialog_input_defaultrouter()
f_dialog_clear
f_yesno "$msg_activate_default_router" \
"$( f_route_get_default )" "$defaultrouter"
- if [ $? -eq $SUCCESS ]; then
+ if [ $? -eq $DIALOG_OK ]; then
local err
# Apply the default router/gateway
@@ -120,7 +120,7 @@ f_dialog_input_defaultrouter()
err=$( route add default "$defaultrouter" 2>&1 )
if [ $? -ne $SUCCESS ]; then
f_dialog_msgbox "$err"
- return $FAILURE
+ return $DIALOG_CANCEL
fi
fi
fi
Modified: head/usr.sbin/bsdconfig/password/share/password.subr
==============================================================================
--- head/usr.sbin/bsdconfig/password/share/password.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/password/share/password.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -114,7 +114,7 @@ f_dialog_input_password()
break
done
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel Wed Oct 9 08:12:26
2013 (r256181)
@@ -131,11 +131,10 @@ while :; do
retval=$?
f_dialog_menutag_fetch mtag
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$SECURELEVEL_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
f_die
fi
Modified: head/usr.sbin/bsdconfig/security/security
==============================================================================
--- head/usr.sbin/bsdconfig/security/security Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/security/security Wed Oct 9 08:12:26 2013
(r256181)
@@ -123,7 +123,7 @@ dialog_menu_main()
f_dialog_menutag_store "$menu_choice"
# Only update default-item on success
- [ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+ [ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
return $retval
}
Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/share/common.subr Wed Oct 9 08:12:26 2013
(r256181)
@@ -560,18 +560,19 @@ f_index_file()
if [ "$lang" ]; then
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang &&
+ return $SUCCESS
# No match, fall-thru to non-i18n sources
fi
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return
+ $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return $SUCCESS
# No match? Fall-thru to `local' libexec sources (add-on modules)
[ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE
if [ "$lang" ]; then
awk -v keyword="$keyword" "$f_index_file_awk" \
- $BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return
+ $BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return $SUCCESS
# No match, fall-thru to non-i18n sources
fi
awk -v keyword="$keyword" "$f_index_file_awk" \
Modified: head/usr.sbin/bsdconfig/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/device.subr Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/share/device.subr Wed Oct 9 08:12:26 2013
(r256181)
@@ -552,7 +552,7 @@ f_device_find()
f_device_init()
{
local name="$1" init_func
- device_$name get init init_func || return
+ device_$name get init init_func || return $?
${init_func:-:} $name
}
@@ -564,7 +564,7 @@ f_device_init()
f_device_get()
{
local name="$1" file="$2" probe="$3" get_func
- device_$name get get get_func || return
+ device_$name get get get_func || return $?
${get_func:-:} $name "$file" ${3+"$probe"}
}
@@ -575,7 +575,7 @@ f_device_get()
f_device_shutdown()
{
local name="$1" shutdown_func
- device_$name get shutdown shutdown_func || return
+ device_$name get shutdown shutdown_func || return $?
${shutdown_func:-:} $name
}
@@ -597,7 +597,7 @@ f_device_menu()
[ "$devtype" = "$type" ] || continue
devs="$devs $dev"
done
- [ "$devs" ] || return $FAILURE
+ [ "$devs" ] || return $DIALOG_CANCEL
local desc menu_list=
for dev in $devs; do
@@ -637,7 +637,7 @@ f_device_menu()
)
local retval=$?
- [ $retval -ne 2 ] && break
+ [ $retval -ne $DIALOG_HELP ] && break
# Otherwise, the Help button was pressed
f_show_help "$helpfile"
# ...then loop back to menu
@@ -646,7 +646,7 @@ f_device_menu()
[ "$errexit" ] && set -e
- if [ $retval -eq 0 ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
# Clean up the output of [X]dialog(1) and return it
f_dialog_data_sanitize mtag
echo "$mtag" >&2
Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/share/dialog.subr Wed Oct 9 08:12:26 2013
(r256181)
@@ -74,6 +74,18 @@ unset XDIALOG_FORCE_AUTOSIZE
unset XDIALOG_INFOBOX_TIMEOUT
#
+# Exit codes for [X]dialog(1)
+#
+DIALOG_OK=${SUCCESS:-0}
+DIALOG_CANCEL=${FAILURE:-1}
+DIALOG_HELP=2
+DIALOG_ITEM_HELP=2
+DIALOG_EXTRA=3
+DIALOG_ITEM_HELP=4
+export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1'
+DIALOG_ESC=255
+
+#
# Default behavior is to call f_dialog_init() automatically when loaded.
#
: ${DIALOG_SELF_INITIALIZE=1}
Modified: head/usr.sbin/bsdconfig/share/media/any.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/any.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/any.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -113,11 +113,10 @@ f_media_get_type()
f_dialog_data_sanitize mtag
f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$MEDIA_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
return $FAILURE
fi
Modified: head/usr.sbin/bsdconfig/share/media/cdrom.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/cdrom.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/cdrom.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -170,7 +170,7 @@ f_media_shutdown_cdrom()
{
local dev="$1" err
- [ "$CDROM_MOUNTED" ] || return
+ [ "$CDROM_MOUNTED" ] || return $FAILURE
if [ "$CDROM_PREVIOUSLY_MOUNTED" ]; then
CDROM_MOUNTED=
Modified: head/usr.sbin/bsdconfig/share/media/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/common.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/common.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -127,7 +127,7 @@ f_media_generic_get()
fi
[ "$probe_type" ] && return $SUCCESS
cat "$path"
- return
+ return $?
fi
done
Modified: head/usr.sbin/bsdconfig/share/media/dos.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/dos.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/dos.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -148,7 +148,7 @@ f_media_shutdown_dos()
{
local dev="$1" err
- [ "$DOS_MOUNTED" ] || return
+ [ "$DOS_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
Modified: head/usr.sbin/bsdconfig/share/media/floppy.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/floppy.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/floppy.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -205,7 +205,7 @@ f_media_shutdown_floppy()
{
local dev="$1" err mp
- [ "$FLOPPY_MOUNTED" ] || return
+ [ "$FLOPPY_MOUNTED" ] || return $FAILURE
device_$dev get private mp
if ! err=$( umount -f "${mp:=$MOUNTPOINT}" 2>&1 ); then
Modified: head/usr.sbin/bsdconfig/share/media/ftp.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/ftp.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/ftp.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -213,7 +213,7 @@ f_dialog_menu_media_ftp()
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- ) || return $FAILURE
+ ) || return $DIALOG_CANCEL
f_dialog_data_sanitize mtag
case "$mtag" in
@@ -224,7 +224,7 @@ f_dialog_menu_media_ftp()
setvar $VAR_FTP_PATH "ftp://$value";
esac
- return $SUCCESS
+ return $DIALOG_OK
}
# f_media_set_ftp
@@ -740,7 +740,7 @@ f_media_init_ftp()
else
f_yesno "$msg_cant_find_distribution" \
"$rel" "$ftp_host"
- if [ $? -eq $SUCCESS ]; then
+ if [ $? -eq $DIALOG_OK ]; then
unset $VAR_FTP_PATH
f_media_set_ftp && continue
fi
Modified: head/usr.sbin/bsdconfig/share/media/http.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/http.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/http.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -101,7 +101,7 @@ f_dialog_menu_media_http()
$height $width $rows \
$menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- ) || return $FAILURE
+ ) || return $DIALOG_CANCEL
f_dialog_data_sanitize mtag
case "$mtag" in
@@ -112,7 +112,7 @@ f_dialog_menu_media_http()
setvar $VAR_HTTP_PATH "http://$value";
esac
- return $SUCCESS
+ return $DIALOG_OK
}
# f_media_set_http
Modified: head/usr.sbin/bsdconfig/share/media/nfs.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/nfs.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/nfs.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -233,7 +233,7 @@ f_media_shutdown_nfs()
{
local dev="$1" err
- [ "$NFS_MOUNTED" ] || return
+ [ "$NFS_MOUNTED" ] || return $FAILURE
f_dprintf "Unmounting NFS partition on %s" "$MOUNTPOINT"
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
Modified: head/usr.sbin/bsdconfig/share/media/options.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/options.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/options.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -224,11 +224,10 @@ f_media_options_menu()
defaultitem="$mtag"
f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$OPTIONS_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
break # to success
fi
Modified: head/usr.sbin/bsdconfig/share/media/tcpip.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/tcpip.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/tcpip.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -471,10 +471,10 @@ f_dialog_validate_tcpip()
! f_validate_gateway "$gateway" "$ipaddr" "$netmask"; then
f_show_msg "$msg_invalid_gateway_ipv4_address_specified"
else
- return $SUCCESS
+ return $DIALOG_OK
fi
- return $FAILURE
+ return $DIALOG_CANCEL
}
# f_ifconfig_inet $interface [$var_to_set]
@@ -1102,7 +1102,7 @@ f_device_dialog_tcp()
local use_dhcp="" use_rtsol=""
local _ipaddr _netmask _extras
- [ "$dev" ] || return $FAILURE
+ [ "$dev" ] || return $DIALOG_CANCEL
# Initialize vars from previous device values
local private
@@ -1125,7 +1125,6 @@ f_device_dialog_tcp()
unset $VAR_NONINTERACTIVE
fi
-
#
# Try a RTSOL scan if such behavior is desired.
# If the variable was configured and is YES, do it.
@@ -1321,7 +1320,7 @@ f_device_dialog_tcp()
if [ ! "$cp" ]; then
# User either chose "Cancel", pressed
# ESC, or blanked every form field
- return $FAILURE
+ return $DIALOG_CANCEL
else
n=$( echo "$cp" | f_number_of_lines )
[ $n -eq 1 ] && case "$cp" in HELP*)
@@ -1404,14 +1403,12 @@ f_device_dialog_tcp()
f_dialog_data_sanitize cp
f_dprintf "retval=%u mtag=[%s]" $retval "$cp"
- if [ $retval -eq 2 ]; then
- # The Help button was pressed
+ if [ $retval -eq $DIALOG_HELP ]; then
f_show_help "$TCP_HELPFILE"
continue
- elif [ $retval -ne 0 ]; then
- # User chose "Cancel" or pressed ESC
+ elif [ $retval -ne $DIALOG_OK ]; then
f_dialog_title_restore
- return $FAILURE
+ return $DIALOG_CANCEL
fi
case "$cp" in
@@ -1490,7 +1487,7 @@ f_device_dialog_tcp()
[ "$use_dhcp" ] ||
f_config_resolv # XXX this will do it on the MFS copy
- return $SUCCESS
+ return $DIALOG_OK
}
# f_device_scan_tcp [$var_to_set]
@@ -1586,15 +1583,15 @@ f_device_select_tcp()
if [ ${cnt:=0} -gt 0 ]; then
dev="${devs%%[$IFS]*}"
f_device_dialog_tcp $dev
- if [ $? -eq $SUCCESS ]; then
+ if [ $? -eq $DIALOG_OK ]; then
setvar $VAR_NETWORK_DEVICE $dev
- return $SUCCESS
+ return $DIALOG_OK
fi
fi
done
f_interactive && f_show_msg "$msg_no_network_devices"
- return $FAILURE
+ return $DIALOG_CANCEL
fi # $network_dev
@@ -1610,18 +1607,18 @@ f_device_select_tcp()
if f_dialog_yesno "$msg_assume_network_is_already_configured"
then
setvar $VAR_NETWORK_DEVICE $dev
- return $SUCCESS
+ return $DIALOG_OK
fi
fi
local retval=$SUCCESS
if [ ${cnt:=0} -eq 0 ]; then
f_show_msg "$msg_no_network_devices"
- retval=$FAILURE
+ retval=$DIALOG_CANCEL
elif [ $cnt -eq 1 ]; then
f_device_dialog_tcp $dev
retval=$?
- [ $retval -eq $SUCCESS ] && setvar $VAR_NETWORK_DEVICE $dev
+ [ $retval -eq $DIALOG_OK ] && setvar $VAR_NETWORK_DEVICE $dev
else
local title="$msg_network_interface_information_required"
local prompt="$msg_please_select_ethernet_device_to_configure"
@@ -1632,15 +1629,15 @@ f_device_select_tcp()
"$NETWORK_DEVICE_HELPFILE" \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
retval=$?
- [ "$dev" ] || return $FAILURE
+ [ "$dev" ] || return $DIALOG_CANCEL
f_device_find "$dev" $DEVICE_TYPE_NETWORK devs
- [ "$devs" ] || return $FAILURE
+ [ "$devs" ] || return $DIALOG_CANCEL
dev="${devs%%[$IFS]*}"
f_device_dialog_tcp $dev
retval=$?
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
f_struct_copy device_$dev device_network
setvar $VAR_NETWORK_DEVICE network
else
@@ -1675,7 +1672,7 @@ f_dialog_menu_select_tcp()
"$name"
fi
fi
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
Modified: head/usr.sbin/bsdconfig/share/media/ufs.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/ufs.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/ufs.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -177,7 +177,7 @@ f_media_shutdown_ufs()
{
local dev="$1" err
- [ "$UFS_MOUNTED" ] || return
+ [ "$UFS_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
Modified: head/usr.sbin/bsdconfig/share/media/usb.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/usb.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/media/usb.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -158,7 +158,7 @@ f_media_shutdown_usb()
{
local dev="$1" err
- [ "$USB_MOUNTED" ] || return
+ [ "$USB_MOUNTED" ] || return $FAILURE
if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
err="${err#umount: }"; err="${err#*: }"
Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/mustberoot.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/mustberoot.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -176,9 +176,9 @@ f_become_root_via_sudo()
retval=$?
# Catch X11-related errors
- if [ $retval -eq 255 ]; then
+ if [ $retval -eq $DIALOG_ESC ]; then
f_die $retval "$password"
- elif [ $retval -ne 0 ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
# User cancelled
exit $retval
fi
@@ -316,10 +316,10 @@ f_authenticate_some_user()
retval=$?
# Catch X11-related errors
- [ $retval -eq 255 ] && f_die $retval "$user_pass"
+ [ $retval -eq $DIALOG_ESC ] && f_die $retval "$user_pass"
# Exit if the user cancelled.
- [ $retval -eq $SUCCESS ] || exit $retval
+ [ $retval -eq $DIALOG_OK ] || exit $retval
#
# Make sure the user exists and is non-root
Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr Wed Oct 9
07:55:21 2013 (r256180)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr Wed Oct 9
08:12:26 2013 (r256181)
@@ -132,7 +132,7 @@ f_package_select()
package="$1"
shift 1 # package
for pkgsel in $SELECTED_PACKAGES; do
- [ "$package" = "$pkgsel" ] && return
+ [ "$package" = "$pkgsel" ] && return $SUCCESS
done
SELECTED_PACKAGES="$SELECTED_PACKAGES $package"
f_dprintf "Added %s to selection list" "$package"
@@ -312,7 +312,7 @@ f_package_menu_categories()
# creates _{varcat}_ninstalled and _{varcat}_nselected
local category_list
- debug= f_getvar "$var_to_get" category_list || return $FAILURE
+ debug= f_getvar "$var_to_get" category_list || return $DIALOG_CANCEL
# Accent the category menu list with ninstalled/nselected
eval f_package_accent_category_menu category_list $category_list
@@ -395,7 +395,7 @@ f_package_menu_select()
local defaultitem="$3"
local hline="$hline_arrows_tab_punc_enter"
- f_isinteger "$page" || return $FAILURE
+ f_isinteger "$page" || return $DIALOG_CANCEL
local varcat
f_str2varname "$category" varcat
@@ -518,7 +518,7 @@ f_package_menu_select()
f_dialog_data_sanitize menu_choice
f_dialog_menutag_store "$menu_choice"
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
local item
item=$( eval f_dialog_menutag2item${SHOW_DESC:+_with_help} \
\"\$menu_choice\" $menu_list )
@@ -603,7 +603,7 @@ f_package_review()
done
if [ ! "$menu_list" ]; then
f_show_msg "$msg_no_packages_were_selected_for_extraction"
- return $FAILURE # They might have selected this by accident
+ return $DIALOG_CANCEL # Might have selected this by accident
fi
menu_list=$( echo "$menu_list" | sort )
@@ -660,7 +660,7 @@ f_package_review()
f_package_deselect "$package"
done
- return $SUCCESS
+ return $DIALOG_OK
}
# f_package_config
@@ -693,7 +693,7 @@ f_package_config()
f_dprintf "retval=%u mtag=[%s]" $retval "$category"
category_defaultitem="$category"
- [ $retval -eq $SUCCESS ] || break
+ [ $retval -eq $DIALOG_OK ] || break
# Maybe the user chose an action (like `Review')
case "$category" in
@@ -729,14 +729,14 @@ f_package_config()
# the Cancel button because stdout will be NULL.
# Alternatively, Xdialog(1) will terminate with 1
# if/when Cancel is chosen on any widget.
- if [ $retval -eq 255 -o ! "$menu_choice" ]; then
- # User pressed ESC or chose Cancel
+ if [ $retval -eq $DIALOG_ESC -o ! "$menu_choice" ]
+ then
break
- elif [ $retval -eq 1 ]; then
+ elif [ $retval -eq $DIALOG_CANCEL ]; then
# Using X11, Xdialog(1) returned 1 for Cancel
f_show_msg "%s" "$menu_choice"
break
- elif [ $retval -ne $SUCCESS ]; then
+ elif [ $retval -ne $DIALOG_OK ]; then
# X11-related error occurred using Xdialog(1)
f_show_msg "%s" "$menu_choice"
break
Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/startup/misc Wed Oct 9 08:12:26 2013
(r256181)
@@ -309,10 +309,10 @@ dialog_input_value()
f_dialog_title_restore
# Return if user has either pressed ESC or chosen Cancel/No
- [ $retval -eq $SUCCESS ] || return $retval
+ [ $retval -eq $DIALOG_OK ] || return $retval
value="$_input"
- return $SUCCESS
+ return $DIALOG_OK
}
############################################################ MAIN
@@ -429,7 +429,7 @@ while :; do
;;
esac
- [ $? -eq $SUCCESS ] || f_dialog_msgbox "$err\n"
+ [ $? -eq $DIALOG_OK ] || f_dialog_msgbox "$err\n"
done
exit $SUCCESS
Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/startup/rcconf Wed Oct 9 08:12:26 2013
(r256181)
@@ -195,7 +195,7 @@ dialog_menu_main()
f_dialog_menutag_store "$menu_choice"
# Only update default-item on success
- [ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+ [ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
return $retval
}
@@ -236,13 +236,13 @@ while :; do
f_dialog_input_view_details
continue
esac
- elif [ $retval -eq 2 ]; then
+ elif [ $retval -eq $DIALOG_HELP ]; then
# The ``Help'' button (labeled "Details") was pressed
f_dialog_input_view_details
continue
fi
- [ $retval -eq 0 ] || f_die
+ [ $retval -eq $DIALOG_OK ] || f_die
case "$mtag" in
"X $msg_exit") break ;;
Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/startup/rcdelete Wed Oct 9 08:12:26 2013
(r256181)
@@ -232,7 +232,7 @@ dialog_menu_main()
f_dialog_menutag_store "$menu_choice"
# Only update default-item on success
- [ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+ [ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
return $retval
}
@@ -249,7 +249,7 @@ dialog_menu_confirm_delete()
local menu_list # Calculated below
local hline="$hline_arrows_tab_enter"
- [ $# -ge 1 ] || return $FAILURE
+ [ $# -ge 1 ] || return $DIALOG_CANCEL
# If asked to delete only one variable, simply ask and return
if [ $# -eq 1 ]; then
@@ -351,13 +351,13 @@ while :; do
f_dialog_input_view_details && dialog_create_main
continue
esac
- elif [ $retval -eq 2 ]; then
+ elif [ $retval -eq $DIALOG_HELP ]; then
# The ``Help'' button (labeled "Details") was pressed
f_dialog_input_view_details && dialog_create_main
continue
fi
- [ $retval -eq 0 ] || f_die
+ [ $retval -eq $DIALOG_OK ] || f_die
case "$mtag" in
"X $msg_exit_cancel") break ;;
Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar Wed Oct 9 07:55:21 2013
(r256180)
+++ head/usr.sbin/bsdconfig/startup/rcvar Wed Oct 9 08:12:26 2013
(r256181)
@@ -158,7 +158,7 @@ dialog_menu_main()
f_dialog_menutag_store "$menu_choice"
f_dialog_default_store "$menu_choice"
- if [ $retval -eq $SUCCESS ]; then
+ if [ $retval -eq $DIALOG_OK ]; then
local item
item=$( eval f_dialog_menutag2item${SHOW_DESC:+_with_help} \
\"\$menu_choice\" $menu_list )
Modified: head/usr.sbin/bsdconfig/startup/share/rcconf.subr
==============================================================================
--- head/usr.sbin/bsdconfig/startup/share/rcconf.subr Wed Oct 9 07:55:21
2013 (r256180)
+++ head/usr.sbin/bsdconfig/startup/share/rcconf.subr Wed Oct 9 08:12:26
2013 (r256181)
@@ -336,7 +336,7 @@ f_dialog_input_view_details()
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
