X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/11a5a3c704fd75325450ddae3fb2cb01f19b7111..66203a982b3d249bafda9b9272c4c103c19e4a9b:/sender.c

diff --git a/sender.c b/sender.c
index d2beb4dc..dc7da4dc 100644
--- a/sender.c
+++ b/sender.c
@@ -70,8 +70,8 @@ static struct sum_struct *receive_sums(int f)
 		offset += s->sums[i].len;
 
 		if (verbose > 3)
-			rprintf(FINFO,"chunk[%d] len=%d offset=%d sum1=%08x\n",
-				i,s->sums[i].len,(int)s->sums[i].offset,s->sums[i].sum1);
+			rprintf(FINFO,"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
+				i,s->sums[i].len,(double)s->sums[i].offset,s->sums[i].sum1);
 	}
 
 	s->flength = offset;
@@ -91,6 +91,8 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 	int i;
 	struct file_struct *file;
 	int phase = 0;
+	extern struct stats stats;		
+	struct stats initial_stats;
 
 	if (verbose > 2)
 		rprintf(FINFO,"send_files starting\n");
@@ -116,7 +118,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		if (i < 0 || i >= flist->count) {
 			rprintf(FERROR,"Invalid file index %d (count=%d)\n", 
 				i, flist->count);
-			exit_cleanup(1);
+			exit_cleanup(RERR_PROTOCOL);
 		}
 
 		file = flist->files[i];
@@ -126,18 +128,17 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 
 		fname[0] = 0;
 		if (file->basedir) {
-			strlcpy(fname,file->basedir,MAXPATHLEN-1);
+			strlcpy(fname,file->basedir,MAXPATHLEN);
 			if (strlen(fname) == MAXPATHLEN-1) {
 				io_error = 1;
 				rprintf(FERROR, "send_files failed on long-named directory %s\n",
 					fname);
 				return;
 			}
-			strlcat(fname,"/",MAXPATHLEN-1);
+			strlcat(fname,"/",MAXPATHLEN);
 			offset = strlen(file->basedir)+1;
 		}
-		strlcat(fname,f_name(file),MAXPATHLEN-strlen(fname));
-		clean_fname(fname);
+		strlcat(fname,f_name(file),MAXPATHLEN);
 	  
 		if (verbose > 2) 
 			rprintf(FINFO,"send_files(%d,%s)\n",i,fname);
@@ -150,6 +151,8 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 			continue;
 		}
 
+		initial_stats = stats;
+
 		s = receive_sums(f_in);
 		if (!s) {
 			io_error = 1;
@@ -157,7 +160,7 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 			return;
 		}
 	  
-		fd = open(fname,O_RDONLY);
+		fd = do_open(fname, O_RDONLY, 0);
 		if (fd == -1) {
 			io_error = 1;
 			rprintf(FERROR,"send_files failed to open %s: %s\n",
@@ -182,11 +185,9 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		}
 	  
 		if (verbose > 2)
-			rprintf(FINFO,"send_files mapped %s of size %d\n",
-				fname,(int)st.st_size);
+			rprintf(FINFO,"send_files mapped %s of size %.0f\n",
+				fname,(double)st.st_size);
 
-		log_send(file);
-	  
 		write_int(f_out,i);
 	  
 		write_int(f_out,s->count);
@@ -199,9 +200,13 @@ void send_files(struct file_list *flist,int f_out,int f_in)
 		if (!am_server) {
 			log_transfer(file, fname+offset);
 		}
+
+		set_compression(fname);
 	  
 		match_sums(f_out,s,buf,st.st_size);
-	  
+
+		log_send(file, &initial_stats);
+	  	  
 		if (buf) unmap_file(buf);
 		close(fd);