git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Move 'exists', 'is-file' and 'is-dir' to separate file.
[libguestfs.git]
/
daemon
/
ntfs.c
diff --git
a/daemon/ntfs.c
b/daemon/ntfs.c
index
26c8d50
..
73ccbbc
100644
(file)
--- a/
daemon/ntfs.c
+++ b/
daemon/ntfs.c
@@
-25,21
+25,27
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
int
int
-do_ntfs_3g_probe (int rw, char *device)
+optgroup_ntfs3g_available (void)
+{
+ int r = access ("/bin/ntfs-3g.probe", X_OK);
+ return r == 0;
+}
+
+int
+do_ntfs_3g_probe (int rw, const char *device)
{
char *err;
int r;
const char *rw_flag;
{
char *err;
int r;
const char *rw_flag;
- IS_DEVICE (device, -1);
-
rw_flag = rw ? "-w" : "-r";
r = commandr (NULL, &err, "ntfs-3g.probe", rw_flag, device, NULL);
if (r == -1) {
rw_flag = rw ? "-w" : "-r";
r = commandr (NULL, &err, "ntfs-3g.probe", rw_flag, device, NULL);
if (r == -1) {
- reply_with_error ("
ntfs-3g.probe:
%s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (err);
return -1;
}
free (err);
return -1;
}