X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdir.c;h=a8f066fd149f5215b2ead5f14fc73a4b8ad508c8;hb=22eb7fc966bafebedfde437c9b9c9fb903a8bc35;hp=83536ef5a0a53114a16a4a5c4532ee47ab95dbcd;hpb=56bef498f46ac3dd580f4bde3c8f3ed2fe688826;p=libguestfs.git

diff --git a/daemon/dir.c b/daemon/dir.c
index 83536ef..a8f066f 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@ do_rmdir (char *path)
 int
 do_rm_rf (char *path)
 {
-  int r, len;
+  int r;
   char *buf, *err;
 
   NEED_ROOT (-1);
@@ -67,15 +67,12 @@ do_rm_rf (char *path)
     return -1;
   }
 
-  len = strlen (path) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (path);
   if (buf == NULL) {
     reply_with_perror ("malloc");
     return -1;
   }
 
-  snprintf (buf, len, "/sysroot%s", path);
-
   r = command (NULL, &err, "rm", "-rf", buf, NULL);
   free (buf);
 
@@ -201,3 +198,33 @@ do_is_dir (char *path)
 
   return S_ISDIR (buf.st_mode);
 }
+
+char *
+do_mkdtemp (char *template)
+{
+  char *r;
+
+  NEED_ROOT (NULL);
+  ABS_PATH (template, NULL);
+
+  CHROOT_IN;
+  r = mkdtemp (template);
+  CHROOT_OUT;
+
+  if (r == NULL) {
+    reply_with_perror ("mkdtemp: %s", template);
+    return NULL;
+  }
+
+  /* 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;
+}