X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdir.c;h=83536ef5a0a53114a16a4a5c4532ee47ab95dbcd;hb=3087b47c3abac1ad8773dd07500b51423e62079f;hp=f706466082ea9392714bdd7ff967ba5d8548cda3;hpb=b4d2a01828e5de85e5eee3631f7fe3925a0312ca;p=libguestfs.git

diff --git a/daemon/dir.c b/daemon/dir.c
index f706466..83536ef 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -30,7 +30,7 @@
 #include "actions.h"
 
 int
-do_rmdir (const char *path)
+do_rmdir (char *path)
 {
   int r;
 
@@ -54,7 +54,7 @@ do_rmdir (const char *path)
  * do stupid stuff, who are we to try to stop them?
  */
 int
-do_rm_rf (const char *path)
+do_rm_rf (char *path)
 {
   int r, len;
   char *buf, *err;
@@ -92,7 +92,7 @@ do_rm_rf (const char *path)
 }
 
 int
-do_mkdir (const char *path)
+do_mkdir (char *path)
 {
   int r;
 
@@ -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. */
 
@@ -147,7 +158,7 @@ recursive_mkdir (const char *path)
 }
 
 int
-do_mkdir_p (const char *path)
+do_mkdir_p (char *path)
 {
   int r;
 
@@ -167,7 +178,7 @@ do_mkdir_p (const char *path)
 }
 
 int
-do_is_dir (const char *path)
+do_is_dir (char *path)
 {
   int r;
   struct stat buf;