diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2010-12-10 17:38:17 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2010-12-10 17:38:17 +0000 |
| commit | 363978fa7fc055da380d31103c7de378a08b71fb (patch) | |
| tree | 652da241a979f0b7bb277d86fc05b7b4a15aea32 | |
| parent | 4fb66110c2ffec1bc3f7fdf4a6d09b1d28a78db3 (diff) | |
| download | libguestfs-363978fa7fc055da380d31103c7de378a08b71fb.tar.gz libguestfs-363978fa7fc055da380d31103c7de378a08b71fb.tar.xz libguestfs-363978fa7fc055da380d31103c7de378a08b71fb.zip | |
daemon: Use prog_exists to check for features.
This updates commit 0938509e0422363554023ab99381fd70a22a6e08.
| -rw-r--r-- | daemon/ntfs.c | 12 | ||||
| -rw-r--r-- | daemon/tar.c | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/daemon/ntfs.c b/daemon/ntfs.c index 27aa2650..a25fc38a 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 diff --git a/daemon/tar.c b/daemon/tar.c index 072a5669..2ddde88a 100644 --- a/daemon/tar.c +++ b/daemon/tar.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 @@ -33,8 +33,7 @@ int optgroup_xz_available (void) { - int r = access ("/usr/bin/xz", X_OK); - return r == 0; + return prog_exists ("xz"); } /* Redirect errors from the tar command to the error file, then |