Author: dteske
Date: Mon Jun 24 20:58:54 2013
New Revision: 252178
URL: http://svnweb.freebsd.org/changeset/base/252178
Log:
More whitespace.
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/console/console
head/usr.sbin/bsdconfig/console/font
head/usr.sbin/bsdconfig/console/keymap
head/usr.sbin/bsdconfig/console/repeat
head/usr.sbin/bsdconfig/console/saver
head/usr.sbin/bsdconfig/console/screenmap
head/usr.sbin/bsdconfig/console/ttys
head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
head/usr.sbin/bsdconfig/docsinstall/docsinstall
head/usr.sbin/bsdconfig/dot/dot
head/usr.sbin/bsdconfig/mouse/disable
head/usr.sbin/bsdconfig/mouse/enable
head/usr.sbin/bsdconfig/mouse/flags
head/usr.sbin/bsdconfig/mouse/mouse
head/usr.sbin/bsdconfig/mouse/port
head/usr.sbin/bsdconfig/mouse/type
head/usr.sbin/bsdconfig/networking/defaultrouter
head/usr.sbin/bsdconfig/networking/devices
head/usr.sbin/bsdconfig/networking/hostname
head/usr.sbin/bsdconfig/networking/nameservers
head/usr.sbin/bsdconfig/networking/networking
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/packages/packages
head/usr.sbin/bsdconfig/password/password
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/tcpip.subr
head/usr.sbin/bsdconfig/share/packages/packages.subr
head/usr.sbin/bsdconfig/share/sysrc.subr
head/usr.sbin/bsdconfig/startup/misc
head/usr.sbin/bsdconfig/startup/rcadd
head/usr.sbin/bsdconfig/startup/rcconf
head/usr.sbin/bsdconfig/startup/rcdelete
head/usr.sbin/bsdconfig/startup/rcedit
head/usr.sbin/bsdconfig/startup/rcvar
head/usr.sbin/bsdconfig/startup/startup
head/usr.sbin/bsdconfig/timezone/timezone
head/usr.sbin/bsdconfig/ttys/ttys
head/usr.sbin/bsdconfig/usermgmt/groupadd
head/usr.sbin/bsdconfig/usermgmt/groupdel
head/usr.sbin/bsdconfig/usermgmt/groupedit
head/usr.sbin/bsdconfig/usermgmt/groupinput
head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
head/usr.sbin/bsdconfig/usermgmt/useradd
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 Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/bsdconfig Mon Jun 24 20:58:54 2013
(r252178)
@@ -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"
Modified: head/usr.sbin/bsdconfig/console/console
==============================================================================
--- head/usr.sbin/bsdconfig/console/console Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/console Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/font
==============================================================================
--- head/usr.sbin/bsdconfig/console/font Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/font Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/keymap
==============================================================================
--- head/usr.sbin/bsdconfig/console/keymap Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/keymap Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/repeat
==============================================================================
--- head/usr.sbin/bsdconfig/console/repeat Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/repeat Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/saver
==============================================================================
--- head/usr.sbin/bsdconfig/console/saver Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/saver Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/screenmap
==============================================================================
--- head/usr.sbin/bsdconfig/console/screenmap Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/screenmap Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/console/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/console/ttys Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/console/ttys Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/diskmgmt/diskmgmt
==============================================================================
--- head/usr.sbin/bsdconfig/diskmgmt/diskmgmt Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/diskmgmt/diskmgmt Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/docsinstall/docsinstall
==============================================================================
--- head/usr.sbin/bsdconfig/docsinstall/docsinstall Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/docsinstall/docsinstall Mon Jun 24 20:58:54
2013 (r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/dot/dot
==============================================================================
--- head/usr.sbin/bsdconfig/dot/dot Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/dot/dot Mon Jun 24 20:58:54 2013
(r252178)
@@ -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"
Modified: head/usr.sbin/bsdconfig/mouse/disable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/disable Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/disable Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/mouse/enable
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/enable Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/enable Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/mouse/flags
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/flags Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/flags Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/mouse/mouse
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/mouse Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/mouse Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/mouse/port
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/port Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/port Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/mouse/type
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/type Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/mouse/type Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/networking/defaultrouter
==============================================================================
--- head/usr.sbin/bsdconfig/networking/defaultrouter Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/defaultrouter Mon Jun 24 20:58:54
2013 (r252178)
@@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/networking/devices
==============================================================================
--- head/usr.sbin/bsdconfig/networking/devices Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/networking/devices Mon Jun 24 20:58:54 2013
(r252178)
@@ -56,7 +56,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/networking/hostname
==============================================================================
--- head/usr.sbin/bsdconfig/networking/hostname Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/networking/hostname Mon Jun 24 20:58:54 2013
(r252178)
@@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/networking/nameservers
==============================================================================
--- head/usr.sbin/bsdconfig/networking/nameservers Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/nameservers Mon Jun 24 20:58:54
2013 (r252178)
@@ -54,7 +54,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/networking/networking
==============================================================================
--- head/usr.sbin/bsdconfig/networking/networking Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/networking Mon Jun 24 20:58:54
2013 (r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/networking/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/device.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/device.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/networking/share/hostname.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/hostname.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/hostname.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
}
Modified: head/usr.sbin/bsdconfig/networking/share/ipaddr.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/ipaddr.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/ipaddr.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/networking/share/media.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/media.subr Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/media.subr Mon Jun 24 20:58:54
2013 (r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/networking/share/netmask.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/netmask.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/netmask.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
}
Modified: head/usr.sbin/bsdconfig/networking/share/resolv.subr
==============================================================================
--- head/usr.sbin/bsdconfig/networking/share/resolv.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/networking/share/resolv.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
;;
Modified: head/usr.sbin/bsdconfig/packages/packages
==============================================================================
--- head/usr.sbin/bsdconfig/packages/packages Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/packages/packages Mon Jun 24 20:58:54 2013
(r252178)
@@ -57,7 +57,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/password/password
==============================================================================
--- head/usr.sbin/bsdconfig/password/password Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/password/password Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/security/kern_securelevel
==============================================================================
--- head/usr.sbin/bsdconfig/security/kern_securelevel Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/security/kern_securelevel Mon Jun 24 20:58:54
2013 (r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/security/security
==============================================================================
--- head/usr.sbin/bsdconfig/security/security Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/security/security Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/share/common.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/common.subr Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/share/common.subr Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/share/device.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/device.subr Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/share/device.subr Mon Jun 24 20:58:54 2013
(r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/share/dialog.subr Mon Jun 24 20:58:54 2013
(r252178)
@@ -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
)
Modified: head/usr.sbin/bsdconfig/share/media/tcpip.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/tcpip.subr Mon Jun 24 20:39:07
2013 (r252177)
+++ head/usr.sbin/bsdconfig/share/media/tcpip.subr Mon Jun 24 20:58:54
2013 (r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/share/packages/packages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/packages/packages.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/share/packages/packages.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/share/sysrc.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/sysrc.subr Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/share/sysrc.subr Mon Jun 24 20:58:54 2013
(r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/startup/misc
==============================================================================
--- head/usr.sbin/bsdconfig/startup/misc Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/misc Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/startup/rcadd
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcadd Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/rcadd Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/startup/rcconf
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcconf Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/rcconf Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/startup/rcdelete
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcdelete Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/rcdelete Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/startup/rcedit
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcedit Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/rcedit Mon Jun 24 20:58:54 2013
(r252178)
@@ -51,7 +51,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/startup/rcvar
==============================================================================
--- head/usr.sbin/bsdconfig/startup/rcvar Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/rcvar Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/startup/startup
==============================================================================
--- head/usr.sbin/bsdconfig/startup/startup Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/startup/startup Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/timezone/timezone
==============================================================================
--- head/usr.sbin/bsdconfig/timezone/timezone Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/timezone/timezone Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/ttys/ttys
==============================================================================
--- head/usr.sbin/bsdconfig/ttys/ttys Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/ttys/ttys Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/groupadd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupadd Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/groupadd Mon Jun 24 20:58:54 2013
(r252178)
@@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/groupdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupdel Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/groupdel Mon Jun 24 20:58:54 2013
(r252178)
@@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/groupedit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupedit Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/groupedit Mon Jun 24 20:58:54 2013
(r252178)
@@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/groupinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/groupinput Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/groupinput Mon Jun 24 20:58:54 2013
(r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Mon Jun 24
20:39:07 2013 (r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr Mon Jun 24
20:58:54 2013 (r252178)
@@ -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 ;;
Modified: head/usr.sbin/bsdconfig/usermgmt/useradd
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useradd Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/useradd Mon Jun 24 20:58:54 2013
(r252178)
@@ -49,7 +49,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/userdel
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userdel Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/userdel Mon Jun 24 20:58:54 2013
(r252178)
@@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/useredit
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/useredit Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/useredit Mon Jun 24 20:58:54 2013
(r252178)
@@ -52,7 +52,7 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_
#
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 ))
Modified: head/usr.sbin/bsdconfig/usermgmt/userinput
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/userinput Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/userinput Mon Jun 24 20:58:54 2013
(r252178)
@@ -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
Modified: head/usr.sbin/bsdconfig/usermgmt/usermgmt
==============================================================================
--- head/usr.sbin/bsdconfig/usermgmt/usermgmt Mon Jun 24 20:39:07 2013
(r252177)
+++ head/usr.sbin/bsdconfig/usermgmt/usermgmt Mon Jun 24 20:58:54 2013
(r252178)
@@ -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 ))
_______________________________________________
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"
