sh/jshn.sh: fix json_get_var() and json_get_type() to not return cached values

[project/libubox.git] / blob.c

diff --git a/blob.c b/blob.c
index 26a23f3..928b5c5 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"
@@ -18,8 +21,11 @@
 static bool
 blob_buffer_grow(struct blob_buf *buf, int minlen)
 {
-       buf->buflen += ((minlen / 256) + 1) * 256;
+       int delta = ((minlen / 256) + 1) * 256;
+       buf->buflen += delta;
        buf->buf = realloc(buf->buf, buf->buflen);
+       if (buf->buf)
+               memset(buf->buf + buf->buflen - delta, 0, delta);
        return !!buf->buf;
 }
 
@@ -64,6 +70,7 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
        }
 
        blob_init(attr, id, payload + sizeof(struct blob_attr));
+       blob_fill_pad(attr);
        return attr;
 }
 
@@ -80,6 +87,34 @@ blob_buf_init(struct blob_buf *buf, int id)
        return 0;
 }
 
+void
+blob_buf_free(struct blob_buf *buf)
+{
+       free(buf->buf);
+       buf->buf = NULL;
+       buf->buflen = 0;
+}
+
+void
+blob_fill_pad(struct blob_attr *attr)
+{
+       char *buf = (char *) attr;
+       int len = blob_pad_len(attr);
+       int delta = len - blob_raw_len(attr);
+
+       if (delta > 0)
+               memset(buf + len - delta, 0, delta);
+}
+
+void
+blob_set_raw_len(struct blob_attr *attr, unsigned int len)
+{
+       int id = blob_id(attr);
+       len &= BLOB_ATTR_LEN_MASK;
+       len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK;
+       attr->id_len = cpu_to_be32(len);
+}
+
 struct blob_attr *
 blob_new(struct blob_buf *buf, int id, int payload)
 {
@@ -147,7 +182,7 @@ blob_check_type(const void *ptr, int len, int type)
                        return false;
        }
 
-       if (type == BLOB_ATTR_STRING && data[len] != 0)
+       if (type == BLOB_ATTR_STRING && data[len - 1] != 0)
                return false;
 
        return true;
@@ -193,3 +228,18 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
        }
        return found;
 }
+
+bool
+blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
+{
+       if (!a1 && !a2)
+               return true;
+
+       if (!a1 || !a2)
+               return false;
+
+       if (blob_pad_len(a1) != blob_pad_len(a2))
+               return false;
+
+       return !memcmp(a1, a2, blob_pad_len(a1));
+}