X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fe055c718ab5f3813d4e8b070b8b72dd9c2e0076..6608462cac742530ed6528bfb5ac7e26f43a31ea:/rsync.c

diff --git a/rsync.c b/rsync.c
index 48ed69f8..f3f23142 100644
--- a/rsync.c
+++ b/rsync.c
@@ -388,7 +388,7 @@ static int skip_file(char *fname,
 
 
 /* use a larger block size for really big files */
-int adapt_block_size(struct file_struct *file, int bsize)
+static int adapt_block_size(struct file_struct *file, int bsize)
 {
 	int ret;
 
@@ -401,7 +401,7 @@ int adapt_block_size(struct file_struct *file, int bsize)
 	return ret;
 }
 
-void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
+static void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 {  
   int fd;
   STRUCT_STAT st;
@@ -577,78 +577,92 @@ void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
 
 
 
-static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname)
+static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
+			OFF_T total_size)
 {
-  int i,n,remainder,len,count;
-  OFF_T offset = 0;
-  OFF_T offset2;
-  char *data;
-  static char file_sum1[MD4_SUM_LENGTH];
-  static char file_sum2[MD4_SUM_LENGTH];
-  char *map=NULL;
-
-  count = read_int(f_in);
-  n = read_int(f_in);
-  remainder = read_int(f_in);
+	int i,n,remainder,len,count;
+	OFF_T offset = 0;
+	OFF_T offset2;
+	char *data;
+	static char file_sum1[MD4_SUM_LENGTH];
+	static char file_sum2[MD4_SUM_LENGTH];
+	char *map=NULL;
+	
+	count = read_int(f_in);
+	n = read_int(f_in);
+	remainder = read_int(f_in);
+	
+	sum_init();
+	
+	for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
 
-  sum_init();
+		show_progress(offset, total_size);
 
-  for (i=recv_token(f_in,&data); i != 0; i=recv_token(f_in,&data)) {
-    if (i > 0) {
-      if (verbose > 3)
-	rprintf(FINFO,"data recv %d at %d\n",i,(int)offset);
+		if (i > 0) {
+			if (verbose > 3) {
+				rprintf(FINFO,"data recv %d at %d\n",
+					i,(int)offset);
+			}
 
-      stats.literal_data += i;
-      cleanup_got_literal = 1;
+			stats.literal_data += i;
+			cleanup_got_literal = 1;
       
-      sum_update(data,i);
-
-      if (fd != -1 && write_file(fd,data,i) != i) {
-	rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
-	exit_cleanup(1);
-      }
-      offset += i;
-    } else {
-      i = -(i+1);
-      offset2 = i*n;
-      len = n;
-      if (i == count-1 && remainder != 0)
-	len = remainder;
+			sum_update(data,i);
 
-      stats.matched_data += len;
-
-      if (verbose > 3)
-	rprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n",
-		i,len,(int)offset2,(int)offset);
-
-      map = map_ptr(buf,offset2,len);
+			if (fd != -1 && write_file(fd,data,i) != i) {
+				rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
+				exit_cleanup(1);
+			}
+			offset += i;
+			continue;
+		} 
 
-      see_token(map, len);
-      sum_update(map,len);
+		i = -(i+1);
+		offset2 = i*n;
+		len = n;
+		if (i == count-1 && remainder != 0)
+			len = remainder;
+		
+		stats.matched_data += len;
+		
+		if (verbose > 3)
+			rprintf(FINFO,"chunk[%d] of size %d at %d offset=%d\n",
+				i,len,(int)offset2,(int)offset);
+		
+		map = map_ptr(buf,offset2,len);
+		
+		see_token(map, len);
+		sum_update(map,len);
+		
+		if (fd != -1 && write_file(fd,map,len) != len) {
+			rprintf(FERROR,"write failed on %s : %s\n",
+				fname,strerror(errno));
+			exit_cleanup(1);
+		}
+		offset += len;
+	}
 
-      if (fd != -1 && write_file(fd,map,len) != len) {
-	rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
-	exit_cleanup(1);
-      }
-      offset += len;
-    }
-  }
+	end_progress();
 
-  if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-    rprintf(FERROR,"write failed on %s : %s\n",fname,strerror(errno));
-    exit_cleanup(1);
-  }
+	if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
+		rprintf(FERROR,"write failed on %s : %s\n",
+			fname,strerror(errno));
+		exit_cleanup(1);
+	}
 
-  sum_end(file_sum1);
+	sum_end(file_sum1);
 
-  if (remote_version >= 14) {
-    read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
-    if (verbose > 2)
-      rprintf(FINFO,"got file_sum\n");
-    if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0)
-      return 0;
-  }
-  return 1;
+	if (remote_version >= 14) {
+		read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
+		if (verbose > 2) {
+			rprintf(FINFO,"got file_sum\n");
+		}
+		if (fd != -1 && 
+		    memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
+			return 0;
+		}
+	}
+	return 1;
 }
 
 
@@ -903,7 +917,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
 		if (dry_run) {
 			if (!am_server && verbose)
-				printf("%s\n",fname);
+				rprintf(FINFO,"%s\n",fname);
 			continue;
 		}
 
@@ -915,14 +929,14 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
 			rprintf(FERROR,"fstat %s : %s\n",fname,strerror(errno));
-			receive_data(f_in,NULL,-1,NULL);
+			receive_data(f_in,NULL,-1,NULL,file->length);
 			close(fd1);
 			continue;
 		}
 
 		if (fd1 != -1 && !S_ISREG(st.st_mode)) {
 			rprintf(FERROR,"%s : not a regular file (recv_files)\n",fname);
-			receive_data(f_in,NULL,-1,NULL);
+			receive_data(f_in,NULL,-1,NULL,file->length);
 			close(fd1);
 			continue;
 		}
@@ -943,7 +957,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 
 		if (NULL == do_mktemp(fnametmp)) {
 			rprintf(FERROR,"mktemp %s failed\n",fnametmp);
-			receive_data(f_in,buf,-1,NULL);
+			receive_data(f_in,buf,-1,NULL,file->length);
 			if (buf) unmap_file(buf);
 			close(fd1);
 			continue;
@@ -964,7 +978,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		}
 		if (fd2 == -1) {
 			rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
-			receive_data(f_in,buf,-1,NULL);
+			receive_data(f_in,buf,-1,NULL,file->length);
 			if (buf) unmap_file(buf);
 			close(fd1);
 			continue;
@@ -975,10 +989,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		cleanup_file = file;
 
 		if (!am_server && verbose)
-			printf("%s\n",fname);
+			rprintf(FINFO,"%s\n",fname);
 		
 		/* recv file data */
-		recv_ok = receive_data(f_in,buf,fd2,fname);
+		recv_ok = receive_data(f_in,buf,fd2,fname,file->length);
 		
 		if (buf) unmap_file(buf);
 		if (fd1 != -1) {
@@ -1086,7 +1100,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	  
 	  if (dry_run) {	
 		  if (!am_server && verbose)
-			  printf("%s\n",fname);
+			  rprintf(FINFO,"%s\n",fname);
 		  write_int(f_out,i);
 		  continue;
 	  }
@@ -1136,7 +1150,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		  rprintf(FINFO,"calling match_sums %s\n",fname);
 	  
 	  if (!am_server && verbose)
-		  printf("%s\n",fname+offset);
+		  rprintf(FINFO,"%s\n",fname+offset);
 	  
 	  match_sums(f_out,s,buf,st.st_size);