X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg_json.c;h=e4e005fdf979450724ef1620fc52ad90d62d2f16;hp=0539bd1654db79e2abd985b2862531f32a6bfc7d;hb=734d28eb1a46358743cf8837c91e5d46695c3b91;hpb=ed9b5c986b06bc90017461f8d0b8f45937a79598

diff --git a/blobmsg_json.c b/blobmsg_json.c
index 0539bd1..e4e005f 100644
--- a/blobmsg_json.c
+++ b/blobmsg_json.c
@@ -1,22 +1,22 @@
 /*
- * blobmsg - library for generating/parsing structured blob messages
+ * Copyright (C) 2010-2012 Felix Fietkau <nbd@openwrt.org>
  *
- * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * 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 "blobmsg.h"
 #include "blobmsg_json.h"
 
-static bool blobmsg_add_object(struct blob_buf *b, json_object *obj)
+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,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);
 }
 
@@ -228,14 +237,20 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 
 	data_str = buf;
 	switch(blob_id(attr)) {
-	case BLOBMSG_TYPE_INT8:
+	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, "%lld", (long long int) be64_to_cpu(*(uint64_t *)data));
 		break;
 	case BLOBMSG_TYPE_STRING:
 		blobmsg_format_string(s, data);