X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/18233a170eb92412033ca9e1f7be341ffb4e31b3..b3bf9b9df95137a3a43248be9599d919b04877af:/fileio.c

diff --git a/fileio.c b/fileio.c
index 52e34bda..0faa6195 100644
--- a/fileio.c
+++ b/fileio.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2009 Wayne Davison
  *
  * 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
+ * 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,
@@ -16,11 +16,11 @@
  * 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"
+#include "inums.h"
 
 #ifndef ENODATA
 #define ENODATA EAGAIN
@@ -29,47 +29,55 @@
 extern int sparse_files;
 
 static char last_byte;
-static int last_sparse;
+static OFF_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, int len)
 {
-	size_t l1=0, l2=0;
+	int 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;
 }
@@ -101,7 +109,7 @@ int flush_write_file(int f)
  * write_file does not allow incomplete writes.  It loops internally
  * until len bytes are written or errno is set.
  */
-int write_file(int f,char *buf,size_t len)
+int write_file(int f, char *buf, int len)
 {
 	int ret = 0;
 
@@ -118,7 +126,7 @@ int write_file(int f,char *buf,size_t len)
 				if (!wf_writeBuf)
 					out_of_memory("write_file");
 			}
-			r1 = MIN(len, wf_writeBufSize - wf_writeBufCnt);
+			r1 = (int)MIN((size_t)len, wf_writeBufSize - wf_writeBufCnt);
 			if (r1) {
 				memcpy(wf_writeBuf + wf_writeBufCnt, buf, r1);
 				wf_writeBufCnt += r1;
@@ -152,13 +160,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;
@@ -226,8 +233,8 @@ char *map_ptr(struct map_struct *map, OFF_T offset, int32 len)
 	if (map->p_fd_offset != read_start) {
 		OFF_T ret = do_lseek(map->fd, read_start, SEEK_SET);
 		if (ret != read_start) {
-			rsyserr(FERROR, errno, "lseek returned %.0f, not %.0f",
-				(double)ret, (double)read_start);
+			rsyserr(FERROR, errno, "lseek returned %s, not %s",
+				big_num(ret), big_num(read_start));
 			exit_cleanup(RERR_FILEIO);
 		}
 		map->p_fd_offset = read_start;