X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d5ee1f8e7a370884aa9c5353de5129728ed9a37b..dc5ddbccace1f4f37d57ce5d961117effc28a356:/io.c

diff --git a/io.c b/io.c
index 9b6bdc82..3c55dbee 100644
--- a/io.c
+++ b/io.c
@@ -28,6 +28,7 @@ static int total_written = 0;
 static int total_read = 0;
 
 extern int verbose;
+extern int sparse_files;
 
 int write_total(void)
 {
@@ -128,7 +129,7 @@ int read_int(int f)
   char b[4];
   if ((ret=readfd(f,b,4)) != 4) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",
+      fprintf(FERROR,"Error reading %d bytes : %s\n",
 	      4,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -141,7 +142,7 @@ void read_buf(int f,char *buf,int len)
   int ret;
   if ((ret=readfd(f,buf,len)) != len) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",
+      fprintf(FERROR,"Error reading %d bytes : %s\n",
 	      len,ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -161,43 +162,51 @@ static int last_sparse = 0;
 
 int sparse_end(int f)
 {
-#if SPARSE_FILES
   if (last_sparse) {
     lseek(f,-1,SEEK_CUR);
     return (write(f,&last_byte,1) == 1 ? 0 : -1);
   }
-#endif  
   last_sparse = 0;
   return 0;
 }
 
 int write_sparse(int f,char *buf,int len)
 {
-  int l=0;
+  int l1=0,l2=0;
+  int ret;
 
-#if SPARSE_FILES
-  for (l=0;l<len && buf[l]==0;l++) ;
+  if (!sparse_files) 
+    return write(f,buf,len);
 
-  if (l > 0)
-    lseek(f,l,SEEK_CUR);
+  for (l1=0;l1<len && buf[l1]==0;l1++) ;
+  for (l2=0;l2<(len-l1) && buf[len-(l2+1)]==0;l2++) ;
 
   last_byte = buf[len-1];
-#endif
 
-  if (l == len) {
-    last_sparse = 1;
+  if (l1 == len || l2 > 0)
+    last_sparse=1;
+
+  if (l1 > 0)
+    lseek(f,l1,SEEK_CUR);  
+
+  if (l1 == len) 
     return len;
-  } 
 
-  last_sparse = 0;
+  if ((ret=write(f,buf+l1,len-(l1+l2))) != len-(l1+l2)) {
+    if (ret == -1 || ret == 0) return ret;
+    return (l1+ret);
+  }
+
+  if (l2 > 0)
+    lseek(f,l2,SEEK_CUR);
 
-  return (l + write(f,buf+l,len-l));
+  return len;
 }
 
 int read_write(int fd_in,int fd_out,int size)
 {
   static char *buf=NULL;
-  static int bufsize = CHUNK_SIZE;
+  int bufsize = sparse_files?SPARSE_WRITE_SIZE:WRITE_SIZE;
   int total=0;
   
   if (!buf) {
@@ -257,7 +266,7 @@ void write_int(int f,int x)
   char b[4];
   SIVAL(b,0,x);
   if ((ret=writefd(f,b,4)) != 4) {
-    fprintf(stderr,"write_int failed : %s\n",
+    fprintf(FERROR,"write_int failed : %s\n",
 	    ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }
@@ -268,7 +277,7 @@ void write_buf(int f,char *buf,int len)
 {
   int ret;
   if ((ret=writefd(f,buf,len)) != len) {
-    fprintf(stderr,"write_buf failed : %s\n",
+    fprintf(FERROR,"write_buf failed : %s\n",
 	    ret==-1?strerror(errno):"EOF");
     exit_cleanup(1);
   }