{
char *keys;
- keys = alloca(var_prefix_len + strlen(prefix) + sizeof("KEYS_") + 1);
- sprintf(keys, "%sKEYS_%s", var_prefix, prefix);
+ keys = alloca(var_prefix_len + strlen(prefix) + sizeof("K_") + 1);
+ sprintf(keys, "%sK_%s", var_prefix, prefix);
return getenv(keys);
}
{
char *tmpname, *varname;
- tmpname = alloca(var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("TYPE_"));
+ tmpname = alloca(var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("T_"));
sprintf(tmpname, "%s%s_%s", var_prefix, prefix, *name);
*var = getenv(tmpname);
- sprintf(tmpname, "%sTYPE_%s_%s", var_prefix, prefix, *name);
+ sprintf(tmpname, "%sT_%s_%s", var_prefix, prefix, *name);
*type = getenv(tmpname);
- sprintf(tmpname, "%sNAME_%s_%s", var_prefix, prefix, *name);
+ sprintf(tmpname, "%sN_%s_%s", var_prefix, prefix, *name);
varname = getenv(tmpname);
if (varname)
*name = varname;
{
json_object *obj;
const char *output;
+ char *blobmsg_output = NULL;
+ int ret = -1;
+
+ if (!(obj = json_object_new_object()))
+ return -1;
+
+ jshn_add_objects(obj, "J_V", false);
+ if (!(output = json_object_to_json_string(obj)))
+ goto out;
- obj = json_object_new_object();
- jshn_add_objects(obj, "JSON_VAR", false);
- output = json_object_to_json_string(obj);
if (indent) {
blob_buf_init(&b, 0);
- blobmsg_add_json_from_string(&b, output);
- output = blobmsg_format_json_indent(b.head, 1, 0);
+ if (!blobmsg_add_json_from_string(&b, output))
+ goto out;
+ if (!(blobmsg_output = blobmsg_format_json_indent(b.head, 1, 0)))
+ goto out;
+ output = blobmsg_output;
}
fprintf(stdout, "%s%s", output, no_newline ? "" : "\n");
+ free(blobmsg_output);
+ ret = 0;
+
+out:
json_object_put(obj);
- return 0;
+ return ret;
}
static int usage(const char *progname)