Fix mkdir-p if directory exists (RHBZ#503133).

[libguestfs.git] / daemon / dir.c

diff --git a/daemon/dir.c b/daemon/dir.c
index 7892682..3df6233 100644 (file)
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -76,7 +76,7 @@ do_rm_rf (const char *path)
 
   snprintf (buf, len, "/sysroot%s", path);
 
-  r = command (NULL, &err, "rm", "-rf", buf);
+  r = command (NULL, &err, "rm", "-rf", buf, NULL);
   free (buf);
 
   /* rm -rf is never supposed to fail.  I/O errors perhaps? */
@@ -117,10 +117,21 @@ recursive_mkdir (const char *path)
   int loop = 0;
   int r;
   char *ppath, *p;
+  struct stat buf;
 
  again:
   r = mkdir (path, 0777);
   if (r == -1) {
+    if (errno == EEXIST) {     /* Something exists here, might not be a dir. */
+      r = lstat (path, &buf);
+      if (r == -1) return -1;
+      if (!S_ISDIR (buf.st_mode)) {
+       errno = ENOTDIR;
+       return -1;
+      }
+      return 0;                        /* OK - directory exists here already. */
+    }
+
     if (!loop && errno == ENOENT) {
       loop = 1;                        /* Stops it looping forever. */
 
@@ -165,3 +176,28 @@ do_mkdir_p (const char *path)
 
   return 0;
 }
+
+int
+do_is_dir (const char *path)
+{
+  int r;
+  struct stat buf;
+
+  NEED_ROOT (-1);
+  ABS_PATH (path, -1);
+
+  CHROOT_IN;
+  r = lstat (path, &buf);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    if (errno != ENOENT && errno != ENOTDIR) {
+      reply_with_perror ("stat: %s", path);
+      return -1;
+    }
+    else
+      return 0;                        /* Not a directory. */
+  }
+
+  return S_ISDIR (buf.st_mode);
+}