X-Git-Url: http://git.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=utils.c;h=db632380f908e9da104758de25eed9374694ed72;hp=5d9d5aa61347b146bf713540cfa935a81fd8cd2b;hb=357877693ca363b12e6e7e14d345639b2440cd07;hpb=3b6181b63d80e77c04a52d7439a87850eea1fe78

diff --git a/utils.c b/utils.c
index 5d9d5aa..db63238 100644
--- a/utils.c
+++ b/utils.c
@@ -17,9 +17,11 @@
  */
 
 #include <sys/mman.h>
+#include <errno.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "utils.h"
 
 #define foreach_arg(_arg, _addr, _len, _first_addr, _first_len) \
@@ -27,6 +29,9 @@
 		_addr; \
 		_addr = va_arg(_arg, void **), _len = _addr ? va_arg(_arg, size_t) : 0)
 
+#define C_PTR_ALIGN	(sizeof(size_t))
+#define C_PTR_MASK	(-C_PTR_ALIGN)
+
 void *__calloc_a(size_t len, ...)
 {
 	va_list ap, ap1;
@@ -40,16 +45,19 @@ void *__calloc_a(size_t len, ...)
 
 	va_copy(ap1, ap);
 	foreach_arg(ap1, cur_addr, cur_len, &ret, len)
-		alloc_len += cur_len;
+		alloc_len += (cur_len + C_PTR_ALIGN - 1 ) & C_PTR_MASK;
 	va_end(ap1);
 
 	ptr = calloc(1, alloc_len);
-	if (!ptr)
+	if (!ptr) {
+		va_end(ap);
 		return NULL;
+	}
+
 	alloc_len = 0;
 	foreach_arg(ap, cur_addr, cur_len, &ret, len) {
 		*cur_addr = &ptr[alloc_len];
-		alloc_len += cur_len;
+		alloc_len += (cur_len + C_PTR_ALIGN - 1) & C_PTR_MASK;
 	}
 	va_end(ap);
 
@@ -149,3 +157,33 @@ void cbuf_free(void *ptr, unsigned int order)
 {
 	munmap(ptr, cbuf_size(order) * 2);
 }
+
+int mkdir_p(char *dir, mode_t mask)
+{
+	char *l;
+	int ret;
+
+	ret = mkdir(dir, mask);
+	if (!ret || (ret && errno == EEXIST))
+		return 0;
+
+	if (ret && (errno != ENOENT))
+		return -1;
+
+	l = strrchr(dir, '/');
+	if (!l || l == dir)
+		return -1;
+
+	*l = '\0';
+
+	if (mkdir_p(dir, mask))
+		return -1;
+
+	*l = '/';
+
+	ret = mkdir(dir, mask);
+	if (!ret || (ret && errno == EEXIST))
+		return 0;
+	else
+		return -1;
+}