X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fntfs.c;h=909ea18bdf39f8120ca4502e43e6dfeffed2326b;hb=f3ada2c7653866f2529c9f18aaa99f76cd984844;hp=46b8333e064b57c3c46e545be214e1208c75c18a;hpb=7cb6fac3074c52ac3c3e9ead5d99e4a2887cf7b1;p=libguestfs.git diff --git a/daemon/ntfs.c b/daemon/ntfs.c index 46b8333..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,15 +31,13 @@ int optgroup_ntfs3g_available (void) { - int r = access ("/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 @@ -58,6 +56,7 @@ do_ntfs_3g_probe (int rw, const char *device) return -1; } + free (err); return r; } @@ -74,6 +73,7 @@ do_ntfsresize (const char *device) return -1; } + free (err); return 0; } @@ -94,5 +94,6 @@ do_ntfsresize_size (const char *device, int64_t size) return -1; } + free (err); return 0; }