X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=383acd201739b17a3f1f6bea6fe7025b4e45e2ff;hp=7892682f63476eec2eefd57b370732c842406b7f;hb=4d900cdac8258daa2e99c6ceb2a4985154e94150;hpb=44da812b424f5e10e268d47149d012d49edf858b

diff --git a/daemon/dir.c b/daemon/dir.c
index 7892682..383acd2 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
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "../src/guestfs_protocol.h"
+#include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
 
@@ -34,15 +34,12 @@ do_rmdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("rmdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -56,32 +53,26 @@ do_rmdir (const char *path)
 int
 do_rm_rf (const char *path)
 {
-  int r, len;
+  int r;
   char *buf, *err;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
-  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;
   }
 
-  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);
+  r = command (NULL, &err, "rm", "-rf", buf, NULL);
   free (buf);
 
   /* 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;
   }
@@ -96,31 +87,63 @@ do_mkdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = mkdir (path, 0777);
   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)
 {
   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)) return -2;
+      return 0;			/* OK - directory exists here already. */
+    }
+
     if (!loop && errno == ENOENT) {
       loop = 1;			/* Stops it looping forever. */
 
@@ -137,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. */
@@ -151,17 +174,39 @@ do_mkdir_p (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = recursive_mkdir (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;
   }
 
   return 0;
 }
+
+char *
+do_mkdtemp (const char *template)
+{
+  char *writable = strdup (template);
+  if (writable == NULL) {
+    reply_with_perror ("strdup");
+    return NULL;
+  }
+
+  CHROOT_IN;
+  char *r = mkdtemp (writable);
+  CHROOT_OUT;
+
+  if (r == NULL) {
+    reply_with_perror ("%s", template);
+    free (writable);
+  }
+
+  return r;
+}