Adopt a more C style for scripts and remove vim settings.

7 files changed, 61 insertions, 196 deletions

diff --git a/net/dhclient.sh b/net/dhclient.sh
index ef689337..196fea08 100644
--- a/net/dhclient.sh
+++ b/net/dhclient.sh
@@ -1,28 +1,8 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-dhclient_depend() {
+dhclient_depend()
+{
 	after interface
 	program start /sbin/dhclient
 	provide dhcp
@@ -30,7 +10,8 @@ dhclient_depend() {
 
 _config_vars="$_config_vars dhcp dhcpcd"
 
-dhclient_start() {
+dhclient_start()
+{
 	local args= opt= opts= pidfile="/var/run/dhclient-${IFACE}.pid"
 	local sendhost=true dconf=
 
@@ -63,14 +44,16 @@ dhclient_start() {
 	# Bring up DHCP for this interface
 	ebegin "Running dhclient"
 	echo "${dhconf}" | start-stop-daemon --start --exec /sbin/dhclient \
-		--pidfile "${pidfile}" -- ${args} -q -1 -pf "${pidfile}" "${IFACE}"
+		--pidfile "${pidfile}" \
+		-- ${args} -q -1 -pf "${pidfile}" "${IFACE}"
 	eend $? || return 1
 
 	_show_address
 	return 0
 }
 
-dhclient_stop() {
+dhclient_stop()
+{
 	local pidfile="/var/run/dhclient-${IFACE}.pid" opts=
 	[ ! -f "${pidfile}" ] && return 0
 
@@ -90,5 +73,3 @@ dhclient_stop() {
 	esac
 	eend $?
 }
-
-# vim: set ts=4 :
diff --git a/net/dhcpcd.sh b/net/dhcpcd.sh
index 43d22325..fe2fba53 100644
--- a/net/dhcpcd.sh
+++ b/net/dhcpcd.sh
@@ -1,28 +1,8 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-dhcpcd_depend() {
+dhcpcd_depend()
+{
 	after interface
 	program start dhcpcd
 	provide dhcp
@@ -33,7 +13,8 @@ dhcpcd_depend() {
 
 _config_vars="$_config_vars dhcp dhcpcd"
 
-dhcpcd_start() {
+dhcpcd_start()
+{
 	local args= opt= opts= pidfile="/var/run/dhcpcd-${IFACE}.pid"
 
 	eval args=\$dhcpcd_${IFVAR}
@@ -66,7 +47,8 @@ dhcpcd_start() {
 	return 0
 }
 
-dhcpcd_stop() {
+dhcpcd_stop()
+{
 	local pidfile="/var/run/dhcpcd-${IFACE}.pid" opts= sig=SIGTERM
 	[ ! -f "${pidfile}" ] && return 0
 
@@ -76,8 +58,6 @@ dhcpcd_stop() {
 	case " ${opts} " in
 		*" release "*) sig=SIGHUP;;
 	esac
-	start-stop-daemon --stop --quiet --signal "${sig}" --pidfile "${pidfile}"
+	start-stop-daemon --stop --quiet --signal ${sig} --pidfile "${pidfile}"
 	eend $?
 }
-
-# vim: set ts=4 :
diff --git a/net/macchanger.sh b/net/macchanger.sh
index b94a9bf4..42d3f73e 100644
--- a/net/macchanger.sh
+++ b/net/macchanger.sh
@@ -1,34 +1,15 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-macchanger_depend() {
+macchanger_depend()
+{
 	before macnet
 }
 
 _config_vars="$_config_vars mac"
 
-macchanger_pre_start() {
+macchanger_pre_start()
+{
 	# We don't change MAC addresses from background
 	yesno ${IN_BACKGROUND} && return 0
 
@@ -49,7 +30,8 @@ macchanger_pre_start() {
 	case "${mac}" in
 		# specific mac-addr
 		${hex}:${hex}:${hex}:${hex}:${hex}:${hex})
-			# We don't need macchanger to change to a specific mac address
+			# We don't need macchanger to change to a specific
+			# mac address
 			_set_mac_address "${mac}"
 			if eend "$?"; then
 				mac=$(_get_mac_address)
@@ -92,7 +74,7 @@ macchanger_pre_start() {
 	# Sometimes the interface needs to be up ....
 	if [ -z "${mac}" ]; then
 		mac=$(/sbin/macchanger ${opts} "${IFACE}" \
-			| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )
+		| sed -n -e 's/^Faked MAC:.*\<\(..:..:..:..:..:..\)\>.*/\U\1/p' )
 	fi
 
 	if [ -z "${mac}" ]; then
@@ -107,5 +89,3 @@ macchanger_pre_start() {
 
 	return 0
 }
-
-# vim: set ts=4 :
diff --git a/net/macnet.sh b/net/macnet.sh
index 936ff109..c1d5a78a 100644
--- a/net/macnet.sh
+++ b/net/macnet.sh
@@ -1,33 +1,14 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-macnet_depend() {
+macnet_depend()
+{
 	before rename interface wireless
 	after macchanger
 }
 
-macnet_pre_start() {
+macnet_pre_start()
+{
 	local mac=$(_get_mac_address 2>/dev/null)
 	[ -z "${mac}" ] && return 0
 
@@ -36,5 +17,3 @@ macnet_pre_start() {
 	_configure_variables "${mac}"
 	veend 0
 }
-
-# vim: set ts=4 :
diff --git a/net/ssidnet.sh b/net/ssidnet.sh
index f0f2e4fa..b9324d31 100644
--- a/net/ssidnet.sh
+++ b/net/ssidnet.sh
@@ -1,33 +1,14 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-ssidnet_depend() {
+ssidnet_depend()
+{
 	before interface system
 	after wireless
 }
 
-ssidnet_pre_start() {
+ssidnet_pre_start()
+{
 	[ -z "${SSID}" -a -z "${SSIDVAR}" ] && return 0
 
 	local mac=$(_get_ap_mac_address | sed -e 's/://g') x=
@@ -41,5 +22,3 @@ ssidnet_pre_start() {
 
 	veend 0
 }
-
-# vim: set ts=4 :
diff --git a/net/system.sh b/net/system.sh
index cbb30715..1b1b2715 100644
--- a/net/system.sh
+++ b/net/system.sh
@@ -1,37 +1,18 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
 _config_vars="$_config_vars dns_servers dns_domain dns_search"
 _config_vars="$_config_vars dns_sortlist dns_options"
 _config_vars="$_config_vars ntp_servers nis_servers nis_domain"
 
-system_depend() {
+system_depend()
+{
 	after interface
 	before dhcp
 }
 
-_system_dns() {
+_system_dns()
+{
 	local servers= domain= search= sortlist= options= x=
 
 	eval servers=\$dns_servers_${IFVAR}
@@ -72,7 +53,8 @@ _system_dns() {
 	fi
 }
 
-_system_ntp() {
+_system_ntp()
+{
 	local servers= buffer= x=
 
 	eval servers=\$ntp_servers_${IFVAR}
@@ -92,7 +74,8 @@ _system_ntp() {
 	chmod 644 /etc/ntp.conf
 }
 
-_system_nis() {
+_system_nis()
+{
 	local servers= domain= x= buffer=
 
 	eval servers=\$nis_servers_${IFVAR}
@@ -124,12 +107,11 @@ _system_nis() {
 	chmod 644 /etc/yp.conf
 }
 
-system_pre_start() {
+system_pre_start()
+{
 	_system_dns
 	_system_ntp 
 	_system_nis 
 
 	return 0
 }
-
-# vim: set ts=4 :
diff --git a/net/wpa_supplicant.sh b/net/wpa_supplicant.sh
index e18ffcb6..c6870b42 100644
--- a/net/wpa_supplicant.sh
+++ b/net/wpa_supplicant.sh
@@ -1,28 +1,8 @@
-# Copyright 2007 Roy Marples
+# Copyright 2007-2008 Roy Marples
 # All rights reserved
 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-wpa_supplicant_depend() {
+wpa_supplicant_depend()
+{
 	if [ -x /usr/sbin/wpa_supplicant ]; then
 		program start /usr/sbin/wpa_supplicant
 	else
@@ -39,7 +19,8 @@ wpa_supplicant_depend() {
 # Only set these functions if not set already
 # IE, prefer to use iwconfig
 if ! type _get_ssid >/dev/null 2>&1; then
-_get_ssid() {
+_get_ssid()
+{
 	local timeout=5 ssid=
 
 	while [ ${timeout} -gt 0 ]; do
@@ -55,13 +36,15 @@ _get_ssid() {
 	return 1
 }
 
-_get_ap_mac_address() {
+_get_ap_mac_address()
+{
 	wpa_cli -i"${IFACE}" status | sed -n -e 's/^bssid=\(.*\)$/\1/p' \
 		| tr '[:lower:]' '[:upper:]'
 }
 fi
 
-wpa_supplicant_pre_start() {
+wpa_supplicant_pre_start()
+{
 	local opts= cfgfile= ctrl_dir= wireless=true
 	local wpas=/usr/sbin/wpa_supplicant wpac=/usr/bin/wpa_cli
 
@@ -80,7 +63,8 @@ wpa_supplicant_pre_start() {
 	# We don't configure wireless if we're being called from
 	# the background unless we're not currently running
 	if yesno ${IN_BACKGROUND}; then
-		if ${wireless} && service_started_daemon "${SVCNAME}" "${wpas}"; then
+		if ${wireless} && \
+		service_started_daemon "${SVCNAME}" "${wpas}"; then
 			SSID=$(_get_ssid "${IFACE}")
 			SSIDVAR=$(_shell_var "${SSID}")
 			service_set_value "SSID" "${SSID}"
@@ -163,7 +147,8 @@ wpa_supplicant_pre_start() {
 	ebegin "Starting wpa_cli on" "${IFACE}"
 	start-stop-daemon --start --exec "${wpac}" \
 		--pidfile "/var/run/wpa_cli-${IFACE}.pid" \
-		-- -a /etc/wpa_supplicant/wpa_cli.sh -p "${ctrl_dir}" -i "${IFACE}" \
+		-- -a /etc/wpa_supplicant/wpa_cli.sh \
+		-p "${ctrl_dir}" -i "${IFACE}" \
 		-P "/var/run/wpa_cli-${IFACE}.pid" -B
 	if eend $?; then
 		ebegin "Backgrounding ..."
@@ -177,7 +162,8 @@ wpa_supplicant_pre_start() {
 	return 1
 }
 
-wpa_supplicant_post_stop() {
+wpa_supplicant_post_stop()
+{
 	local wpas=/usr/sbin/wpa_supplicant wpac=/usr/bin/wpa_cli
 
 	if [ ! -x "${wpas}" ]; then
@@ -209,5 +195,3 @@ wpa_supplicant_post_stop() {
 	[ -S "/var/run/wpa_supplicant/${IFACE}" ] \
 		&& rm -f "/var/run/wpa_supplicant/${IFACE}"
 }
-
-# vim: set ts=4 :