X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fscrub.c;h=573385f063c574456ca2dc875a3bef4089cf1748;hp=e37a1e110b63e90e8afa79b2318e6fde159a69d9;hb=65510965b3475dd80bdbf042992298451dc2b67b;hpb=2d9953097b6d3b71122d444a4550047e97aee009

diff --git a/daemon/scrub.c b/daemon/scrub.c
index e37a1e1..573385f 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -31,8 +31,7 @@
 int
 optgroup_scrub_available (void)
 {
-  int r = access ("/usr/bin/scrub", X_OK);
-  return r == 0;
+  return prog_exists ("scrub");
 }
 
 int
@@ -43,7 +42,7 @@ do_scrub_device (const char *device)
 
   r = command (NULL, &err, "scrub", device, NULL);
   if (r == -1) {
-    reply_with_error ("scrub_device: %s: %s", device, err);
+    reply_with_error ("%s: %s", device, err);
     free (err);
     return -1;
   }
@@ -70,7 +69,7 @@ do_scrub_file (const char *file)
   r = command (NULL, &err, "scrub", "-r", buf, NULL);
   free (buf);
   if (r == -1) {
-    reply_with_error ("scrub_file: %s: %s", file, err);
+    reply_with_error ("%s: %s", file, err);
     free (err);
     return -1;
   }
@@ -97,7 +96,7 @@ do_scrub_freespace (const char *dir)
   r = command (NULL, &err, "scrub", "-X", buf, NULL);
   free (buf);
   if (r == -1) {
-    reply_with_error ("scrub_freespace: %s: %s", dir, err);
+    reply_with_error ("%s: %s", dir, err);
     free (err);
     return -1;
   }