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

More whitespace.

Browse Source
This commit is contained in:
Devin Teske 2013-06-24 20:58:54 +00:00
parent b19b201996
commit c9c67103c3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=252178
57 changed files with 108 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/bsdconfig/bsdconfig
View File

@ -340,7 +340,7 @@ while :; do
f_getvar menu_program$mtag menu_program
case "$menu_program" in
/*) cmd="$menu_program";;
/*) cmd="$menu_program" ;;
*) cmd="$BSDCFG_LIBE/$menu_program"
esac
f_dprintf "cmd=[%s]" "$cmd"

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

@ -102,7 +102,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -122,7 +122,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -221,7 +221,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -102,7 +102,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -121,7 +121,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -106,7 +106,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -174,7 +174,7 @@ ttys_set_type()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/diskmgmt/diskmgmt
View File

@ -58,7 +58,7 @@ X11TERM_OPTS=
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/docsinstall/docsinstall
View File

@ -58,7 +58,7 @@ X11TERM_OPTS=
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

14
usr.sbin/bsdconfig/dot/dot
View File

@ -94,8 +94,8 @@ print_node()
shift 1 # node
case "$node" in
edge) printf '\t\t%s' "$node";;
*) printf '\t\t"%s"' "$node";;
edge) printf '\t\t%s' "$node" ;;
*) printf '\t\t"%s"' "$node" ;;
esac
if [ $# -gt 0 ]; then
@ -155,10 +155,10 @@ end_nodelist()
#
while getopts cdhi flag; do
case "$flag" in
i) SHOW_INCLUDES=;;
d) SHOW_GRAPH_LABEL_DATE=;;
c) SHOW_CMDLINE=;;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
i) SHOW_INCLUDES= ;;
d) SHOW_GRAPH_LABEL_DATE= ;;
c) SHOW_CMDLINE= ;;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))
@ -611,7 +611,7 @@ for INDEX in */INDEX; do
printf '\tsubgraph "cluster_%s" {\n' "$item"
case "$item" in
[0-9][0-9][0-9].*) bgcolor="$bgcolor_menuitem";;
[0-9][0-9][0-9].*) bgcolor="$bgcolor_menuitem" ;;
*) bgcolor="$bgcolor_shortcuts"
esac
printf '\t\tbgcolor = "%s";\n' "$bgcolor"

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

@ -58,7 +58,7 @@ MOUSED_PIDFILE=/var/run/moused.pid
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/mouse/enable
View File

@ -58,7 +58,7 @@ MOUSED_PIDFILE=/var/run/moused.pid
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/mouse/flags
View File

@ -58,7 +58,7 @@ MOUSED_PIDFILE=/var/run/moused.pid
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -101,7 +101,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -106,7 +106,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -114,7 +114,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/networking/defaultrouter
View File

@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/networking/devices
View File

@ -56,7 +56,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/networking/hostname
View File

@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/networking/nameservers
View File

@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -100,7 +100,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -261,7 +261,7 @@ f_dialog_menu_netdev_edit()
# read and display in the summary dialog.
#
case "$tag" in
X\ *) break;;
X\ *) break ;;
2\ *) #
# Do not proceed if/when there are NFS-mounts currently
# active. If the network is changed while NFS-exported
@ -313,11 +313,11 @@ f_dialog_menu_netdev_edit()
fi
;;
3\ *) f_dialog_input_ipaddr "$interface" "$ipaddr"
[ $? -eq $SUCCESS ] && dhcp=;;
[ $? -eq $SUCCESS ] && dhcp= ;;
4\ *) f_dialog_input_netmask "$interface" "$netmask"
[ $? -eq $SUCCESS -a "$_netmask" ] && dhcp=;;
[ $? -eq $SUCCESS -a "$_netmask" ] && dhcp= ;;
5\ *) f_dialog_menu_media_options "$interface" "$options"
[ $? -eq $SUCCESS ] && dhcp=;;
[ $? -eq $SUCCESS ] && dhcp= ;;
esac
done

11
usr.sbin/bsdconfig/networking/share/hostname.subr
View File

