git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.3.2
[libguestfs.git]
/
daemon
/
ntfs.c
diff --git
a/daemon/ntfs.c
b/daemon/ntfs.c
index
85deb65
..
8938dbd
100644
(file)
--- a/
daemon/ntfs.c
+++ b/
daemon/ntfs.c
@@
-25,6
+25,21
@@
#include "daemon.h"
#include "actions.h"
#include "daemon.h"
#include "actions.h"
+#include "optgroups.h"
+
+int
+optgroup_ntfs3g_available (void)
+{
+ int r = access ("/bin/ntfs-3g.probe", X_OK);
+ return r == 0;
+}
+
+int
+optgroup_ntfsprogs_available (void)
+{
+ int r = access ("/usr/sbin/ntfsresize", X_OK);
+ return r == 0;
+}
int
do_ntfs_3g_probe (int rw, const char *device)
int
do_ntfs_3g_probe (int rw, const char *device)
@@
-37,10
+52,26
@@
do_ntfs_3g_probe (int rw, const char *device)
r = commandr (NULL, &err, "ntfs-3g.probe", rw_flag, device, NULL);
if (r == -1) {
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;
}
return r;
}
free (err);
return -1;
}
return r;
}
+
+int
+do_ntfsresize (const char *device)
+{
+ char *err;
+ int r;
+
+ r = command (NULL, &err, "ntfsresize", "-P", device, NULL);
+ if (r == -1) {
+ reply_with_error ("%s: %s", device, err);
+ free (err);
+ return -1;
+ }
+
+ return 0;
+}