X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fdir.c;h=383acd201739b17a3f1f6bea6fe7025b4e45e2ff;hp=300bb4ce8a6a91557386f039fb10e19f18d106e4;hb=e44cf42f362d793c47d892a18a6853d88abd6ecb;hpb=4b4e0d0d07bd34f4368c6a213ff757d4ebf98411

diff --git a/daemon/dir.c b/daemon/dir.c
index 300bb4c..383acd2 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -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"
 
@@ -39,7 +39,7 @@ do_rmdir (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("rmdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -57,7 +57,7 @@ do_rm_rf (const char *path)
   char *buf, *err;
 
   if (STREQ (path, "/")) {
-    reply_with_error ("rm -rf: cannot remove root directory");
+    reply_with_error ("cannot remove root directory");
     return -1;
   }
 
@@ -72,7 +72,7 @@ do_rm_rf (const 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;
   }
@@ -92,7 +92,7 @@ do_mkdir (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("mkdir: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -104,12 +104,17 @@ 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 ("mkdir_mode: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -174,39 +179,17 @@ do_mkdir_p (const char *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 ("mkdir -p: %s: a path element was not a directory", path);
+    reply_with_error ("%s: a path element was not a directory", path);
     return -1;
   }
 
   return 0;
 }
 
-int
-do_is_dir (const char *path)
-{
-  int r;
-  struct stat buf;
-
-  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. */
-  }
-
-  return S_ISDIR (buf.st_mode);
-}
-
 char *
 do_mkdtemp (const char *template)
 {
@@ -221,7 +204,7 @@ do_mkdtemp (const char *template)
   CHROOT_OUT;
 
   if (r == NULL) {
-    reply_with_perror ("mkdtemp: %s", template);
+    reply_with_perror ("%s", template);
     free (writable);
   }