X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=jshn.c;h=4989099484be94b8205612a3bbb70983f87c0528;hp=e7e02d19301f12fa158cb5a3bbe286e5d0850fd6;hb=4bc3decf8743c0add93d434a639bb1b449b6da11;hpb=c8fc0897cdfff6393919030e24809e938ee5076f

diff --git a/jshn.c b/jshn.c
index e7e02d1..4989099 100644
--- a/jshn.c
+++ b/jshn.c
@@ -27,11 +27,13 @@
 #include <getopt.h>
 #include "list.h"
 
+#include "avl.h"
 #include "blob.h"
 #include "blobmsg_json.h"
 
 #define MAX_VARLEN	256
 
+static struct avl_tree env_vars;
 static struct blob_buf b = { 0 };
 
 static const char *var_prefix = "";
@@ -39,6 +41,11 @@ static int var_prefix_len = 0;
 
 static int add_json_element(const char *key, json_object *obj);
 
+struct env_var {
+	struct avl_node avl;
+	char *val;
+};
+
 static int add_json_object(json_object *obj)
 {
 	int ret = 0;
@@ -175,29 +182,35 @@ static int jshn_parse(const char *str)
 	return 0;
 }
 
+static char *getenv_avl(const char *key)
+{
+	struct env_var *var = avl_find_element(&env_vars, key, var, avl);
+	return var ? var->val : NULL;
+}
+
 static char *get_keys(const char *prefix)
 {
 	char *keys;
 
-	keys = alloca(var_prefix_len + strlen(prefix) + sizeof("KEYS_") + 1);
-	sprintf(keys, "%sKEYS_%s", var_prefix, prefix);
-	return getenv(keys);
+	keys = alloca(var_prefix_len + strlen(prefix) + sizeof("K_") + 1);
+	sprintf(keys, "%sK_%s", var_prefix, prefix);
+	return getenv_avl(keys);
 }
 
 static void get_var(const char *prefix, const char **name, char **var, char **type)
 {
 	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);
+	*var = getenv_avl(tmpname);
 
-	sprintf(tmpname, "%sTYPE_%s_%s", var_prefix, prefix, *name);
-	*type = getenv(tmpname);
+	sprintf(tmpname, "%sT_%s_%s", var_prefix, prefix, *name);
+	*type = getenv_avl(tmpname);
 
-	sprintf(tmpname, "%sNAME_%s_%s", var_prefix, prefix, *name);
-	varname = getenv(tmpname);
+	sprintf(tmpname, "%sN_%s_%s", var_prefix, prefix, *name);
+	varname = getenv_avl(tmpname);
 	if (varname)
 		*name = varname;
 }
@@ -258,18 +271,31 @@ static int jshn_format(bool no_newline, bool indent)
 {
 	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)
@@ -278,12 +304,56 @@ static int usage(const char *progname)
 	return 2;
 }
 
+static int avl_strcmp_var(const void *k1, const void *k2, void *ptr)
+{
+	const char *s1 = k1;
+	const char *s2 = k2;
+	char c1, c2;
+
+	while (*s1 && *s1 == *s2) {
+		s1++;
+		s2++;
+	}
+
+	c1 = *s1;
+	c2 = *s2;
+	if (c1 == '=')
+		c1 = 0;
+	if (c2 == '=')
+		c2 = 0;
+
+	return c1 - c2;
+}
+
 int main(int argc, char **argv)
 {
+	extern char **environ;
 	bool no_newline = false;
 	bool indent = false;
+	struct env_var *vars;
+	int i;
 	int ch;
 
+	avl_init(&env_vars, avl_strcmp_var, false, NULL);
+	for (i = 0; environ[i]; i++);
+
+	vars = calloc(i, sizeof(*vars));
+	if (!vars) {
+		fprintf(stderr, "%m\n");
+		return -1;
+	}
+	for (i = 0; environ[i]; i++) {
+		char *c;
+
+		vars[i].avl.key = environ[i];
+		c = strchr(environ[i], '=');
+		if (!c)
+			continue;
+
+		vars[i].val = c + 1;
+		avl_insert(&env_vars, &vars[i].avl);
+	}
+
 	while ((ch = getopt(argc, argv, "p:nir:w")) != -1) {
 		switch(ch) {
 		case 'p':