base-files: port functions.sh to new config_get

[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 01db77c..eb7faac 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -3,6 +3,7 @@
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 
 alias debug=${DEBUG:-:}
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 
 alias debug=${DEBUG:-:}

+alias mount='busybox mount'

 
 # newline
 N="
 
 # newline
 N="


@@ -11,6 +12,7 @@ N="
 _C=0
 NO_EXPORT=1
 LOAD_STATE=1
 _C=0
 NO_EXPORT=1
 LOAD_STATE=1

+LIST_SEP=" "

 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net


@@ -44,6 +46,7 @@ list_remove() {
        val2="${val##* $remove }"
        [ "$val2" = "$val" ] && return
        val="${val1## } ${val2%% }"
        val2="${val##* $remove }"
        [ "$val2" = "$val" ] && return
        val="${val1## } ${val2%% }"

+       val="${val%% }"

        eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
 }
 
        eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
 }
 


@@ -55,6 +58,7 @@ config_load() {
 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }
 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }

+       list_cb() { return 0; }

 }
 reset_cb
 
 }
 reset_cb
 


@@ -77,11 +81,24 @@ config () {
 option () {
        local varname="$1"; shift
        local value="$*"
 option () {
        local varname="$1"; shift
        local value="$*"

-       
+

        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
        [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 }
 
        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
        [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 }
 

+list() {
+       local varname="$1"; shift
+       local value="$*"
+       local len
+
+       config_get len "$CONFIG_SECTION" "${varname}_LENGTH" 0
+       len=$(($len + 1))
+       config_set "$CONFIG_SECTION" "${varname}_ITEM$len" "$value"
+       config_set "$CONFIG_SECTION" "${varname}_LENGTH" "$len"
+       append "CONFIG_${CONFIG_SECTION}_${varname}" "$value" "$LIST_SEP"
+       list_cb "$varname" "$*"
+}
+

 config_rename() {
        local OLD="$1"
        local NEW="$2"
 config_rename() {
        local OLD="$1"
        local NEW="$2"


@@ -107,8 +124,8 @@ config_unset() {
 config_clear() {
        local SECTION="$1"
        local oldvar
 config_clear() {
        local SECTION="$1"
        local oldvar

-       
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , ,")"
+
+       list_remove CONFIG_SECTIONS "$SECTION"

        export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
        export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \


@@ -117,22 +134,25 @@ config_clear() {
        done
 }
 
        done
 }
 

+# config_get <variable> <section> <option> [<default>]
+# config_get <section> <option>

 config_get() {
        case "$3" in
 config_get() {
        case "$3" in

-               "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
-               *)  eval "export ${NO_EXPORT:+-n} -- \"$1=\${CONFIG_${2}_${3}}\"";;
+               "") eval echo "\${CONFIG_${1}_${2}:-\${4}}";;
+               *)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;

        esac
 }
 
 # config_get_bool <variable> <section> <option> [<default>]
 config_get_bool() {
        local _tmp
        esac
 }
 
 # config_get_bool <variable> <section> <option> [<default>]
 config_get_bool() {
        local _tmp

-       config_get "_tmp" "$2" "$3"
+       config_get _tmp "$2" "$3" "$4"

        case "$_tmp" in
        case "$_tmp" in

-               1|on|true|enabled) export ${NO_EXPORT:+-n} "$1=1";;
-               0|off|false|disabled) export ${NO_EXPORT:+-n} "$1=0";;
-               *) eval "$1=$4";;
+               1|on|true|enabled) _tmp=1;;
+               0|off|false|disabled) _tmp=0;;
+               *) _tmp="$4";;

        esac
        esac

+       export ${NO_EXPORT:+-n} "$1=$_tmp"

 }
 
 config_set() {
 }
 
 config_set() {


@@ -161,6 +181,24 @@ config_foreach() {
        done
 }
 
        done
 }
 

+config_list_foreach() {
+       [ "$#" -ge 3 ] || return 0
+       local section="$1"; shift
+       local option="$1"; shift
+       local function="$1"; shift
+       local val
+       local len
+       local c=1
+
+       config_get len "${section}" "${option}_LENGTH"
+       [ -z "$len" ] && return 0
+       while [ $c -le "$len" ]; do
+               config_get val "${section}" "${option}_ITEM$c"
+               eval "$function \"\$val\" \"$@\""
+               c="$(($c + 1))"
+       done
+}
+

 load_modules() {
        [ -d /etc/modules.d ] && {
                cd /etc/modules.d
 load_modules() {
        [ -d /etc/modules.d ] && {
                cd /etc/modules.d