blobmsg: add blobmsg_realloc_string_buffer()

[project/libubox.git] / blobmsg.c

diff --git a/blobmsg.c b/blobmsg.c
index 2d584a1..8db2238 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -21,6 +21,7 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
        [BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
        [BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
+       [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
 
 static uint16_t
@@ -52,7 +53,7 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
        len = blobmsg_data_len(attr);
        data = blobmsg_data(attr);
 
-       if (!id || id > BLOBMSG_TYPE_LAST)
+       if (id > BLOBMSG_TYPE_LAST)
                return false;
 
        if (!blob_type[id])
@@ -89,6 +90,33 @@ bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
        return true;
 }
 
+int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
+                       struct blob_attr **tb, void *data, int len)
+{
+       struct blob_attr *attr;
+       int i = 0;
+
+       memset(tb, 0, policy_len * sizeof(*tb));
+       __blob_for_each_attr(attr, data, len) {
+               if (policy[i].type != BLOBMSG_TYPE_UNSPEC &&
+                   blob_id(attr) != policy[i].type)
+                       continue;
+
+               if (!blobmsg_check_attr(attr, false))
+                       return -1;
+
+               if (tb[i])
+                       continue;
+
+               tb[i++] = attr;
+               if (i == policy_len)
+                       break;
+       }
+
+       return 0;
+}
+
+
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                   struct blob_attr **tb, void *data, int len)
 {
@@ -205,6 +233,23 @@ blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
        return data_dest;
 }
 
+void *
+blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen)
+{
+       struct blob_attr *attr = blob_next(buf->head);
+       int offset = attr_to_offset(buf, blob_next(buf->head)) + blob_pad_len(attr);
+       int required = maxlen - (buf->buflen - offset);
+
+       if (required <= 0)
+               goto out;
+
+       blob_buf_grow(buf, required);
+       attr = blob_next(buf->head);
+
+out:
+       return blobmsg_data(attr);
+}
+
 void
 blobmsg_add_string_buffer(struct blob_buf *buf)
 {