X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Ffallocate.c;h=bc744f59bc1faf93e74004db1e69e4f457e20141;hb=ddb3fac1bf1b0493779c9425b518598473ef106a;hp=9c5a3dded9cbffa6bd78d0401a87ff86a64eed2a;hpb=6bda071b5cd8393b37653687027c4ae6c6cf3804;p=libguestfs.git

diff --git a/daemon/fallocate.c b/daemon/fallocate.c
index 9c5a3dd..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 <config.h>
@@ -23,32 +23,61 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include "daemon.h"
 #include "actions.h"
 
 int
-do_fallocate (char *path, int len)
+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);
+}
 
-  NEED_ROOT (return -1);
-  ABS_PATH (path, return -1);
+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);