X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/05adaa9794e41d02870a74a1ed7ba58cc59b9286..7e450a1c869a5b227e3c91c4e71049059f1193e6:/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 bf412df6d..c29ae772a 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -5,10 +5,11 @@
 alias debug=${DEBUG:-:}
 
 # newline
-readonly N="
+N="
 "
 
 _C=0
+NO_EXPORT=1
 
 hotplug_dev() {
 	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
@@ -19,7 +20,7 @@ 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\""
 }
 
 reset_cb() {
@@ -31,19 +32,20 @@ reset_cb
 config () {
 	local cfgtype="$1"
 	local name="$2"
-    
-	_C=$((_C + 1))
-	name="${name:-cfg${_C}}"
+	
+	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"
+	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"
+	export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
 	option_cb "$varname" "$*"
 }
 
@@ -57,11 +59,12 @@ config_rename() {
 	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,16 +75,21 @@ 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"
+	local file="$UCI_ROOT/etc/config/$1"
 	_C=0
-	CONFIG_SECTION=
+	export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
+	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
+	export ${NO_EXPORT:+-n} CONFIG_SECTION=
 	
 	[ -e "$file" ] && {
 		. $file
@@ -93,7 +101,18 @@ config_load() {
 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|enabled) export ${NO_EXPORT:+-n} "$1=1";;
+		0|off|disabled) export ${NO_EXPORT:+-n} "$1=0";;
+		*) eval "$1=${4:-0}";;
 	esac
 }
 
@@ -101,10 +120,24 @@ config_set() {
 	local section="$1"
 	local option="$2"
 	local value="$3"
-	export -n "CONFIG_${section}_${option}=$value"
+	export ${NO_EXPORT:+-n} "CONFIG_${section}_${option}=$value"
+}
+
+config_foreach() {
+	local function="$1"
+	local type="$2"
+	local section cfgtype
+	
+	[ -z "$CONFIG_SECTIONS" ] && return 0
+	for section in ${CONFIG_SECTIONS}; do
+		config_get cfgtype "$section" TYPE
+		[ -n "$type" -a "$cfgtype" != "$type" ] && continue
+		eval "$function \"\$section\""
+	done
 }
 
 load_modules() {
+	cd /etc/modules.d
 	sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
 }
 
@@ -118,9 +151,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,12 +172,12 @@ 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))
+		export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
 	fi
 
 	return $count