X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=daemon%2Fntfs.c;h=909ea18bdf39f8120ca4502e43e6dfeffed2326b;hb=343ba6d482643882c3ab3a529f3d882ee1ba36f9;hp=27aa2650c7268434726a0455caba1aeb67ea1e37;hpb=0938509e0422363554023ab99381fd70a22a6e08;p=libguestfs.git

diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index 27aa265..909ea18 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2010 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
@@ -31,19 +31,13 @@
 int
 optgroup_ntfs3g_available (void)
 {
-  int r = access ("/bin/ntfs-3g.probe", X_OK);
-  if (r == 0)
-    return 1;
-  /* On Debian: */
-  r = access ("/usr/bin/ntfs-3g.probe", X_OK);
-  return (r == 0);
+  return prog_exists ("ntfs-3g.probe");
 }
 
 int
 optgroup_ntfsprogs_available (void)
 {
-  int r = access ("/usr/sbin/ntfsresize", X_OK);
-  return r == 0;
+  return prog_exists ("ntfsresize");
 }
 
 int
@@ -62,6 +56,7 @@ do_ntfs_3g_probe (int rw, const char *device)
     return -1;
   }
 
+  free (err);
   return r;
 }
 
@@ -78,6 +73,7 @@ do_ntfsresize (const char *device)
     return -1;
   }
 
+  free (err);
   return 0;
 }
 
@@ -98,5 +94,6 @@ do_ntfsresize_size (const char *device, int64_t size)
     return -1;
   }
 
+  free (err);
   return 0;
 }