ebtables: fix use of cflags

[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 86ea82d..a613e11 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
        
        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}_}"
        for oldvar in `set | grep ^CONFIG_${OLD}_ | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do
                newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"


@@ -85,15 +85,32 @@ config_clear() {
 }
 
 config_load() {
 }
 
 config_load() {

-       local file="$UCI_ROOT/etc/config/$1"
+       local cfg
+       local uci
+       local PACKAGE="$1"
+
+       case "$PACKAGE" in
+               /*)     cfg="$PACKAGE"
+                       uci=""
+               ;;
+               *)      cfg="$UCI_ROOT/etc/config/$PACKAGE"
+                       uci="/tmp/.uci/${PACKAGE}"
+               ;;
+       esac
+
+       [ -e "$cfg" ] || cfg=""
+       [ -e "$uci" ] || uci=""
+
+       # no config
+       [ -z "$cfg" -a -z "$uci" ] && return 1
+

        _C=0
        export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
        export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
        export ${NO_EXPORT:+-n} CONFIG_SECTION=
        _C=0
        export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
        export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
        export ${NO_EXPORT:+-n} CONFIG_SECTION=

-       
-       [ -e "$file" ] && {
-               . $file
-       } || return 1
+
+       ${cfg:+. "$cfg"}
+       ${uci:+. "$uci"}

        
        ${CONFIG_SECTION:+config_cb}
 }
        
        ${CONFIG_SECTION:+config_cb}
 }


@@ -129,20 +146,24 @@ config_set() {
 
 config_foreach() {
        local function="$1"
 
 config_foreach() {
        local function="$1"

-       local type="$2"
+       [ "$#" -ge 1 ] && shift
+       local type="$1"
+       [ "$#" -ge 1 ] && shift

        local section cfgtype
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
        local section cfgtype
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE

-               [ -n "$type" -a "$cfgtype" != "$type" ] && continue
-               eval "$function \"\$section\""
+               [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
+               eval "$function \"\$section\" \"\$@\""

        done
 }
 
 load_modules() {
        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() {
 }
 
 include() {


@@ -180,7 +201,7 @@ strtok() { # <string> { <variable> [<separator>] ... }
                shift 2
        done
 
                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
 
                export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
        fi