hivex: Modify children/values functions to return intermediate blocks.

[libguestfs.git] / daemon / scrub.c

diff --git a/daemon/scrub.c b/daemon/scrub.c
index 5530c69..e37a1e1 100644 (file)
--- a/daemon/scrub.c
+++ b/daemon/scrub.c
@@ -26,9 +26,17 @@
 
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
 
 int
-do_scrub_device (char *device)
+optgroup_scrub_available (void)
+{
+  int r = access ("/usr/bin/scrub", X_OK);
+  return r == 0;
+}
+
+int
+do_scrub_device (const char *device)
 {
   char *err;
   int r;
@@ -46,15 +54,12 @@ do_scrub_device (char *device)
 }
 
 int
-do_scrub_file (char *file)
+do_scrub_file (const char *file)
 {
   char *buf;
   char *err;
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (file, return -1);
-
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (file);
   if (!buf) {
@@ -76,15 +81,12 @@ do_scrub_file (char *file)
 }
 
 int
-do_scrub_freespace (char *dir)
+do_scrub_freespace (const char *dir)
 {
   char *buf;
   char *err;
   int r;
 
-  NEED_ROOT (return -1);
-  ABS_PATH (dir, return -1);
-
   /* Make the path relative to /sysroot. */
   buf = sysroot_path (dir);
   if (!buf) {