blobmsg_json: allow signed output of integers

[project/libubox.git] / blobmsg_json.c

diff --git a/blobmsg_json.c b/blobmsg_json.c
index d4f68465512b2fccc92c0c415049b4458ed947ee..e4e005fdf979450724ef1620fc52ad90d62d2f16 100644 (file)
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -71,12 +71,10 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
        return ret;
 }
 
-bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str)
+static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
 {
-       json_object *obj;
        bool ret = false;
 
-       obj = json_tokener_parse(str);
        if (is_error(obj))
                return false;
 
@@ -90,6 +88,16 @@ out:
        return ret;
 }
 
+bool blobmsg_add_json_from_file(struct blob_buf *b, const char *file)
+{
+       return __blobmsg_add_json(b, json_object_from_file(file));
+}
+
+bool blobmsg_add_json_from_string(struct blob_buf *b, const char *str)
+{
+       return __blobmsg_add_json(b, json_tokener_parse(str));
+}
+
 
 struct strbuf {
        int len;
@@ -108,7 +116,7 @@ static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
                return true;
 
        if (s->pos + len >= s->len) {
-               s->len += 16;
+               s->len += 16 + len;
                s->buf = realloc(s->buf, s->len);
                if (!s->buf)
                        return false;
@@ -143,11 +151,12 @@ static void add_separator(struct strbuf *s)
 
 static void blobmsg_format_string(struct strbuf *s, const char *str)
 {
-       const char *p, *last = str, *end = str + strlen(str);
+       const unsigned char *p, *last, *end;
        char buf[8] = "\\u00";
 
+       end = (unsigned char *) str + strlen(str);
        blobmsg_puts(s, "\"", 1);
-       for (p = str; *p; p++) {
+       for (p = (unsigned char *) str, last = p; *p; p++) {
                char escape = '\0';
                int len;
 
@@ -179,20 +188,20 @@ static void blobmsg_format_string(struct strbuf *s, const char *str)
                        continue;
 
                if (p > last)
-                       blobmsg_puts(s, last, p - last);
+                       blobmsg_puts(s, (char *) last, p - last);
                last = p + 1;
                buf[1] = escape;
 
                if (escape == 'u') {
                        sprintf(buf + 4, "%02x", (unsigned char) *p);
-                       len = 4;
+                       len = 6;
                } else {
                        len = 2;
                }
                blobmsg_puts(s, buf, len);
        }
 
-       blobmsg_puts(s, last, end - last);
+       blobmsg_puts(s, (char *) last, end - last);
        blobmsg_puts(s, "\"", 1);
 }
 
@@ -238,7 +247,7 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
                sprintf(buf, "%d", be16_to_cpu(*(uint16_t *)data));
                break;
        case BLOBMSG_TYPE_INT32:
-               sprintf(buf, "%d", be32_to_cpu(*(uint32_t *)data));
+               sprintf(buf, "%d", (int32_t) be32_to_cpu(*(uint32_t *)data));
                break;
        case BLOBMSG_TYPE_INT64:
                sprintf(buf, "%lld", (long long int) be64_to_cpu(*(uint64_t *)data));