X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fscrub.c;h=15c8b6c26f99306aaf40f2c4ef21a52257af42a3;hp=2f14bcbe689f4c81b71e381999e5160c019a568e;hb=6a14f1c2502f58ff7bed8cb451f95a83f5ee920a;hpb=a7b73d4a1e09f12b2002083618056f0c823c1dcf

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 2f14bcb..15c8b6c 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -28,13 +28,11 @@
 #include "actions.h"
 
 int
-do_scrub_device (char *device)
+do_scrub_device (const char *device)
 {
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
   r = command (NULL, &err, "scrub", device, NULL);
   if (r == -1) {
     reply_with_error ("scrub_device: %s: %s", device, err);
@@ -48,24 +46,18 @@ do_scrub_device (char *device)
 }
 
 int
-do_scrub_file (char *file)
+do_scrub_file (const char *file)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
-  NEED_ROOT (-1);
-  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);
@@ -81,24 +73,18 @@ do_scrub_file (char *file)
 }
 
 int
-do_scrub_freespace (char *dir)
+do_scrub_freespace (const char *dir)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
-  NEED_ROOT (-1);
-  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);