X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=bc54d518a1fb855c7c5c748c6c4582a563f05d18;hp=ec072ddbcd84f6e708eac2821873bce8dd864242;hb=b01ef8eae1acc5105e623a25c8988bcc3326ea1c;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804

diff --git a/daemon/dir.c b/daemon/dir.c
index ec072dd..bc54d51 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -30,19 +30,16 @@
 #include "actions.h"
 
 int
-do_rmdir (char *path)
+do_rmdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -1);
-
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("rmdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -54,16 +51,13 @@ do_rmdir (char *path)
  * do stupid stuff, who are we to try to stop them?
  */
 int
-do_rm_rf (char *path)
+do_rm_rf (const char *path)
 {
   int r;
   char *buf, *err;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -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;
   }
 
@@ -78,7 +72,7 @@ do_rm_rf (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;
   }
@@ -89,25 +83,49 @@ do_rm_rf (char *path)
 }
 
 int
-do_mkdir (char *path)
+do_mkdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -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)
 {
@@ -122,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. */
     }
 
@@ -145,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,76 +170,43 @@ recursive_mkdir (const char *path)
 }
 
 int
-do_mkdir_p (char *path)
+do_mkdir_p (const char *path)
 {
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -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;
   }
-
-  return 0;
-}
-
-int
-do_is_dir (char *path)
-{
-  int r;
-  struct stat buf;
-
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -1);
-
-  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;
 }