X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fmkdir.c;h=0e51b64f69331d21228b2dcc1621fb29df18f274;hp=e8b92e8b21a1fe25e23af9152b8b279ed8587458;hb=2f79c10e9aef916efbcf29315eea8c25d0a50ac4;hpb=c66e7f04997fb42b778703418097a5023fa17581

diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index e8b92e8b2..0e51b64f6 100644
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -29,7 +29,6 @@
 #include "mkdir.h"
 #include "label.h"
 #include "util.h"
-#include "log.h"
 
 int mkdir_label(const char *path, mode_t mode) {
         return label_mkdir(path, mode, true);
@@ -116,6 +115,13 @@ int mkdir_parents_label(const char *path, mode_t mode) {
         return makedir_parents(path, mode, true);
 }
 
+static int is_dir(const char* path) {
+        struct stat st;
+        if (stat(path, &st) < 0)
+                return -errno;
+        return S_ISDIR(st.st_mode);
+}
+
 static int makedir_p(const char *path, mode_t mode, bool apply) {
         int r;
 
@@ -125,7 +131,8 @@ static int makedir_p(const char *path, mode_t mode, bool apply) {
         if (r < 0)
                 return r;
 
-        if (label_mkdir(path, mode, apply) < 0 && errno != EEXIST)
+        r = label_mkdir(path, mode, apply);
+        if (r < 0 && (errno != EEXIST || is_dir(path) <= 0))
                 return -errno;
 
         return 0;