functions.sh: use functions instead of aliases for the debug, mount wrappers - hush...

[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 f4af4a8..a788c4c 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -2,7 +2,13 @@
 # Copyright (C) 2006 OpenWrt.org
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
 
-alias debug=${DEBUG:-:}
+
+debug () {
+       ${DEBUG:-:}
+}
+mount() {
+       busybox mount
+}
 
 # newline
 N="
@@ -11,6 +17,7 @@ N="
 _C=0
 NO_EXPORT=1
 LOAD_STATE=1
+LIST_SEP=" "
 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
@@ -24,6 +31,15 @@ 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"
@@ -35,6 +51,7 @@ list_remove() {
        val2="${val##* $remove }"
        [ "$val2" = "$val" ] && return
        val="${val1## } ${val2%% }"
+       val="${val%% }"
        eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
 }
 
@@ -46,6 +63,7 @@ config_load() {
 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }
+       list_cb() { return 0; }
 }
 reset_cb
 
@@ -68,11 +86,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" 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"
@@ -98,8 +129,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}_} | \
@@ -108,22 +139,25 @@ config_clear() {
        done
 }
 
+# config_get <variable> <section> <option> [<default>]
+# config_get <section> <option>
 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
-       config_get "_tmp" "$2" "$3"
+       config_get _tmp "$2" "$3" "$4"
        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
+       export ${NO_EXPORT:+-n} "$1=$_tmp"
 }
 
 config_set() {
@@ -152,6 +186,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