@ -53,11 +53,12 @@ f_dialog_hnerror()
[ ${error:-0} -ne 0 ] || return $SUCCESS
case "$error" in
1) f_show_msg "$msg_hostname_label_contains_invalid_chars" "$fqhn";;
2) f_show_msg "$msg_hostname_label_starts_or_ends_with_hyphen" "$fqhn";;
3) f_show_msg "$msg_hostname_label_is_null" "$fqhn";;
63) f_show_msg "$msg_hostname_label_exceeds_max_length" "$fqhn";;
255) f_show_msg "$msg_hostname_exceeds_max_length" "$fqhn";;
1) f_show_msg "$msg_hostname_label_contains_invalid_chars" "$fqhn" ;;
2) f_show_msg \
"$msg_hostname_label_starts_or_ends_with_hyphen" "$fqhn" ;;
3) f_show_msg "$msg_hostname_label_is_null" "$fqhn" ;;
63) f_show_msg "$msg_hostname_label_exceeds_max_length" "$fqhn" ;;
255) f_show_msg "$msg_hostname_exceeds_max_length" "$fqhn" ;;
esac
}

16
usr.sbin/bsdconfig/networking/share/ipaddr.subr
View File

@ -52,10 +52,10 @@ f_dialog_iperror()
[ ${error:-0} -ne 0 ] || return $SUCCESS
case "$error" in
1) f_show_msg "$msg_ipv4_addr_octet_contains_invalid_chars" "$ip";;
2) f_show_msg "$msg_ipv4_addr_octet_is_null" "$ip";;
3) f_show_msg "$msg_ipv4_addr_octet_exceeds_max_value" "$ip";;
4) f_show_msg "$msg_ipv4_addr_octet_missing_or_extra" "$ip";;
1) f_show_msg "$msg_ipv4_addr_octet_contains_invalid_chars" "$ip" ;;
2) f_show_msg "$msg_ipv4_addr_octet_is_null" "$ip" ;;
3) f_show_msg "$msg_ipv4_addr_octet_exceeds_max_value" "$ip" ;;
4) f_show_msg "$msg_ipv4_addr_octet_missing_or_extra" "$ip" ;;
esac
}
@ -91,10 +91,10 @@ f_dialog_ip6error()
[ ${error:-0} -ne 0 ] || return $SUCCESS
case "$error" in
1) f_show_msg "$msg_ipv6_addr_segment_contains_invalid_chars" "$ip";;
2) f_show_msg "$msg_ipv6_addr_too_many_null_segments" "$ip";;
3) f_show_msg "$msg_ipv6_addr_segment_contains_too_many_chars" "$ip";;
4) f_show_msg "$msg_ipv6_addr_too_few_or_extra_segments" "$ip";;
1) f_show_msg "$msg_ipv6_addr_segment_contains_invalid_chars" "$ip" ;;
2) f_show_msg "$msg_ipv6_addr_too_many_null_segments" "$ip" ;;
3) f_show_msg "$msg_ipv6_addr_segment_contains_too_many_chars" "$ip" ;;
4) f_show_msg "$msg_ipv6_addr_too_few_or_extra_segments" "$ip" ;;
*)
if [ $(( $error & 0xF )) -eq 5 ]; then
# IPv4 at the end of IPv6 address is invalid

2
usr.sbin/bsdconfig/networking/share/media.subr
View File

@ -68,7 +68,7 @@ f_ifconfig_options()
output=
while [ $# -gt 0 ]; do
case "$1" in
inet|netmask) shift 1;;
inet|netmask) shift 1 ;;
*) output="$output${output:+ }$1"
esac
shift 1

10
usr.sbin/bsdconfig/networking/share/netmask.subr
View File

@ -52,11 +52,11 @@ f_dialog_maskerror()
[ ${error:-0} -ne 0 ] || return $SUCCESS
case "$error" in
1) f_show_msg "$msg_ipv4_mask_field_contains_invalid_chars" "$mask";;
2) f_show_msg "$msg_ipv4_mask_field_is_null" "$mask";;
3) f_show_msg "$msg_ipv4_mask_field_exceeds_max_value" "$mask";;
4) f_show_msg "$msg_ipv4_mask_field_missing_or_extra" "$mask";;
5) f_show_msg "$msg_ipv4_mask_field_invalid_value" "$mask";;
1) f_show_msg "$msg_ipv4_mask_field_contains_invalid_chars" "$mask" ;;
2) f_show_msg "$msg_ipv4_mask_field_is_null" "$mask" ;;
3) f_show_msg "$msg_ipv4_mask_field_exceeds_max_value" "$mask" ;;
4) f_show_msg "$msg_ipv4_mask_field_missing_or_extra" "$mask" ;;
5) f_show_msg "$msg_ipv4_mask_field_invalid_value" "$mask" ;;
esac
}

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

