upgrade to uci 0.5.0, adds list handling support

[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 69af187..28bd792 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -10,6 +10,8 @@ N="
 
 _C=0
 NO_EXPORT=1
+LOAD_STATE=1
+LIST_SEP=" "
 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
@@ -23,12 +25,46 @@ append() {
        eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 }
 
+list_contains() {
+       local var="$1"
+       local str="$2"
+       local val
+
+       eval "val=\" \${$var} \""
+       [ "${val%% $str *}" != "$val" ]
+}
+
+list_remove() {
+       local var="$1"
+       local remove="$2"
+       local val
+
+       eval "val=\" \${$var} \""
+       val1="${val%% $remove *}"
+       [ "$val1" = "$val" ] && return
+       val2="${val##* $remove }"
+       [ "$val2" = "$val" ] && return
+       val="${val1## } ${val2%% }"
+       val="${val%% }"
+       eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
+}
+
+config_load() {
+       [ -n "$IPKG_INSTROOT" ] && return 0
+       uci_load "$@"
+}
+
 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }
+       list_cb() { return 0; }
 }
 reset_cb
 
+package() {
+       return 0
+}
+
 config () {
        local cfgtype="$1"
        local name="$2"
@@ -44,11 +80,24 @@ config () {
 option () {
        local varname="$1"; shift
        local value="$*"
-       
+
        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" 
+       len="$((${len:-0} + 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"
@@ -74,8 +123,8 @@ config_unset() {
 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}_} | \
@@ -84,37 +133,6 @@ config_clear() {
        done
 }
 
-config_load() {
-       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=
-
-       ${cfg:+. "$cfg"}
-       ${uci:+. "$uci"}
-       
-       ${CONFIG_SECTION:+config_cb}
-}
-
 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
@@ -159,6 +177,24 @@ config_foreach() {
        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
@@ -217,3 +253,16 @@ jffs2_mark_erase() {
        }
        echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1"
 }
+
+uci_apply_defaults() {(
+       cd /etc/uci-defaults || return 0
+       files="$(ls)"
+       [ -z "$files" ] && return 0
+       mkdir -p /tmp/.uci
+       for file in $files; do
+               ( . "./$(basename $file)" ) && rm -f "$file"
+       done
+       uci commit
+)}
+
+[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh