X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fntfs.c;h=589126362fb9661d988de439ed0ebf32f12c0229;hp=a25fc38a016f439b401b4fadc98bcc2872993ac0;hb=7d4a99db87b9fe9373b482092db88610fb796012;hpb=363978fa7fc055da380d31103c7de378a08b71fb

diff --git a/daemon/ntfs.c b/daemon/ntfs.c
index a25fc38..5891263 100644
--- a/daemon/ntfs.c
+++ b/daemon/ntfs.c
@@ -56,41 +56,60 @@ do_ntfs_3g_probe (int rw, const char *device)
     return -1;
   }
 
+  free (err);
   return r;
 }
 
+/* Takes optional arguments, consult optargs_bitmask. */
 int
-do_ntfsresize (const char *device)
+do_ntfsresize_opts (const char *device, int64_t size, int force)
 {
   char *err;
   int r;
+  const char *argv[16];
+  size_t i = 0;
+  char size_str[32];
+
+  argv[i++] = "ntfsresize";
+  argv[i++] = "-P";
+
+  if (optargs_bitmask & GUESTFS_NTFSRESIZE_OPTS_SIZE_BITMASK) {
+    if (size <= 0) {
+      reply_with_error ("size is zero or negative");
+      return -1;
+    }
+
+    snprintf (size_str, sizeof size_str, "%" PRIi64, size);
+    argv[i++] = "--size";
+    argv[i++] = size_str;
+  }
+
+  if (optargs_bitmask & GUESTFS_NTFSRESIZE_OPTS_FORCE_BITMASK && force)
+    argv[i++] = "--force";
 
-  r = command (NULL, &err, "ntfsresize", "-P", device, NULL);
+  argv[i++] = device;
+  argv[i++] = NULL;
+
+  r = commandv (NULL, &err, argv);
   if (r == -1) {
     reply_with_error ("%s: %s", device, err);
     free (err);
     return -1;
   }
 
+  free (err);
   return 0;
 }
 
 int
-do_ntfsresize_size (const char *device, int64_t size)
+do_ntfsresize (const char *device)
 {
-  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 do_ntfsresize_opts (device, 0, 0);
+}
 
-  return 0;
+int
+do_ntfsresize_size (const char *device, int64_t size)
+{
+  optargs_bitmask = GUESTFS_NTFSRESIZE_OPTS_SIZE_BITMASK;
+  return do_ntfsresize_opts (device, size, 0);
 }