X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/097b27145d8b0e148636abd74ff80b8b92e25c05..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/package/base-files/files/etc/functions.sh?ds=sidebyside diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh index f4af4a857..828e37e40 100755 --- 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 alias debug=${DEBUG:-:} +alias mount='busybox mount' # newline N=" @@ -11,6 +12,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 +26,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 +46,7 @@ list_remove() { val2="${val##* $remove }" [ "$val2" = "$val" ] && return val="${val1## } ${val2%% }" + val="${val%% }" eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\"" } @@ -46,6 +58,7 @@ config_load() { reset_cb() { config_cb() { return 0; } option_cb() { return 0; } + list_cb() { return 0; } } reset_cb @@ -68,11 +81,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" @@ -98,8 +124,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}_} | \ @@ -152,6 +178,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