X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=sh%2Fjshn.sh;h=d3254606d3d766f14be34f6e8bfb2d7689d4f7fc;hb=51711be6251be4ae5e53f9369ae04598b06df0e7;hp=7389f8c2a26ab743b7fb1aeb24f2c27be6138a6b;hpb=ec56b91662f7ba5bc305e7210b4ea0d4da1dc58f;p=project%2Flibubox.git

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 7389f8c..d325460 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -19,11 +19,15 @@ json_add_generic() {
 	local val="$3"
 	local cur="${4:-$JSON_CUR}"
 
-	[ "${cur%%[0-9]*}" = "JSON_ARRAY" ] && {
+	if [ "${cur%%[0-9]*}" = "JSON_ARRAY" ]; then
 		eval "local aseq=\"\${SEQ_$cur}\""
 		var=$(( ${aseq:-0} + 1 ))
 		export -- "SEQ_$cur=$var"
-	}
+	else
+		local name="$(echo -n "$var" | tr -C '[a-zA-Z_]' _)"
+		[[ "$name" == "$var" ]] || export -- "NAME_${cur}_${name}=$var"
+		var="$name"
+	fi
 
 	export -- "${cur}_$var=$val"
 	export -- "TYPE_${cur}_$var=$type"
@@ -96,7 +100,7 @@ json_get_type() {
 
 json_get_var() {
 	local dest="$1"
-	local var="$2"
+	local var="$(echo -n "$2" | tr -C '[a-zA-Z_]' _)"
 	eval "export -- \"$dest=\${${JSON_CUR}_$var}\""
 }