@ -370,11 +370,11 @@ f_dialog_input_nameserver()
#
local retval=$?
case $retval in
1) f_die 1 "$msg_internal_error_nsindex_value" "$nsindex";;
1) f_die 1 "$msg_internal_error_nsindex_value" "$nsindex" ;;
2) f_dialog_msgbox "$msg_resolv_conf_changed_while_editing"
return $retval;;
return $retval ;;
3) f_dialog_msgbox "$msg_resolv_conf_entry_no_longer_exists"
return $retval;;
return $retval ;;
esac
#
@ -460,7 +460,7 @@ f_dialog_menu_nameservers()
fi
case "$tag" in
"X $msg_exit") break;;
"X $msg_exit") break ;;
"A $msg_add")
f_dialog_input_nameserver
;;

2
usr.sbin/bsdconfig/packages/packages
View File

@ -57,7 +57,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/password/password
View File

@ -57,7 +57,7 @@ USER_ROOT=root
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -111,7 +111,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -138,7 +138,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

4
usr.sbin/bsdconfig/share/common.subr
View File

@ -144,8 +144,8 @@ f_debug_init()
while getopts "$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" flag \
> /dev/null; do
case "$flag" in
d) debug=1;;
D) debugFile="$OPTARG";;
d) debug=1 ;;
D) debugFile="$OPTARG" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -486,11 +486,11 @@ f_device_desc()
# Sensible fall-backs for specific types
#
case "$__type" in
$DEVICE_TYPE_CDROM) __cp="<unknown cdrom device type>";;
$DEVICE_TYPE_DISK) __cp="<unknown disk device type>";;
$DEVICE_TYPE_FLOPPY) __cp="<unknown floppy device type>";;
$DEVICE_TYPE_USB) __cp="<unknown usb storage device type>";;
$DEVICE_TYPE_NETWORK) __cp="<unknown network interface type>";;
$DEVICE_TYPE_CDROM) __cp="<unknown cdrom device type>" ;;
$DEVICE_TYPE_DISK) __cp="<unknown disk device type>" ;;
$DEVICE_TYPE_FLOPPY) __cp="<unknown floppy device type>" ;;
$DEVICE_TYPE_USB) __cp="<unknown usb storage device type>" ;;
$DEVICE_TYPE_NETWORK) __cp="<unknown network interface type>" ;;
*)
__cp="<unknown device type>"
esac

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

@ -2026,7 +2026,7 @@ f_dialog_init()
"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
flag > /dev/null; do
case "$flag" in
S) echo 1;;
S) echo 1 ;;
esac
done
)
@ -2035,7 +2035,7 @@ f_dialog_init()
"$GETOPTS_STDARGS$GETOPTS_EXTRA$GETOPTS_ALLFLAGS" \
flag > /dev/null; do
case "$flag" in
S|X) echo 1;;
S|X) echo 1 ;;
esac
done
)

4
usr.sbin/bsdconfig/share/media/tcpip.subr
View File

@ -411,8 +411,8 @@ f_validate_netmask()
# Return error if the field is an invalid integer
case "$field" in
0|128|192|224|240|248|252|254|255) :;;
*) return 5;;
0|128|192|224|240|248|252|254|255) : ;;
*) return 5 ;;
esac
nfields=$(( $nfields + 1 ))

6
usr.sbin/bsdconfig/share/packages/packages.subr
View File

@ -197,7 +197,7 @@ f_package_calculate_totals()
f_getvar _mark_$varpkg mark
case "$mark" in
""|" ") : ;;
X) tinstalled=$(( $tinstalled + 1 ));;
X) tinstalled=$(( $tinstalled + 1 )) ;;
*) tselected=$(( $tselected + 1 ))
esac
f_getvar _categories_$varpkg pkgcat
@ -206,7 +206,7 @@ f_package_calculate_totals()
case "$mark" in
""|" ") : ;;
X) debug= f_getvar _${varcat}_ninstalled n
setvar _${varcat}_ninstalled $(( $n + 1 ));;
setvar _${varcat}_ninstalled $(( $n + 1 )) ;;
*) debug= f_getvar _${varcat}_nselected n
setvar _${varcat}_nselected $(( $n + 1 ))
esac
@ -381,7 +381,7 @@ f_package_menu_select()
# Get number of packages for this category
local npkgs=0
case "$category" in
"$msg_all"|"") npkgs="${_npkgs:-0}";;
"$msg_all"|"") npkgs="${_npkgs:-0}" ;;
*) f_getvar _npkgs_$varcat npkgs
esac

