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

diff --git a/daemon/dir.c b/daemon/dir.c
index 6eb86bb..ec072dd 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -34,8 +34,8 @@ do_rmdir (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = rmdir (path);
@@ -56,26 +56,23 @@ do_rmdir (char *path)
 int
 do_rm_rf (char *path)
 {
-  int r, len;
+  int r;
   char *buf, *err;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   if (strcmp (path, "/") == 0) {
     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);
 
@@ -96,8 +93,8 @@ do_mkdir (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -126,8 +123,8 @@ recursive_mkdir (const char *path)
       r = lstat (path, &buf);
       if (r == -1) return -1;
       if (!S_ISDIR (buf.st_mode)) {
-	errno = ENOTDIR;
-	return -1;
+        errno = ENOTDIR;
+        return -1;
       }
       return 0;			/* OK - directory exists here already. */
     }
@@ -162,8 +159,8 @@ do_mkdir_p (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = recursive_mkdir (path);
@@ -183,8 +180,8 @@ do_is_dir (char *path)
   int r;
   struct stat buf;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = lstat (path, &buf);
@@ -207,8 +204,8 @@ do_mkdtemp (char *template)
 {
   char *r;
 
-  NEED_ROOT (NULL);
-  ABS_PATH (template, NULL);
+  NEED_ROOT (return NULL);
+  ABS_PATH (template, return NULL);
 
   CHROOT_IN;
   r = mkdtemp (template);