X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=26604b1be6d9c0c6fb5bef34cb5bc5ce6c13826c;hp=e5de129e36f09eae74fb43bba02483baffb7bbd4;hb=01ad5162b27b29fd0bfe5b862a1a719ba4870e0a;hpb=3da4427fb5c8a2914902d566feaad0faf313160a

diff --git a/blobmsg.c b/blobmsg.c
index e5de129..26604b1 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -19,6 +19,9 @@ struct strbuf {
 	int len;
 	int pos;
 	char *buf;
+
+	blobmsg_json_format_t custom_format;
+	void *priv;
 };
 
 static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
@@ -96,6 +99,7 @@ static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i
 
 static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, bool array, bool head)
 {
+	const char *data_str;
 	char buf[32];
 	void *data;
 	int len;
@@ -110,8 +114,15 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 	} 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_str = buf;
 	switch(blob_id(attr)) {
 	case BLOBMSG_TYPE_INT8:
 		sprintf(buf, "%d", *(uint8_t *)data);
@@ -135,7 +146,9 @@ static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, boo
 		blobmsg_format_json_list(s, data, len, false);
 		return;
 	}
-	blobmsg_puts(s, buf, strlen(buf));
+
+out:
+	blobmsg_puts(s, data_str, strlen(data_str));
 }
 
 static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, int len, bool array)
@@ -155,13 +168,15 @@ static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, i
 	blobmsg_puts(s, (array ? " ]" : " }"), 2);
 }
 
-char *blobmsg_format_json(struct blob_attr *attr, bool list)
+char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv)
 {
 	struct strbuf s;
 
 	s.len = blob_len(attr);
 	s.buf = malloc(s.len);
 	s.pos = 0;
+	s.custom_format = cb;
+	s.priv = priv;
 
 	if (list)
 		blobmsg_format_json_list(&s, blob_data(attr), blob_len(attr), false);
@@ -310,6 +325,37 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
 	return (void *)offset;
 }
 
+void *
+blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
+{
+	struct blob_attr *attr;
+	void *data_dest;
+
+	attr = blobmsg_new(buf, BLOBMSG_TYPE_STRING, name, maxlen, &data_dest);
+	if (!attr)
+		return NULL;
+
+	data_dest = blobmsg_data(attr);
+	blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blob_pad_len(attr));
+	blob_set_raw_len(attr, blob_raw_len(attr) - maxlen);
+
+	return data_dest;
+}
+
+void
+blobmsg_add_string_buffer(struct blob_buf *buf)
+{
+	struct blob_attr *attr;
+	int len, attrlen;
+
+	attr = blob_next(buf->head);
+	len = strlen(blobmsg_data(attr)) + 1;
+
+	attrlen = blob_raw_len(attr) + len;
+	blob_set_raw_len(attr, attrlen);
+	blob_set_raw_len(buf->head, blob_raw_len(buf->head) + blob_pad_len(attr));
+}
+
 int
 blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
                   const void *data, int len)