X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffallocate.c;h=bc744f59bc1faf93e74004db1e69e4f457e20141;hb=8bc6e9d6a89672bbe1e7469774abe889354deb67;hp=eb8414571f087676c4e3a398f43a5d0d87b36000;hpb=84fc760439e82e6b3616abd0d1f9bd7d7eb01ec0;p=libguestfs.git diff --git a/daemon/fallocate.c b/daemon/fallocate.c index eb84145..bc744f5 100644 --- a/daemon/fallocate.c +++ b/daemon/fallocate.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -23,6 +23,7 @@ #include #include #include +#include #include "daemon.h" #include "actions.h" @@ -30,22 +31,53 @@ int do_fallocate (const char *path, int len) { - int fd, r; + if (len < 0) { + reply_with_error ("length < 0"); + return -1; + } + + return do_fallocate64 (path, len); +} + +int +do_fallocate64 (const char *path, int64_t len) +{ + int fd; CHROOT_IN; fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_NOCTTY, 0666); CHROOT_OUT; if (fd == -1) { - reply_with_perror (path); + reply_with_perror ("open: %s", path); return -1; } - r = posix_fallocate (fd, 0, len); - if (r == -1) { - reply_with_perror ("posix_fallocate: %s", path); +#ifdef HAVE_POSIX_FALLOCATE + int err = posix_fallocate (fd, 0, len); + if (err != 0) { + errno = err; + reply_with_perror ("%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);