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

diff --git a/daemon/dir.c b/daemon/dir.c
index 6eb86bb..5945862 100644
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -56,7 +56,7 @@ do_rmdir (char *path)
 int
 do_rm_rf (char *path)
 {
-  int r, len;
+  int r;
   char *buf, *err;
 
   NEED_ROOT (-1);
@@ -67,15 +67,12 @@ do_rm_rf (char *path)
     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);
 
@@ -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. */
     }