X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fscrub.c;h=f1601f9f5c246b57b650a28f6b2613d973000c48;hb=8601bbda56cdb2b8491b6e2054596ec9599c38f1;hp=9b6d49df8a7b9ae05bc1123785112e156693b0ce;hpb=da7cf3670fe60301beeb175ff6c284b737d5b7f4;p=libguestfs.git

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 9b6d49d..f1601f9 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc. 
+ * Copyright (C) 2009 Red Hat Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ do_scrub_device (char *device)
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
+  RESOLVE_DEVICE (device, return -1);
 
   r = command (NULL, &err, "scrub", device, NULL);
   if (r == -1) {
@@ -51,21 +51,18 @@ int
 do_scrub_file (char *file)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (file, -1);
+  ABS_PATH (file, return -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,21 +81,18 @@ int
 do_scrub_freespace (char *dir)
 {
   char *buf;
-  int len;
   char *err;
   int r;
 
   NEED_ROOT (-1);
-  ABS_PATH (dir, -1);
+  ABS_PATH (dir, return -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);