blob: add blob_put_raw() for copying one or more blob attributes into the buffer...

[project/libubox.git] / blob.c

diff --git a/blob.c b/blob.c
index 4817fd4..6d66fcd 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -3,14 +3,17 @@
  *
  * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
  *
- * 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
+ * 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 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 "blob.h"
@@ -47,6 +50,17 @@ attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
        return (char *)attr - (char *) buf->buf;
 }
 
+void
+blob_buf_grow(struct blob_buf *buf, int required)
+{
+       int offset_head = attr_to_offset(buf, buf->head);
+
+       if (!buf->grow || !buf->grow(buf, required))
+               return;
+
+       buf->head = offset_to_attr(buf, offset_head);
+}
+
 static struct blob_attr *
 blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
 {
@@ -55,12 +69,7 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
        struct blob_attr *attr;
 
        if (required > 0) {
-               int offset_head = attr_to_offset(buf, buf->head);
-
-               if (!buf->grow || !buf->grow(buf, required))
-                       return NULL;
-
-               buf->head = offset_to_attr(buf, offset_head);
+               blob_buf_grow(buf, required);
                attr = offset_to_attr(buf, offset);
        } else {
                attr = pos;
@@ -126,6 +135,20 @@ blob_new(struct blob_buf *buf, int id, int payload)
 }
 
 struct blob_attr *
+blob_put_raw(struct blob_buf *buf, const void *ptr, int len)
+{
+       struct blob_attr *attr;
+
+       if (len < sizeof(struct blob_attr) || !ptr)
+               return NULL;
+
+       attr = blob_add(buf, blob_next(buf->head), 0, len - sizeof(struct blob_attr));
+       blob_set_raw_len(buf->head, blob_pad_len(buf->head) + len);
+       memcpy(attr, ptr, len);
+       return attr;
+}
+
+struct blob_attr *
 blob_put(struct blob_buf *buf, int id, const void *ptr, int len)
 {
        struct blob_attr *attr;
@@ -240,3 +263,17 @@ blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
 
        return !memcmp(a1, a2, blob_pad_len(a1));
 }
+
+struct blob_attr *
+blob_memdup(struct blob_attr *attr)
+{
+       struct blob_attr *ret;
+       int size = blob_pad_len(attr);
+
+       ret = malloc(size);
+       if (!ret)
+               return NULL;
+
+       memcpy(ret, attr, size);
+       return ret;
+}