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

diff --git a/daemon/dir.c b/daemon/dir.c
index ad1c7c9..a5076b1 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -56,7 +56,7 @@ do_rm_rf (const char *path)
   int r;
   char *buf, *err;
 
-  if (strcmp (path, "/") == 0) {
+  if (STREQ (path, "/")) {
     reply_with_error ("rm -rf: cannot remove root directory");
     return -1;
   }
@@ -99,6 +99,23 @@ do_mkdir (const char *path)
   return 0;
 }
 
+int
+do_mkdir_mode (const char *path, int mode)
+{
+  int r;
+
+  CHROOT_IN;
+  r = mkdir (path, mode);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("mkdir_mode: %s", path);
+    return -1;
+  }
+
+  return 0;
+}
+
 static int
 recursive_mkdir (const char *path)
 {
@@ -185,31 +202,22 @@ do_is_dir (const char *path)
 }
 
 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;
+    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;
 }