X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Falloc.c;h=28c990f1bd4f69119fe27e8f969b8f4053af7858;hb=2e47daea514fe577bf8b1661ceb070103e20ded1;hp=e35c02f7618c8ed5f71f6a321754b1729499a17e;hpb=5ce72e039ca332ba19bb9122b7c93d257e745bb5;p=libguestfs.git

diff --git a/fish/alloc.c b/fish/alloc.c
index e35c02f..28c990f 100644
--- a/fish/alloc.c
+++ b/fish/alloc.c
@@ -54,12 +54,31 @@ do_alloc (const char *cmd, int argc, char *argv[])
     return -1;
   }
 
+#ifdef HAVE_POSIX_FALLOCATE
   if (posix_fallocate (fd, 0, size) == -1) {
     perror ("fallocate");
     close (fd);
     unlink (argv[0]);
     return -1;
   }
+#else
+  /* Slow emulation of posix_fallocate on platforms which don't have it. */
+  char buffer[BUFSIZ];
+  memset (buffer, 0, sizeof buffer);
+
+  size_t remaining = size;
+  while (remaining > 0) {
+    size_t n = remaining > sizeof buffer ? sizeof buffer : remaining;
+    ssize_t r = write (fd, buffer, n);
+    if (r == -1) {
+      perror ("write");
+      close (fd);
+      unlink (argv[0]);
+      return -1;
+    }
+    remaining -= r;
+  }
+#endif
 
   if (close (fd) == -1) {
     perror (argv[0]);
@@ -140,9 +159,12 @@ parse_size (const char *str, off_t *size_rtn)
    */
   if (sscanf (str, "%"SCNu64"%c", &size, &type) == 2) {
     switch (type) {
-    case 'k': case 'K': size *= 1024; break;
-    case 'm': case 'M': size *= 1024 * 1024; break;
-    case 'g': case 'G': size *= 1024 * 1024 * 1024; break;
+    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);
@@ -150,7 +172,7 @@ parse_size (const char *str, off_t *size_rtn)
     }
   }
   else if (sscanf (str, "%"SCNu64, &size) == 1)
-    size *= 1024;
+    size *= 1024ULL;
   else {
     fprintf (stderr, _("could not parse size specification '%s'\n"), str);
     return -1;