DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jshn: support using characters in elements that do not conform to shell variable restrictions

Browse source
This commit is contained in:
Felix Fietkau 2011-09-11 11:40:22 +02:00
parent dee81b4f79
commit a1a97eb11e
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
jshn.c
View file

@ -150,14 +150,19 @@ static char *get_keys(const char *prefix)
return getenv(keys); return getenv(keys);
} }
static void get_var(const char *prefix, const char *name, char **var, char **type) static void get_var(const char *prefix, const char **name, char **var, char **type)
{ {
char *tmpname; char *tmpname, *varname;
tmpname = alloca(strlen(prefix) + 1 + strlen(name) + 1 + sizeof("TYPE_")); tmpname = alloca(strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("TYPE_"));
sprintf(tmpname, "TYPE_%s_%s", prefix, name); sprintf(tmpname, "TYPE_%s_%s", prefix, *name);
*var = getenv(tmpname + 5); *var = getenv(tmpname + 5);
*type = getenv(tmpname); *type = getenv(tmpname);
memcpy(tmpname, "NAME", 4);
varname = getenv(tmpname);
if (varname)
*name = varname;
} }
static json_object *jshn_add_objects(json_object *obj, const char *prefix, bool array); static json_object *jshn_add_objects(json_object *obj, const char *prefix, bool array);
@ -167,7 +172,7 @@ static void jshn_add_object_var(json_object *obj, bool array, const char *prefix
json_object *new; json_object *new;
char *var, *type; char *var, *type;
get_var(prefix, name, &var, &type); get_var(prefix, &name, &var, &type);
if (!var || !type) if (!var || !type)
return; return;

8
sh/jshn.sh
View file

@ -19,11 +19,15 @@ json_add_generic() {
local val="$3" local val="$3"
local cur="${4:-$JSON_CUR}" local cur="${4:-$JSON_CUR}"
[ "${cur%%[0-9]*}" = "JSON_ARRAY" ] && { if [ "${cur%%[0-9]*}" = "JSON_ARRAY" ]; then
eval "local aseq=\"\${SEQ_$cur}\"" eval "local aseq=\"\${SEQ_$cur}\""
var=$(( ${aseq:-0} + 1 )) var=$(( ${aseq:-0} + 1 ))
export -- "SEQ_$cur=$var" 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 -- "${cur}_$var=$val"
export -- "TYPE_${cur}_$var=$type" export -- "TYPE_${cur}_$var=$type"