X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=sh%2Fjshn.sh;h=5db1667d1f69ecec400c9d4a4de1970a5b36f990;hp=3aff5ea92adebd0249bc99056671e550ce0ac7d7;hb=bd388d2b6c2c151bf513c1e449417d18ce02d10b;hpb=1a32939cb5ad3fabed9d78c030e2746cdbbdc038;ds=sidebyside

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 3aff5ea..5db1667 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -1,122 +1,97 @@
 # functions for parsing and generating json
 
 _json_get_var() {
-	local ___dest="$1"
-	local ___var="$2"
-	eval "$___dest=\"\$${JSON_PREFIX}$___var\""
+	# dest=$1
+	# var=$2
+	eval "$1=\"\$${JSON_PREFIX}$2\""
 }
 
 _json_set_var() {
-	local ___var="$1"
+	# var=$1
 	local ___val="$2"
-	eval "${JSON_PREFIX}$___var=\"\$___val\""
+	eval "${JSON_PREFIX}$1=\"\$___val\""
 }
 
 __jshn_raw_append() {
-	local var="$1"
+	# var=$1
 	local value="$2"
 	local sep="${3:- }"
 
-	eval "export -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+	eval "export -- \"$1=\${$1:+\${$1}\${value:+\$sep}}\$value\""
 }
 
