X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=205139b8f0594528c91f73fccfcf910461e42565;hp=b603cfd0705db14fe357aa5b4a5e728d3f9884a5;hb=66477d07e37ffe66cd6fea1105dd92b616d3cd27;hpb=2eb19f526164a978c373a760deb30854d56b62ce

diff --git a/daemon/dir.c b/daemon/dir.c
index b603cfd..205139b 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -39,7 +39,7 @@ do_rmdir (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("rmdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -56,8 +56,8 @@ do_rm_rf (const char *path)
   int r;
   char *buf, *err;
 
-  if (strcmp (path, "/") == 0) {
-    reply_with_error ("rm -rf: cannot remove root directory");
+  if (STREQ (path, "/")) {
+    reply_with_error ("cannot remove root directory");
     return -1;
   }
 
@@ -72,7 +72,7 @@ do_rm_rf (const char *path)
 
   /* rm -rf is never supposed to fail.  I/O errors perhaps? */
   if (r == -1) {
-    reply_with_error ("rm -rf: %s: %s", path, err);
+    reply_with_error ("%s: %s", path, err);
     free (err);
     return -1;
   }
@@ -92,7 +92,7 @@ do_mkdir (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -109,13 +109,18 @@ do_mkdir_mode (const char *path, int mode)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkdir_mode: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
   return 0;
 }
 
+/* Returns:
+ * 0  if everything was OK,
+ * -1 for a general error (sets errno),
+ * -2 if an existing path element was not a directory.
+ */
 static int
 recursive_mkdir (const char *path)
 {
@@ -130,10 +135,7 @@ recursive_mkdir (const char *path)
     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;
-      }
+      if (!S_ISDIR (buf.st_mode)) return -2;
       return 0;			/* OK - directory exists here already. */
     }
 
@@ -153,7 +155,7 @@ recursive_mkdir (const char *path)
       r = recursive_mkdir (ppath);
       free (ppath);
 
-      if (r == -1) return -1;
+      if (r != 0) return r;
 
       goto again;
     } else	  /* Failed for some other reason, so return error. */
@@ -172,7 +174,11 @@ do_mkdir_p (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkdir -p: %s", path);
+    reply_with_perror ("%s", path);
+    return -1;
+  }
+  if (r == -2) {
+    reply_with_error ("%s: a path element was not a directory", path);
     return -1;
   }
 
@@ -215,7 +221,7 @@ do_mkdtemp (const char *template)
   CHROOT_OUT;
 
   if (r == NULL) {
-    reply_with_perror ("mkdtemp: %s", template);
+    reply_with_perror ("%s", template);
     free (writable);
   }