X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=bc54d518a1fb855c7c5c748c6c4582a563f05d18;hp=ad1c7c98792264286b3b94e45264be574028f599;hb=3a99114360636806078bbf614c241e89661bcc7f;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0

diff --git a/daemon/dir.c b/daemon/dir.c
index ad1c7c9..bc54d51 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,13 +92,40 @@ do_mkdir (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
   return 0;
 }
 
+int
+do_mkdir_mode (const char *path, int mode)
+{
+  int r;
+
+  if (mode < 0) {
+    reply_with_error ("%s: mode is negative", path);
+    return -1;
+  }
+
+  CHROOT_IN;
+  r = mkdir (path, mode);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    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)
 {
@@ -113,10 +140,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. */
     }
 
@@ -136,7 +160,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. */
@@ -155,61 +179,34 @@ 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;
   }
-
-  return 0;
-}
-
-int
-do_is_dir (const char *path)
-{
-  int r;
-  struct stat buf;
-
-  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. */
+  if (r == -2) {
+    reply_with_error ("%s: a path element was not a directory", path);
+    return -1;
   }
 
-  return S_ISDIR (buf.st_mode);
+  return 0;
 }
 
 char *
-do_mkdtemp (char *template)
+do_mkdtemp (const char *template)
 {
-  char *r;
-
-  NEED_ROOT (return NULL);
-  ABS_PATH (template, return NULL);
+  char *writable = strdup (template);
+  if (writable == NULL) {
+    reply_with_perror ("strdup");
+    return NULL;
+  }
 
   CHROOT_IN;
-  r = mkdtemp (template);
+  char *r = mkdtemp (writable);
   CHROOT_OUT;
 
   if (r == NULL) {
-    reply_with_perror ("mkdtemp: %s", template);
-    return NULL;
+    reply_with_perror ("%s", template);
+    free (writable);
   }
 
-  /* The caller will free template AND try to free the return value,
-   * so we must make a copy here.
-   */
-  if (r == template) {
-    r = strdup (template);
-    if (r == NULL) {
-      reply_with_perror ("strdup");
-      return NULL;
-    }
-  }
   return r;
 }