From: Richard Jones Date: Tue, 24 Nov 2009 16:16:08 +0000 (+0000) Subject: daemon: Alternate implementation of posix_fallocate. X-Git-Tag: 1.0.80~51 X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=c2aad5cd929a9932c010d045462bd923162fb593 daemon: Alternate implementation of posix_fallocate. If the posix_fallocate function is not available [ie. Windows] use an alternate implementation that just loops and writes. --- diff --git a/daemon/configure.ac b/daemon/configure.ac index 54d2a4c..7bcdd7e 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -179,6 +179,7 @@ AC_CHECK_FUNCS([\ lsetxattr \ lremovexattr \ mknod \ + posix_fallocate \ removexattr \ setxattr]) diff --git a/daemon/fallocate.c b/daemon/fallocate.c index 20a75e6..1800292 100644 --- a/daemon/fallocate.c +++ b/daemon/fallocate.c @@ -30,7 +30,7 @@ int do_fallocate (const char *path, int len) { - int fd, r; + int fd; CHROOT_IN; fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_NOCTTY, 0666); @@ -40,12 +40,33 @@ do_fallocate (const char *path, int len) return -1; } +#ifdef HAVE_POSIX_FALLOCATE + int r; + r = posix_fallocate (fd, 0, len); if (r == -1) { reply_with_perror ("posix_fallocate: %s", path); close (fd); return -1; } +#else + ssize_t r; + char buf[BUFSIZ]; + const size_t len_sz = (size_t) len; + size_t n; + + memset (buf, 0, BUFSIZ); + n = 0; + while (n < len_sz) { + r = write (fd, buf, len_sz - n < BUFSIZ ? len_sz - n : BUFSIZ); + if (r == -1) { + reply_with_perror ("write: %s", path); + close (fd); + return -1; + } + n += r; + } +#endif if (close (fd) == -1) { reply_with_perror ("close: %s", path);