fix broadcast address (#1611)

[openwrt.git] / package / base-files / files / etc / functions.sh

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index 86ea82de678d569f743273afd5510afbd361a385..8d1117163d35401bca4da054735e3d8cd2f1deb1 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -55,7 +55,7 @@ config_rename() {
        local oldvar
        local newvar
        
-       [ "$OLD" -a "$NEW" ] || return
+       [ -n "$OLD" -a -n "$NEW" ] || return
        for oldvar in `set | grep ^CONFIG_${OLD}_ | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do
                newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
@@ -85,7 +85,11 @@ config_clear() {
 }
 
 config_load() {
-       local file="$UCI_ROOT/etc/config/$1"
+       local file
+       case "$1" in
+               /*) file="$1";;
+               *) file="$UCI_ROOT/etc/config/$1";;
+       esac
        _C=0
        export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
        export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
@@ -135,14 +139,16 @@ config_foreach() {
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
-               [ -n "$type" -a "$cfgtype" != "$type" ] && continue
+               [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
                eval "$function \"\$section\""
        done
 }
 
 load_modules() {
-       cd /etc/modules.d
-       sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       [ -d /etc/modules.d ] && {
+               cd /etc/modules.d
+               sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       }
 }
 
 include() {
@@ -180,7 +186,7 @@ strtok() { # <string> { <variable> [<separator>] ... }
                shift 2
        done
 
-       if [ $# -gt 0 -a "$val" ]; then
+       if [ $# -gt 0 -a -n "$val" ]; then
                export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
        fi