Generated code for the 'mkswap*' commands.

[libguestfs.git] / daemon / dir.c

diff --git a/daemon/dir.c b/daemon/dir.c
index f706466..753323d 100644 (file)
--- 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;
@@ -190,3 +201,33 @@ do_is_dir (const 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;
+}