X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg_json.c;h=ffde23d33e15d11829bfea631aab3004f377751a;hp=3053fa3c8eaf13e0ee61bc251230c97321b1816d;hb=cbf80de7f4df61960f386cb01a899cf4228d38f3;hpb=abbc140e8d9c11360bea3c614608290aa051e673 diff --git a/blobmsg_json.c b/blobmsg_json.c index 3053fa3..ffde23d 100644 --- a/blobmsg_json.c +++ b/blobmsg_json.c @@ -1,22 +1,29 @@ /* - * blobmsg - library for generating/parsing structured blob messages + * Copyright (C) 2010-2012 Felix Fietkau * - * Copyright (C) 2010 Felix Fietkau + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 2.1 - * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +#include #include "blobmsg.h" #include "blobmsg_json.h" -static bool blobmsg_add_object(struct blob_buf *b, json_object *obj) +#ifdef JSONC + #include +#else + #include +#endif + +bool blobmsg_add_object(struct blob_buf *b, json_object *obj) { json_object_object_foreach(obj, key, val) { if (!blobmsg_add_json_element(b, key, val)) @@ -71,13 +78,11 @@ 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)) + if (!obj) return false; if (json_object_get_type(obj) != json_type_object) @@ -90,6 +95,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 +123,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; @@ -121,14 +136,11 @@ static bool blobmsg_puts(struct strbuf *s, const char *c, int len) static void add_separator(struct strbuf *s) { static char indent_chars[17] = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - static const char indent_space = ' '; int indent; char *start; - if (!s->indent) { - blobmsg_puts(s, &indent_space, 1); + if (!s->indent) return; - } indent = s->indent_level; if (indent > 16) @@ -143,11 +155,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 +192,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); } @@ -210,32 +223,34 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo if (!array && blobmsg_name(attr)[0]) { blobmsg_format_string(s, blobmsg_name(attr)); - blobmsg_puts(s, ": ", 2); + blobmsg_puts(s, ": ", s->indent ? 2 : 1); } - if (head) { - data = blob_data(attr); - len = blob_len(attr); - } else { - data = blobmsg_data(attr); - len = blobmsg_data_len(attr); - - if (s->custom_format) { - data_str = s->custom_format(s->priv, attr); - if (data_str) - goto out; - } + + data = blobmsg_data(attr); + len = blobmsg_data_len(attr); + + if (!head && s->custom_format) { + data_str = s->custom_format(s->priv, attr); + if (data_str) + goto out; } data_str = buf; switch(blob_id(attr)) { + case BLOBMSG_TYPE_UNSPEC: + sprintf(buf, "null"); + break; case BLOBMSG_TYPE_BOOL: sprintf(buf, "%s", *(uint8_t *)data ? "true" : "false"); break; + case BLOBMSG_TYPE_INT16: + sprintf(buf, "%d", be16_to_cpu(*(uint16_t *)data)); + break; case BLOBMSG_TYPE_INT32: - sprintf(buf, "%d", *(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) *(uint64_t *)data); + sprintf(buf, "%" PRId64, (int64_t) be64_to_cpu(*(uint64_t *)data)); break; case BLOBMSG_TYPE_STRING: blobmsg_format_string(s, data); @@ -278,6 +293,7 @@ static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv, int indent) { struct strbuf s; + bool array; s.len = blob_len(attr); s.buf = malloc(s.len); @@ -291,13 +307,18 @@ char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_jso s.indent_level = indent; } + array = blob_is_extended(attr) && + blobmsg_type(attr) == BLOBMSG_TYPE_ARRAY; + if (list) - blobmsg_format_json_list(&s, blob_data(attr), blob_len(attr), false); + blobmsg_format_json_list(&s, blobmsg_data(attr), blobmsg_data_len(attr), array); else blobmsg_format_element(&s, attr, false, false); - if (!s.len) + if (!s.len) { + free(s.buf); return NULL; + } s.buf = realloc(s.buf, s.pos + 1); s.buf[s.pos] = 0;