X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg_json.c;h=571394840181e1453deb67aa5e9045c0f868f61a;hp=f1c47ce8128878300769eb4d2e29d15eff77175c;hb=155bf39896f126b1ba121b816922a88dc34c31e3;hpb=f6827c7c93cf19c63a7d038c9d2a71f2b9d72f3e

diff --git a/blobmsg_json.c b/blobmsg_json.c
index f1c47ce..5713948 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -13,9 +13,16 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <inttypes.h>
 #include "blobmsg.h"
 #include "blobmsg_json.h"
 
+#ifdef JSONC
+	#include <json.h>
+#else
+	#include <json/json.h>
+#endif
+
 bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
 {
 	json_object_object_foreach(obj, key, val) {
@@ -42,9 +49,6 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
 	bool ret = true;
 	void *c;
 
-	if (!obj)
-		return false;
-
 	switch (json_object_get_type(obj)) {
 	case json_type_object:
 		c = blobmsg_open_table(b, name);
@@ -65,6 +69,9 @@ bool blobmsg_add_json_element(struct blob_buf *b, const char *name, json_object
 	case json_type_int:
 		blobmsg_add_u32(b, name, json_object_get_int(obj));
 		break;
+	case json_type_null:
+		blobmsg_add_field(b, BLOBMSG_TYPE_UNSPEC, name, NULL, 0);
+		break;
 	default:
 		return false;
 	}
@@ -75,7 +82,7 @@ static bool __blobmsg_add_json(struct blob_buf *b, json_object *obj)
 {
 	bool ret = false;
 
-	if (is_error(obj))
+	if (!obj)
 		return false;
 
 	if (json_object_get_type(obj) != json_type_object)
@@ -128,21 +135,17 @@ 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";
-	int indent;
-	char *start;
+	const char *indent_chars = "\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
+	int len;
 
 	if (!s->indent)
 		return;
 
-	indent = s->indent_level;
-	if (indent > 16)
-		indent = 16;
+	len = s->indent_level + 1;
+	if (len > strlen(indent_chars))
+		len = strlen(indent_chars);
 
-	start = &indent_chars[sizeof(indent_chars) - indent - 1];
-	*start = '\n';
-	blobmsg_puts(s, start, indent + 1);
-	*start = '\t';
+	blobmsg_puts(s, indent_chars, len);
 }
 
 
@@ -218,18 +221,14 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 		blobmsg_format_string(s, blobmsg_name(attr));
 		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;
@@ -247,7 +246,7 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 		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));
+		sprintf(buf, "%" PRId64, (int64_t) be64_to_cpu(*(uint64_t *)data));
 		break;
 	case BLOBMSG_TYPE_STRING:
 		blobmsg_format_string(s, data);
@@ -290,6 +289,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);
@@ -303,13 +303,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;