4
usr.sbin/bsdconfig/share/sysrc.subr
View File

@ -135,7 +135,7 @@ f_sysrc_get()
case "$1" in
[0-9]*)
# Don't expand possible positional parameters
return $FAILURE;;
return $FAILURE ;;
*)
[ "$1" ] || return $FAILURE
esac
@ -218,7 +218,7 @@ f_sysrc_get_default()
case "$1" in
[0-9]*)
# Don't expand possible positional parameters
return $FAILURE;;
return $FAILURE ;;
*)
[ "$1" ] || return $FAILURE
esac

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

@ -325,7 +325,7 @@ dialog_input_value()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -99,7 +99,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -210,7 +210,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -316,7 +316,7 @@ dialog_menu_confirm_delete()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/startup/rcedit
View File

@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -178,7 +178,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -99,7 +99,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -127,14 +127,14 @@ dialog_menu_main()
#
while getopts C:ehnrsv$GETOPTS_STDARGS flag; do
case "$flag" in
C) CHROOTENV="$OPTARG";;
e) TZ_OR_FAIL=1;;
n) REALLYDOIT=;;
C) CHROOTENV="$OPTARG" ;;
e) TZ_OR_FAIL=1 ;;
n) REALLYDOIT= ;;
r) REINSTALL=1
USEDIALOG=;;
s) SKIPUTC=1;;
v) VERBOSE=1;;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
USEDIALOG= ;;
s) SKIPUTC=1 ;;
v) VERBOSE=1 ;;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/ttys/ttys
View File

@ -69,7 +69,7 @@ ETC_TTYS=/etc/ttys
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/usermgmt/groupadd
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/usermgmt/groupdel
View File

@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/usermgmt/groupedit
View File

@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -139,8 +139,8 @@ while [ $# -gt 0 ]; do
value="${1#*=}"
f_dprintf "key=[%s] value=[%s]" "$key" "$value"
case "$key" in
mode) mode="$value";;
group) group="$value";;
mode) mode="$value" ;;
group) group="$value" ;;
esac
shift
done

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

@ -590,9 +590,9 @@ f_dialog_input_expire_password()
f_dprintf "ret_days=[%s]" "$ret_days"
case "$ret_days" in
[-+]*) _input=$( date -v${ret_days}d +%s );;
0) _input=$( date +%s );;
*) _input=$( date -v+${ret_days}d +%s );;
[-+]*) _input=$( date -v${ret_days}d +%s ) ;;
0) _input=$( date +%s ) ;;
*) _input=$( date -v+${ret_days}d +%s ) ;;
esac
f_dprintf "_input=[%s]" "$_input"
break ;;
@ -775,9 +775,9 @@ f_dialog_input_expire_account()
f_dprintf "ret_days=[%s]" "$ret_days"
case "$ret_days" in
[-+]*) _input=$( date -v${ret_days}d +%s );;
0) _input=$( date +%s );;
*) _input=$( date -v+${ret_days}d +%s );;
[-+]*) _input=$( date -v${ret_days}d +%s ) ;;
0) _input=$( date +%s ) ;;
*) _input=$( date -v+${ret_days}d +%s ) ;;
esac
f_dprintf "_input=[%s]" "$_input"
break ;;

2
usr.sbin/bsdconfig/usermgmt/useradd
View File

@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/usermgmt/userdel
View File

@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

2
usr.sbin/bsdconfig/usermgmt/useredit
View File

@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))

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

@ -220,8 +220,8 @@ while [ $# -gt 0 ]; do
value="${1#*=}"
f_dprintf "key=[%s] value=[%s]" "$key" "$value"
case "$key" in
mode) mode="$value";;
user) user="$value";;
mode) mode="$value" ;;
user) user="$value" ;;
esac
shift
done

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

@ -115,7 +115,7 @@ dialog_menu_main()
#
while getopts h$GETOPTS_STDARGS flag; do
case "$flag" in
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm";;
h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
esac
done
shift $(( $OPTIND - 1 ))