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

diff --git a/daemon/scrub.c b/daemon/scrub.c
index e37a1e1..2cef69d 100644
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -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;
   }