daemon: debug segv correct use of dereferencing NULL.

[libguestfs.git] / daemon / zerofree.c

diff --git a/daemon/zerofree.c b/daemon/zerofree.c
index ed7a3fc..e9be8fc 100644 (file)
--- a/daemon/zerofree.c
+++ b/daemon/zerofree.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
@@ -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>
@@ -26,18 +26,23 @@
 
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"
 
 int
-do_zerofree (char *device)
+optgroup_zerofree_available (void)
+{
+  return prog_exists ("zerofree");
+}
+
+int
+do_zerofree (const char *device)
 {
   char *err;
   int r;
 
-  IS_DEVICE (device, -1);
-
-  r = command (NULL, &err, "/usr/sbin/zerofree", device, NULL);
+  r = command (NULL, &err, "zerofree", device, NULL);
   if (r == -1) {
-    reply_with_error ("zerofree: %s: %s", device, err);
+    reply_with_error ("%s: %s", device, err);
     free (err);
     return -1;
   }