X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a5f42890e449d5c40e29de2648693667377f48c9..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/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 5c353a3d0..828e37e40 100755 --- a/package/base-files/files/etc/functions.sh +++ b/package/base-files/files/etc/functions.sh @@ -3,15 +3,19 @@ # Copyright (C) 2006 Fokus Fraunhofer alias debug=${DEBUG:-:} +alias mount='busybox mount' # newline N=" " _C=0 +NO_EXPORT=1 +LOAD_STATE=1 +LIST_SEP=" " hotplug_dev() { - env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net + env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net } append() { @@ -19,33 +23,80 @@ 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\"" +} + +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" - CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1)) + export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1)) name="${name:-cfg$CONFIG_NUM_SECTIONS}" append CONFIG_SECTIONS "$name" - config_cb "$cfgtype" "$name" - CONFIG_SECTION="$name" - export -n "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype" + [ -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" "$*" +} + +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() { @@ -54,16 +105,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 - CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")" + 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() { @@ -73,9 +124,9 @@ config_unset() { config_clear() { local SECTION="$1" local oldvar - - CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , ,")" - CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}" + + list_remove CONFIG_SECTIONS "$SECTION" + export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}" for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \ sed -e 's/\(.*\)=.*$/\1/'` ; do @@ -83,24 +134,21 @@ config_clear() { done } -config_load() { - local file="/etc/config/$1" - _C=0 - CONFIG_SECTIONS= - CONFIG_NUM_SECTIONS=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