Include 2008 in the copyright years.

[rsync/rsync.git] / fileio.c

diff --git a/fileio.c b/fileio.c
index 432336c..f086494 100644 (file)
--- a/fileio.c
+++ b/fileio.c
@@ -3,11 +3,12 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2007 Wayne Davison
+ * Copyright (C) 2004-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 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
@@ -15,8 +16,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -28,47 +28,55 @@
 extern int sparse_files;
 
 static char last_byte;
-static int last_sparse;
+static size_t sparse_seek = 0;
 
 int sparse_end(int f)
 {
-       if (last_sparse) {
-               do_lseek(f,-1,SEEK_CUR);
-               return (write(f,&last_byte,1) == 1 ? 0 : -1);
-       }
-       last_sparse = 0;
-       return 0;
+       int ret;
+
+       if (!sparse_seek)
+               return 0;
+
+       do_lseek(f, sparse_seek-1, SEEK_CUR);
+       sparse_seek = 0;
+
+       do {
+               ret = write(f, "", 1);
+       } while (ret < 0 && errno == EINTR);
+
+       return ret <= 0 ? -1 : 0;
 }
 
 
-static int write_sparse(int f,char *buf,size_t len)
+static int write_sparse(int f, char *buf, size_t len)
 {
-       size_t l1=0, l2=0;
+       size_t l1 = 0, l2 = 0;
        int ret;
 
        for (l1 = 0; l1 < len && buf[l1] == 0; l1++) {}
        for (l2 = 0; l2 < len-l1 && buf[len-(l2+1)] == 0; l2++) {}
 
+       /* XXX Riddle me this: why does this function SLOW DOWN when I
+        * remove the following (unneeded) line?? Core Duo weirdness? */
        last_byte = buf[len-1];
 
-       if (l1 == len || l2 > 0)
-               last_sparse=1;
-
-       if (l1 > 0) {
-               do_lseek(f,l1,SEEK_CUR);
-       }
+       sparse_seek += l1;
 
        if (l1 == len)
                return len;
 
-       ret = write(f, buf + l1, len - (l1+l2));
-       if (ret == -1 || ret == 0)
+       if (sparse_seek)
+               do_lseek(f, sparse_seek, SEEK_CUR);
+       sparse_seek = l2;
+
+       while ((ret = write(f, buf + l1, len - (l1+l2))) <= 0) {
+               if (ret < 0 && errno == EINTR)
+                       continue;
                return ret;
-       else if (ret != (int) (len - (l1+l2)))
-               return (l1+ret);
+       }
 
-       if (l2 > 0)
-               do_lseek(f,l2,SEEK_CUR);
+       if (ret != (int)(len - (l1+l2)))
+               return l1+ret;
 
        return len;
 }
@@ -151,13 +159,12 @@ struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
 {
        struct map_struct *map;
 
-       if (!(map = new(struct map_struct)))
+       if (!(map = new0(struct map_struct)))
                out_of_memory("map_file");
 
        if (blk_size && (read_size % blk_size))
                read_size += blk_size - (read_size % blk_size);
 
-       memset(map, 0, sizeof map[0]);
        map->fd = fd;
        map->file_size = len;
        map->def_window_size = read_size;