}
int mkdir_parents(const char *path, mode_t mode) {
+ struct stat st;
const char *p, *e;
assert(path);
- /* Creates every parent directory in the path except the last
- * component. */
+ /* return immediately if directory exists */
+ e = strrchr(path, '/');
+ if (!e)
+ return -EINVAL;
+ p = strndupa(path, e - path);
+ if (stat(p, &st) >= 0) {
+ if ((st.st_mode & S_IFMT) == S_IFDIR)
+ return 0;
+ else
+ return -ENOTDIR;
+ }
+ /* create every parent directory in the path, except the last component */
p = path + strspn(path, "/");
for (;;) {
int r;
if (*p == 0)
return 0;
- if (!(t = strndup(path, e - path)))
+ t = strndup(path, e - path);
+ if (!t)
return -ENOMEM;
r = label_mkdir(t, mode);