X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fscrub.c;h=6e205a01ad4369ad828f4a9d53c21bac013058aa;hb=78029b529ad98769685d607230b70f71832d5906;hp=2f14bcbe689f4c81b71e381999e5160c019a568e;hpb=e8c954933b2bfb3bc3ead5a151d49d164f1a8eab;p=libguestfs.git

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 2f14bcb..6e205a0 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -51,7 +51,6 @@ int
 do_scrub_file (char *file)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
@@ -59,13 +58,11 @@ do_scrub_file (char *file)
   ABS_PATH (file, -1);
 
   /* Make the path relative to /sysroot. */
-  len = strlen (file) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (file);
   if (!buf) {
     reply_with_perror ("malloc");
     return -1;
   }
-  snprintf (buf, len, "/sysroot%s", file);
 
   r = command (NULL, &err, "scrub", "-r", buf, NULL);
   free (buf);
@@ -84,7 +81,6 @@ int
 do_scrub_freespace (char *dir)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
@@ -92,13 +88,11 @@ do_scrub_freespace (char *dir)
   ABS_PATH (dir, -1);
 
   /* Make the path relative to /sysroot. */
-  len = strlen (dir) + 9;
-  buf = malloc (len);
+  buf = sysroot_path (dir);
   if (!buf) {
     reply_with_perror ("malloc");
     return -1;
   }
-  snprintf (buf, len, "/sysroot%s", dir);
 
   r = command (NULL, &err, "scrub", "-X", buf, NULL);
   free (buf);