utils: simplify mkdir_p boolean conditions

[project/libubox.git] / utils.c

diff --git a/utils.c b/utils.c
index e59002ed3062da8a210324d9d1baf9aabb81fdfc..82af887cfa9ceed552371fce9b71e21b55a93797 100644 (file)
--- 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,23 +45,26 @@ 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);
 
        return ret;
 }
 
-#ifdef __APPLE__
+#ifdef LIBUBOX_COMPAT_CLOCK_GETTIME
 #include <mach/mach_host.h>            /* host_get_clock_service() */
 #include <mach/mach_port.h>            /* mach_port_deallocate() */
 #include <mach/mach_init.h>            /* mach_host_self(), mach_task_self() */
@@ -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 || 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 || errno == EEXIST)
+               return 0;
+       else
+               return -1;
+}