X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/96d910c770b9443e204e183d3f3a8720c346a79c..80a25bb88076453bbd2a2e00d697fd6b03ad4a7b:/sender.c

diff --git a/sender.c b/sender.c
index 1436eb6c..80b7096c 100644
--- a/sender.c
+++ b/sender.c
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int protocol_version;
+extern int make_backups;
 extern struct stats stats;
 
 
@@ -71,8 +72,8 @@ static struct sum_struct *receive_sums(int f)
 	s->sums = NULL;
 
 	if (verbose > 3) {
-		rprintf(FINFO, "count=%ld n=%u rem=%u\n",
-			(long)s->count, s->blength, s->remainder);
+		rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
+			(double)s->count, (long)s->blength, (long)s->remainder);
 	}
 
 	if (s->count == 0)
@@ -120,6 +121,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 	struct file_struct *file;
 	int phase = 0;
 	struct stats initial_stats;
+	int save_make_backups = make_backups;
 	int j;
 
 	if (verbose > 2)
@@ -136,6 +138,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 				write_int(f_out, -1);
 				if (verbose > 2)
 					rprintf(FINFO, "send_files phase=%d\n", phase);
+				/* For inplace: redo phase turns off the backup
+				 * flag so that we do a regular inplace send. */
+				make_backups = 0;
 				continue;
 			}
 			break;
@@ -209,7 +214,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		}
 
 		if (st.st_size) {
-			OFF_T map_size = MAX(s->blength * 3, MAX_MAP_SIZE);
+			OFF_T map_size = MAX((OFF_T)s->blength * 3, MAX_MAP_SIZE);
 			mbuf = map_file(fd, st.st_size, map_size, s->blength);
 		} else
 			mbuf = NULL;
@@ -253,6 +258,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 				safe_fname(fname));
 		}
 	}
+	make_backups = save_make_backups;
 
 	if (verbose > 2)
 		rprintf(FINFO, "send files finished\n");