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
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);
}
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_"));
sprintf(tmpname, "TYPE_%s_%s", prefix, name);
tmpname = alloca(strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("TYPE_"));
sprintf(tmpname, "TYPE_%s_%s", prefix, *name);
*var = getenv(tmpname + 5);
*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);
@ -167,7 +172,7 @@ static void jshn_add_object_var(json_object *obj, bool array, const char *prefix
json_object *new;
char *var, *type;
get_var(prefix, name, &var, &type);
get_var(prefix, &name, &var, &type);
if (!var || !type)
return;