add missing symbol

[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 bf412df..af4eae2 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -5,13 +5,15 @@
 alias debug=${DEBUG:-:}
 
 # newline
-readonly N="
+N="
 "
 
 _C=0
+NO_EXPORT=1
+LOAD_STATE=1
 
 hotplug_dev() {
-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
+       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
 }
 
 append() {
@@ -19,7 +21,12 @@ append() {
        local value="$2"
        local sep="${3:- }"
        
-       eval "export -n -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+       eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+}
+
+config_load() {
+       [ -n "$IPKG_INSTROOT" ] && return 0
+       uci_load "$@"
 }
 
 reset_cb() {
@@ -28,23 +35,28 @@ reset_cb() {
 }
 reset_cb
 
+package() {
+       return 0
+}
+
 config () {
        local cfgtype="$1"
        local name="$2"
-    
-       _C=$((_C + 1))
-       name="${name:-cfg${_C}}"
-       config_cb "$cfgtype" "$name"
-       CONFIG_SECTION="$name"
-       export -n "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
+       
+       export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
+       name="${name:-cfg$CONFIG_NUM_SECTIONS}"
+       append CONFIG_SECTIONS "$name"
+       [ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
+       export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
+       export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
 }
 
 option () {
        local varname="$1"; shift
        local value="$*"
        
-       export -n "CONFIG_${CONFIG_SECTION}_${varname}=$value"
-       option_cb "$varname" "$*"
+       export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
+       [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 }
 
 config_rename() {
@@ -53,15 +65,16 @@ 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}_}"
-               eval "export -n \"$newvar=\${$oldvar}\""
+               eval "export ${NO_EXPORT:+-n} \"$newvar=\${$oldvar}\""
                unset "$oldvar"
        done
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"
        
-       [ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW"
+       [ "$CONFIG_SECTION" = "$OLD" ] && export ${NO_EXPORT:+-n} CONFIG_SECTION="$NEW"
 }
 
 config_unset() {
@@ -72,28 +85,30 @@ config_clear() {
        local SECTION="$1"
        local oldvar
        
-       for oldvar in `set | grep ^CONFIG_${SECTION}_ | \
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , ,")"
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
+
+       for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do 
                unset $oldvar 
        done
 }
 
-config_load() {
-       local file="/etc/config/$1"
-       _C=0
-       CONFIG_SECTION=
-       
-       [ -e "$file" ] && {
-               . $file
-       } || return 1
-       
-       ${CONFIG_SECTION:+config_cb}
-}
-
 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
-               *)  eval "export -n -- \"$1=\${CONFIG_${2}_${3}}\"";;
+               *)  eval "export ${NO_EXPORT:+-n} -- \"$1=\${CONFIG_${2}_${3}}\"";;
+       esac
+}
+
+# config_get_bool <variable> <section> <option> [<default>]
+config_get_bool() {
+       local _tmp
+       config_get "_tmp" "$2" "$3"
+       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";;
        esac
 }
 
@@ -101,11 +116,33 @@ config_set() {
        local section="$1"
        local option="$2"
        local value="$3"
-       export -n "CONFIG_${section}_${option}=$value"
+       local old_section="$CONFIG_SECTION"
+
+       CONFIG_SECTION="$section"
+       option "$option" "$value"
+       CONFIG_SECTION="$old_section"
+}
+
+config_foreach() {
+       local function="$1"
+       [ "$#" -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
+               [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
+               eval "$function \"\$section\" \"\$@\""
+       done
 }
 
 load_modules() {
-       sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       [ -d /etc/modules.d ] && {
+               cd /etc/modules.d
+               sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       }
 }
 
 include() {
@@ -118,9 +155,11 @@ include() {
 
 find_mtd_part() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+       local PREFIX=/dev/mtdblock
        
        PART="${PART##mtd}"
-       echo "${PART:+/dev/mtdblock/$PART}"
+       [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+       echo "${PART:+$PREFIX$PART}"
 }
 
 strtok() { # <string> { <variable> [<separator>] ... }
@@ -137,13 +176,36 @@ strtok() { # <string> { <variable> [<separator>] ... }
 
                val="${val#$tmp$2}"
 
-               export -n "$1=$tmp"; count=$((count+1))
+               export ${NO_EXPORT:+-n} "$1=$tmp"; count=$((count+1))
                shift 2
        done
 
-       if [ $# -gt 0 -a "$val" ]; then
-               export -n "$1=$val"; count=$((count+1))
+       if [ $# -gt 0 -a -n "$val" ]; then
+               export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
        fi
 
        return $count
 }
+
+
+jffs2_mark_erase() {
+       local part="$(find_mtd_part "$1")"
+       [ -z "$part" ] && {
+               echo Partition not found.
+               return 1
+       }
+       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