libubox: tests: add more blobmsg/json test cases

[project/libubox.git] / jshn.c

diff --git a/jshn.c b/jshn.c
index 24e3265cefc70d44aca71a265e15ffabd030d9e9..1b685e5fb0d853c4053389242b92c34967beb94f 100644 (file)
--- a/jshn.c
+++ b/jshn.c
@@ -68,7 +68,7 @@ static int add_json_array(struct array_list *a)
        int ret;
 
        for (i = 0, len = array_list_length(a); i < len; i++) {
-               sprintf(seq, "%d", i);
+               snprintf(seq, sizeof(seq), "%d", i);
                ret = add_json_element(seq, array_list_get_idx(a, i));
                if (ret)
                        return ret;
@@ -178,12 +178,15 @@ static int jshn_parse(const char *str)
 
        obj = json_tokener_parse(str);
        if (!obj || json_object_get_type(obj) != json_type_object) {
+               if (obj)
+                       json_object_put(obj);
                fprintf(stderr, "Failed to parse message data\n");
                return 1;
        }
        fprintf(stdout, "json_init;\n");
        add_json_object(obj);
        fflush(stdout);
+       json_object_put(obj);
 
        return 0;
 }
@@ -197,25 +200,27 @@ static char *getenv_avl(const char *key)
 static char *get_keys(const char *prefix)
 {
        char *keys;
+       size_t len = var_prefix_len + strlen(prefix) + sizeof("K_") + 1;
 
-       keys = alloca(var_prefix_len + strlen(prefix) + sizeof("K_") + 1);
-       sprintf(keys, "%sK_%s", var_prefix, prefix);
+       keys = alloca(len);
+       snprintf(keys, len, "%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;
+       size_t len = var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("T_");
 
-       tmpname = alloca(var_prefix_len + strlen(prefix) + 1 + strlen(*name) + 1 + sizeof("T_"));
+       tmpname = alloca(len);
 
-       sprintf(tmpname, "%s%s_%s", var_prefix, prefix, *name);
+       snprintf(tmpname, len, "%s%s_%s", var_prefix, prefix, *name);
        *var = getenv_avl(tmpname);
 
-       sprintf(tmpname, "%sT_%s_%s", var_prefix, prefix, *name);
+       snprintf(tmpname, len, "%sT_%s_%s", var_prefix, prefix, *name);
        *type = getenv_avl(tmpname);
 
-       sprintf(tmpname, "%sN_%s_%s", var_prefix, prefix, *name);
+       snprintf(tmpname, len, "%sN_%s_%s", var_prefix, prefix, *name);
        varname = getenv_avl(tmpname);
        if (varname)
                *name = varname;
@@ -275,7 +280,7 @@ out:
        return obj;
 }
 
-static int jshn_format(bool no_newline, bool indent)
+static int jshn_format(bool no_newline, bool indent, FILE *stream)
 {
        json_object *obj;
        const char *output;
@@ -297,7 +302,7 @@ static int jshn_format(bool no_newline, bool indent)
                        goto out;
                output = blobmsg_output;
        }
-       fprintf(stdout, "%s%s", output, no_newline ? "" : "\n");
+       fprintf(stream, "%s%s", output, no_newline ? "" : "\n");
        free(blobmsg_output);
        ret = 0;
 
@@ -308,7 +313,7 @@ out:
 
 static int usage(const char *progname)
 {
-       fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-R <file>|-w\n", progname);
+       fprintf(stderr, "Usage: %s [-n] [-i] -r <message>|-R <file>|-o <file>|-p <prefix>|-w\n", progname);
        return 2;
 }
 
@@ -333,6 +338,61 @@ static int avl_strcmp_var(const void *k1, const void *k2, void *ptr)
        return c1 - c2;
 }
 
+static int jshn_parse_file(const char *path)
+{
+       struct stat sb;
+       int ret = 0;
+       char *fbuf;
+       int fd;
+
+       if ((fd = open(path, O_RDONLY)) == -1) {
+               fprintf(stderr, "Error opening %s\n", path);
+               return 3;
+       }
+
+       if (fstat(fd, &sb) == -1) {
+               fprintf(stderr, "Error getting size of %s\n", path);
+               close(fd);
+               return 3;
+       }
+
+       if (!(fbuf = calloc(1, sb.st_size+1))) {
+               fprintf(stderr, "Error allocating memory for %s\n", path);
+               close(fd);
+               return 3;
+       }
+
+       if (read(fd, fbuf, sb.st_size) != sb.st_size) {
+               fprintf(stderr, "Error reading %s\n", path);
+               free(fbuf);
+               close(fd);
+               return 3;
+       }
+
+       ret = jshn_parse(fbuf);
+       free(fbuf);
+       close(fd);
+
+       return ret;
+}
+
+static int jshn_format_file(const char *path, bool no_newline, bool indent)
+{
+       FILE *fp = NULL;
+       int ret = 0;
+
+       fp = fopen(path, "w");
+       if (!fp) {
+               fprintf(stderr, "Error opening %s\n", path);
+               return 3;
+       }
+
+       ret = jshn_format(no_newline, indent, fp);
+       fclose(fp);
+
+       return ret;
+}
+
 int main(int argc, char **argv)
 {
        extern char **environ;
@@ -340,11 +400,8 @@ int main(int argc, char **argv)
        bool indent = false;
        struct env_var *vars;
        int i;
+       int ret = 0;
        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++);
@@ -366,41 +423,24 @@ int main(int argc, char **argv)
                avl_insert(&env_vars, &vars[i].avl);
        }
 
-       while ((ch = getopt(argc, argv, "p:nir:R:w")) != -1) {
+       while ((ch = getopt(argc, argv, "p:nir:R:o:w")) != -1) {
                switch(ch) {
                case 'p':
                        var_prefix = optarg;
                        var_prefix_len = strlen(var_prefix);
                        break;
                case 'r':
-                       return jshn_parse(optarg);
+                       ret = jshn_parse(optarg);
+                       goto exit;
                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;
+                       ret = jshn_parse_file(optarg);
+                       goto exit;
                case 'w':
-                       return jshn_format(no_newline, indent);
+                       ret = jshn_format(no_newline, indent, stdout);
+                       goto exit;
+               case 'o':
+                       ret = jshn_format_file(optarg, no_newline, indent);
+                       goto exit;
                case 'n':
                        no_newline = true;
                        break;
@@ -408,8 +448,15 @@ int main(int argc, char **argv)
                        indent = true;
                        break;
                default:
+                       free(vars);
                        return usage(argv[0]);
                }
        }
+
+       free(vars);
        return usage(argv[0]);
+
+exit:
+       free(vars);
+       return ret;
 }