-
 _jshn_append() {
-	local __var="$1"
-	local __value="$2"
-	local __sep="${3:- }"
-	local __old_val
-
-	_json_get_var __old_val "$__var"
-	__value="${__old_val:+$__old_val$__sep}$__value"
-	_json_set_var "$__var" "$__value"
-}
-
-_json_export() {
-	local __var="${JSON_PREFIX}$1"
-	local __val="$2"
-
-	export -- "$__var=$__val"
-}
-
-_json_add_key() {
-	local table="$1"
-	local var="$2"
-	_jshn_append "KEYS_${table}" "$var"
+	# var=$1
+	local _a_value="$2"
+	eval "${JSON_PREFIX}$1=\"\${${JSON_PREFIX}$1} \$_a_value\""
 }
 
 _get_var() {
-	local __dest="$1"
-	local __var="$2"
-	eval "$__dest=\"\$$__var\""
+	# var=$1
+	# value=$2
+	eval "$1=\"\$$2\""
 }
 
 _set_var() {
-	local __var="$1"
+	# var=$1
 	local __val="$2"
-	eval "$__var=\"\$__val\""
+	eval "$1=\"\$__val\""
 }
 
 _json_inc() {
-	local _var="$1"
-	local _dest="$2"
-	local _seq
-
-	_json_get_var _seq "$_var"
-	_seq="$((${_seq:-0} + 1))"
-	_json_set_var "$_var" "$_seq"
-	[ -n "$_dest" ] && _set_var "$_dest" "$_seq"
+	# var=$1
+	# dest=$2
+
+	eval "${JSON_PREFIX}$1=\$(( \${${JSON_PREFIX}$1:-0} + 1))${2:+; $2=\"\$${JSON_PREFIX}$1\"}"
 }
 
 _json_add_generic() {
-	local type="$1"
-	local var="$2"
-	local val="$3"
-	local cur="$4"
-
-	[ -n "$cur" ] || _json_get_var cur JSON_CUR
-
-	if [ "${cur%%[0-9]*}" = "JSON_ARRAY" ]; then
-		_json_inc "SEQ_$cur" var
+	# type=$1
+	# name=$2
+	# value=$3
+	# cur=$4
+
+	local var
+	if [ "${4%%[0-9]*}" = "JSON_ARRAY" ]; then
+		_json_inc "SEQ_$4" var
 	else
-		local name="${var//[^a-zA-Z0-9_]/_}"
-		[[ "$name" == "$var" ]] || _json_export "NAME_${cur}_${name}" "$var"
+		local name="${2//[^a-zA-Z0-9_]/_}"
+		[[ "$name" == "$2" ]] || export -- "${JSON_PREFIX}NAME_${4}_${name}=$2"
 		var="$name"
 	fi
 
-	_json_export "${cur}_$var" "$val"
-	_json_export "TYPE_${cur}_$var" "$type"
-	_jshn_append "JSON_UNSET" "${cur}_$var"
-	_json_add_key "$cur" "$var"
+	local cur_var=
+	export -- \
+		"${JSON_PREFIX}${4}_$var=$3" \
+		"${JSON_PREFIX}TYPE_${4}_$var=$1"
+	_jshn_append "JSON_UNSET" "${4}_$var"
+	_jshn_append "KEYS_$4" "$var"
 }
 
 _json_add_table() {
-	local name="$1"
-	local type="$2"
-	local itype="$3"
-	local cur new_cur
-	local seq
+	# name=$1
+	# type=$2
+	# itype=$3
+	local cur seq
 
 	_json_get_var cur JSON_CUR
 	_json_inc JSON_SEQ seq
 
-	local table="JSON_$itype$seq"
+	local table="JSON_$3$seq"
 	_json_set_var "UP_$table" "$cur"
-	_json_export "KEYS_$table" ""
-	[ "$itype" = "ARRAY" ] && _json_export "SEQ_$table" ""
+	export -- "${JSON_PREFIX}KEYS_$table="
+	unset "${JSON_PREFIX}SEQ_$table"
 	_json_set_var JSON_CUR "$table"
 	_jshn_append "JSON_UNSET" "$table"
 
-	_json_get_var new_cur JSON_CUR
-	_json_add_generic "$type" "$1" "$new_cur" "$cur"
+	_json_add_generic "$2" "$1" "$table" "$cur"
 }
 
 _json_close_table() {
-	local _s_cur _s_new
+	local _s_cur
 
 	_json_get_var _s_cur JSON_CUR
-	_json_get_var _s_new "UP_$_s_cur"
-	_json_set_var JSON_CUR "$_s_new"
+	_json_get_var "${JSON_PREFIX}JSON_CUR" "UP_$_s_cur"
 }
 
 json_set_namespace() {
@@ -128,7 +103,7 @@ json_set_namespace() {
 }
 
 json_cleanup() {
-	local unset
+	local unset tmp
 
 	_json_get_var unset JSON_UNSET
 	for tmp in $unset JSON_VAR; do
@@ -152,7 +127,6 @@ json_init() {
 	export -- \
 		${JSON_PREFIX}JSON_SEQ=0 \
 		${JSON_PREFIX}JSON_CUR="JSON_VAR" \
-		${JSON_PREFIX}JSON_UNSET="" \
 		${JSON_PREFIX}KEYS_JSON_VAR= \
 		${JSON_PREFIX}TYPE_JSON_VAR=
 }
@@ -174,25 +148,33 @@ json_close_array() {
 }
 
 json_add_string() {
-	_json_add_generic string "$1" "$2"
+	local cur
+	_json_get_var cur JSON_CUR
+	_json_add_generic string "$1" "$2" "$cur"
 }
 
 json_add_int() {
-	_json_add_generic int "$1" "$2"
+	local cur
+	_json_get_var cur JSON_CUR
+	_json_add_generic int "$1" "$2" "$cur"
 }
 
 json_add_boolean() {
-	_json_add_generic boolean "$1" "$2"
+	local cur
+	_json_get_var cur JSON_CUR
+	_json_add_generic boolean "$1" "$2" "$cur"
 }
 
 json_add_double() {
-	_json_add_generic double "$1" "$2"
+	local cur
+	_json_get_var cur JSON_CUR
+	_json_add_generic double "$1" "$2" "$cur"
 }
 
 # functions read access to json variables
 
 json_load() {
-	eval `jshn -r "$1"`
+	eval "`jshn -r "$1"`"
 }
 
 json_dump() {
@@ -224,10 +206,11 @@ json_get_keys() {
 json_get_values() {
 	local _v_dest="$1"
 	local _v_keys _v_val _select=
+	local _json_no_warning=1
 
 	unset "$_v_dest"
 	[ -n "$2" ] && {
-		json_select "$2"
+		json_select "$2" || return 1
 		_select=1
 	}
 
@@ -249,13 +232,17 @@ json_get_var() {
 
 	_json_get_var __cur JSON_CUR
 	local __var="${JSON_PREFIX}${__cur}_${2//[^a-zA-Z0-9_]/_}"
-	eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
+	eval "export -- \"$__dest=\${$__var:-$3}\"; [ -n \"\${$__var+x}\${3+x}\" ]"
 }
 
 json_get_vars() {
 	while [ "$#" -gt 0 ]; do
 		local _var="$1"; shift
-		json_get_var "$_var" "$_var"
+		if [ "$_var" != "${_var#*:}" ]; then
+			json_get_var "${_var%%:*}" "${_var%%:*}" "${_var#*:}"
+		else
+			json_get_var "$_var" "$_var"
+		fi
 	done
 }
 
@@ -281,7 +268,8 @@ json_select() {
 			_json_set_var JSON_CUR "$cur"
 		;;
 		*)
-			echo "WARNING: Variable '$target' does not exist or is not an array/object"
+			[ -n "$_json_no_warning" ] || \
+				echo "WARNING: Variable '$target' does not exist or is not an array/object"
 			return 1
 		;;
 	esac