X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fntfs.c;h=a25fc38a016f439b401b4fadc98bcc2872993ac0;hb=16da7589e91b0030fb5564553447f80b97c0b18c;hp=b35300848a11334f3b7fbf59b7eea8ee2b33244f;hpb=2d9953097b6d3b71122d444a4550047e97aee009;p=libguestfs.git

diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index b353008..a25fc38 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
@@ -20,6 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -30,8 +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)
+{
+  return prog_exists ("ntfsresize");
 }
 
 int
@@ -45,10 +51,46 @@ do_ntfs_3g_probe (int rw, const char *device)
 
   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;
 }
+
+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;
+}
+
+int
+do_ntfsresize_size (const char *device, int64_t size)
+{
+  char *err;
+  int r;
+
+  char buf[32];
+  snprintf (buf, sizeof buf, "%" PRIi64, size);
+
+  r = command (NULL, &err, "ntfsresize", "-P", "--size", buf,
+               device, NULL);
+  if (r == -1) {
+    reply_with_error ("%s: %s", device, err);
+    free (err);
+    return -1;
+  }
+
+  return 0;
+}