X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=jshn.c;h=24e3265cefc70d44aca71a265e15ffabd030d9e9;hp=69cb06f91f75058fecfc9da92c05646398baad0d;hb=92009b7f989f83f83159a43574ce5e36b7c4d5a1;hpb=8c6dadbe038509f8428966c03bcf6be83d832904 diff --git a/jshn.c b/jshn.c index 69cb06f..24e3265 100644 --- a/jshn.c +++ b/jshn.c @@ -25,13 +25,18 @@ #include #include #include +#include +#include +#include #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 +44,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; @@ -98,9 +108,6 @@ static int add_json_element(const char *key, json_object *obj) { char *type; - if (!obj) - return -1; - switch (json_object_get_type(obj)) { case json_type_object: type = "object"; @@ -120,6 +127,9 @@ static int add_json_element(const char *key, json_object *obj) case json_type_double: type = "double"; break; + case json_type_null: + type = "null"; + break; default: return -1; } @@ -147,11 +157,14 @@ static int add_json_element(const char *key, json_object *obj) fprintf(stdout, "' %d;\n", json_object_get_boolean(obj)); break; case json_type_int: - fprintf(stdout, "' %d;\n", json_object_get_int(obj)); + fprintf(stdout, "' %"PRId64";\n", json_object_get_int64(obj)); break; case json_type_double: fprintf(stdout, "' %lf;\n", json_object_get_double(obj)); break; + case json_type_null: + fprintf(stdout, "';\n"); + break; default: return -1; } @@ -175,13 +188,19 @@ 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("K_") + 1); sprintf(keys, "%sK_%s", var_prefix, prefix); - return getenv(keys); + return getenv_avl(keys); } static void get_var(const char *prefix, const char **name, char **var, char **type) @@ -191,13 +210,13 @@ static void get_var(const char *prefix, const char **name, char **var, char **ty 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, "%sT_%s_%s", var_prefix, prefix, *name); - *type = getenv(tmpname); + *type = getenv_avl(tmpname); sprintf(tmpname, "%sN_%s_%s", var_prefix, prefix, *name); - varname = getenv(tmpname); + varname = getenv_avl(tmpname); if (varname) *name = varname; } @@ -222,11 +241,13 @@ static void jshn_add_object_var(json_object *obj, bool array, const char *prefix } else if (!strcmp(type, "string")) { new = json_object_new_string(var); } else if (!strcmp(type, "int")) { - new = json_object_new_int(atoi(var)); + new = json_object_new_int64(atoll(var)); } else if (!strcmp(type, "double")) { new = json_object_new_double(strtod(var, NULL)); } else if (!strcmp(type, "boolean")) { new = json_object_new_boolean(!!atoi(var)); + } else if (!strcmp(type, "null")) { + new = NULL; } else { return; } @@ -287,17 +308,65 @@ out: static int usage(const char *progname) { - fprintf(stderr, "Usage: %s [-n] [-i] -r |-w\n", progname); + fprintf(stderr, "Usage: %s [-n] [-i] -r |-R |-w\n", 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; + int fd; + struct stat sb; + char *fbuf; + int ret; + + 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; - while ((ch = getopt(argc, argv, "p:nir:w")) != -1) { + vars[i].val = c + 1; + avl_insert(&env_vars, &vars[i].avl); + } + + while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) { switch(ch) { case 'p': var_prefix = optarg; @@ -305,6 +374,31 @@ int main(int argc, char **argv) break; case 'r': return jshn_parse(optarg); + case 'R': + if ((fd = open(optarg, O_RDONLY)) == -1) { + fprintf(stderr, "Error opening %s\n", optarg); + return 3; + } + if (fstat(fd, &sb) == -1) { + fprintf(stderr, "Error getting size of %s\n", optarg); + close(fd); + return 3; + } + if (!(fbuf = malloc(sb.st_size))) { + fprintf(stderr, "Error allocating memory for %s\n", optarg); + close(fd); + return 3; + } + if (read(fd, fbuf, sb.st_size) != sb.st_size) { + fprintf(stderr, "Error reading %s\n", optarg); + free(fbuf); + close(fd); + return 3; + } + ret = jshn_parse(fbuf); + free(fbuf); + close(fd); + return ret; case 'w': return jshn_format(no_newline, indent); case 'n':