diff options
author | Daniel Golle <daniel@makrotopia.org> | 2020-12-13 01:45:53 +0300 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2020-12-13 01:50:50 +0300 |
commit | 357877693ca363b12e6e7e14d345639b2440cd07 (patch) | |
tree | 01c5400d66e3a9761df89600acfa490bad68fa29 | |
parent | 9e52171d70def760a6949676800d0b73f85ee22d (diff) |
utils: introduce mkdir_p
Add new utility function mkdir_p(char *path, mode_t mode) to replace
the partially buggy implementations found accross fstools and procd.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r-- | utils.c | 32 | ||||
-rw-r--r-- | utils.h | 2 |
2 files changed, 34 insertions, 0 deletions
@@ -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) \ @@ -155,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; +} @@ -19,6 +19,7 @@ #ifndef __LIBUBOX_UTILS_H #define __LIBUBOX_UTILS_H +#include <sys/stat.h> #include <sys/types.h> #include <sys/time.h> #include <stdint.h> @@ -252,5 +253,6 @@ static inline unsigned long cbuf_size(int order) void *cbuf_alloc(unsigned int order); void cbuf_free(void *ptr, unsigned int order); +int mkdir_p(char *dir, mode_t mask); #endif |