Fix networking in the appliance.

[libguestfs.git] / fish / alloc.c

diff --git a/fish/alloc.c b/fish/alloc.c
index f91c5bb..7799e4e 100644 (file)
--- a/fish/alloc.c
+++ b/fish/alloc.c
@@ -26,10 +26,12 @@
 #include <inttypes.h>
 #include <errno.h>
 
+#include "xstrtol.h"
+
 #include "fish.h"
 
 int
-do_alloc (const char *cmd, int argc, char *argv[])
+run_alloc (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'alloc file size' to create an image\n"));
@@ -43,7 +45,7 @@ do_alloc (const char *cmd, int argc, char *argv[])
 }
 
 int
-do_sparse (const char *cmd, int argc, char *argv[])
+run_sparse (const char *cmd, size_t argc, char *argv[])
 {
   if (argc != 2) {
     fprintf (stderr, _("use 'sparse file size' to create a sparse image\n"));
@@ -56,8 +58,6 @@ do_sparse (const char *cmd, int argc, char *argv[])
   return 0;
 }
 
-static int parse_size (const char *str, off_t *size_rtn);
-
 /* This is the underlying allocation function.  It's called from
  * a few other places in guestfish.
  */
@@ -133,7 +133,9 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   }
 
   if (add) {
-    if (guestfs_add_drive (g, filename) == -1) {
+    if (guestfs_add_drive_opts (g, filename,
+                                GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
+                                -1) == -1) {
       unlink (filename);
       return -1;
     }
@@ -142,33 +144,17 @@ alloc_disk (const char *filename, const char *size_str, int add, int sparse)
   return 0;
 }
 
-static int
+int
 parse_size (const char *str, off_t *size_rtn)
 {
-  uint64_t size;
-  char type;
-
-  /* Note that the parsing here is looser than what is specified in the
-   * help, but we may tighten it up in future so beware.
-   */
-  if (sscanf (str, "%"SCNu64"%c", &size, &type) == 2) {
-    switch (type) {
-    case 'k': case 'K': size *= 1024ULL; break;
-    case 'm': case 'M': size *= 1024ULL * 1024ULL; break;
-    case 'g': case 'G': size *= 1024ULL * 1024ULL * 1024ULL; break;
-    case 't': case 'T': size *= 1024ULL * 1024ULL * 1024ULL * 1024ULL; break;
-    case 'p': case 'P': size *= 1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL; break;
-    case 'e': case 'E': size *= 1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL * 1024ULL; break;
-    case 's': size *= 512; break;
-    default:
-      fprintf (stderr, _("could not parse size specification '%s'\n"), str);
-      return -1;
-    }
-  }
-  else if (sscanf (str, "%"SCNu64, &size) == 1)
-    size *= 1024ULL;
-  else {
-    fprintf (stderr, _("could not parse size specification '%s'\n"), str);
+  unsigned long long size;
+  strtol_error xerr;
+
+  xerr = xstrtoull (str, NULL, 0, &size, "0kKMGTPEZY");
+  if (xerr != LONGINT_OK) {
+    fprintf (stderr,
+             _("%s: invalid integer parameter (%s returned %d)\n"),
+             "parse_size", "xstrtoull", xerr);
     return -1;
   }