daemon error handling: recursive_mkdir shouldn't need to set errno.

[libguestfs.git] / daemon / dir.c

diff --git a/daemon/dir.c b/daemon/dir.c
index 83536ef..300bb4c 100644 (file)
--- 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
@@ -30,13 +30,10 @@
 #include "actions.h"
 
 int
-do_rmdir (char *path)
+do_rmdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = rmdir (path);
   CHROOT_OUT;
@@ -54,28 +51,22 @@ 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, len;
+  int r;
   char *buf, *err;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
-  if (strcmp (path, "/") == 0) {
+  if (STREQ (path, "/")) {
     reply_with_error ("rm -rf: 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, NULL);
   free (buf);
 
@@ -92,13 +83,10 @@ do_rm_rf (char *path)
 }
 
 int
-do_mkdir (char *path)
+do_mkdir (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = mkdir (path, 0777);
   CHROOT_OUT;
@@ -111,6 +99,28 @@ do_mkdir (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;
+}
+
+/* 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)
 {
@@ -125,10 +135,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. */
     }
 
@@ -148,7 +155,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. */
@@ -158,13 +165,10 @@ recursive_mkdir (const char *path)
 }
 
 int
-do_mkdir_p (char *path)
+do_mkdir_p (const char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = recursive_mkdir (path);
   CHROOT_OUT;
@@ -173,19 +177,20 @@ do_mkdir_p (char *path)
     reply_with_perror ("mkdir -p: %s", path);
     return -1;
   }
+  if (r == -2) {
+    reply_with_error ("mkdir -p: %s: a path element was not a directory", path);
+    return -1;
+  }
 
   return 0;
 }
 
 int
-do_is_dir (char *path)
+do_is_dir (const char *path)
 {
   int r;
   struct stat buf;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
-
   CHROOT_IN;
   r = lstat (path, &buf);
   CHROOT_OUT;
@@ -201,3 +206,24 @@ do_is_dir (char *path)
 
   return S_ISDIR (buf.st_mode);
 }
+
+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 ("mkdtemp: %s", template);
+    free (writable);
+  }
+
+  return r;
+}