mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
d5f98968a4
posix_fallocate has a non-standard way to return error indications.
Thus all our calls to posix_fallocate were effectively unchecked. For
example:
$ guestfish alloc test.img 1P
$ echo $?
0
$ ll test.img
-rw-rw-r--. 1 rjones rjones 0 2010-04-06 11:02 test.img
$ rm test.img
With this change, errors are detected and reported properly:
$ ./fish/guestfish alloc test.img 1P
fallocate: File too large
This is a fix for:
https://bugzilla.redhat.com/show_bug.cgi?id=579664
(cherry picked from commit 2ade61d1f8)
78 lines
1.8 KiB
C
78 lines
1.8 KiB
C
/* libguestfs - the guestfsd daemon
|
|
* Copyright (C) 2009 Red Hat Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <errno.h>
|
|
|
|
#include "daemon.h"
|
|
#include "actions.h"
|
|
|
|
int
|
|
do_fallocate (const char *path, int 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 ("open: %s", path);
|
|
return -1;
|
|
}
|
|
|
|
#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);
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|