X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7cf8a5515da2ce8ec6b3bd11f51cc890a6b24b5e..686ce3aa4f643829bdde0d9908228adb6b541f6d:/threaded-receiver.diff

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index f219a94..d908d9a 100644
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -18,15 +18,9 @@ NOTE: we still need to duplicate the partial_fname static in util.c!
 If you try this out, please send some email to wayned@samba.org or the rsync
 mailing list with your results, build changes, bug reports, etc.  Thanks!
 
-After applying this patch, run these commands for a successful build:
-
-    ./prepare-source
-    ./configure                      (optional if already run)
-    make
-
 --- old/Makefile.in
 +++ new/Makefile.in
-@@ -6,7 +6,7 @@ exec_prefix=@exec_prefix@
+@@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
  bindir=@bindir@
  mandir=@mandir@
  
@@ -37,9 +31,9 @@ After applying this patch, run these commands for a successful build:
  CPPFLAGS=@CPPFLAGS@
 --- old/cleanup.c
 +++ new/cleanup.c
-@@ -28,10 +28,6 @@ extern int keep_partial;
- extern int log_got_error;
+@@ -31,10 +31,6 @@ extern int log_got_error;
  extern char *partial_dir;
+ extern char *logfile_name;
  
 -#ifdef HAVE_SIGACTION
 -static struct sigaction sigact;
@@ -48,25 +42,25 @@ After applying this patch, run these commands for a successful build:
  /**
   * Close all open sockets and files, allowing a (somewhat) graceful
   * shutdown() of socket connections.  This eliminates the abortive
-@@ -100,9 +96,6 @@ void _exit_cleanup(int code, const char 
- 	}
- 	inside_cleanup++;
+@@ -98,9 +94,6 @@ NORETURN void _exit_cleanup(int code, co
+ 	static int exit_code = 0;
+ 	static int unmodified_code = 0;
  
 -	SIGACTION(SIGUSR1, SIG_IGN);
 -	SIGACTION(SIGUSR2, SIG_IGN);
 -
- 	if (verbose > 3) {
- 		rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
- 			code, file, line);
-@@ -134,8 +127,6 @@ void _exit_cleanup(int code, const char 
- 	io_flush(FULL_FLUSH);
- 	if (cleanup_fname)
- 		do_unlink(cleanup_fname);
--	if (code)
--		kill_all(SIGUSR1);
- 	if (cleanup_pid && cleanup_pid == getpid()) {
- 		char *pidf = lp_pid_file();
- 		if (pidf && *pidf)
+ 	if (exit_code) /* Preserve first error code when recursing. */
+ 		code = exit_code;
+ 
+@@ -157,8 +150,6 @@ NORETURN void _exit_cleanup(int code, co
+ 
+ 		if (cleanup_fname)
+ 			do_unlink(cleanup_fname);
+-		if (code)
+-			kill_all(SIGUSR1);
+ 		if (cleanup_pid && cleanup_pid == getpid()) {
+ 			char *pidf = lp_pid_file();
+ 			if (pidf && *pidf)
 --- old/errcode.h
 +++ new/errcode.h
 @@ -37,7 +37,6 @@
@@ -79,7 +73,7 @@ After applying this patch, run these commands for a successful build:
  #define RERR_MALLOC     22      /* error allocating core memory buffers */
 --- old/generator.c
 +++ new/generator.c
-@@ -67,7 +67,6 @@ extern OFF_T min_size;
+@@ -66,7 +66,6 @@ extern OFF_T min_size;
  extern int io_error;
  extern int allowed_lull;
  extern int sock_f_out;
@@ -99,7 +93,7 @@ After applying this patch, run these commands for a successful build:
  /* For calling delete_file() */
  #define DEL_FORCE_RECURSE	(1<<1) /* recurse even w/o --force */
  #define DEL_TERSE		(1<<3)
-@@ -443,8 +447,8 @@ static void sum_sizes_sqroot(struct sum_
+@@ -445,8 +449,8 @@ static void sum_sizes_sqroot(struct sum_
  	}
  
  	if (protocol_version < 27) {
@@ -110,8 +104,8 @@ After applying this patch, run these commands for a successful build:
  		s2length = SUM_LENGTH;
  	} else {
  		int32 c;
-@@ -454,7 +458,7 @@ static void sum_sizes_sqroot(struct sum_
- 		for (c = blength; c >>= 1 && b; b--) {}
+@@ -456,7 +460,7 @@ static void sum_sizes_sqroot(struct sum_
+ 		for (c = blength; (c >>= 1) && b; b--) {}
  		/* add a bit, subtract rollsum, round up. */
  		s2length = (b + 1 - 32 + 7) / 8; /* --optimize in compiler-- */
 -		s2length = MAX(s2length, csum_length);
@@ -119,7 +113,7 @@ After applying this patch, run these commands for a successful build:
  		s2length = MIN(s2length, SUM_LENGTH);
  	}
  
-@@ -488,7 +492,7 @@ static void generate_and_send_sums(int f
+@@ -490,7 +494,7 @@ static void generate_and_send_sums(int f
  	sum_sizes_sqroot(&sum, len);
  	write_sum_head(f_out, &sum);
  
@@ -128,7 +122,7 @@ After applying this patch, run these commands for a successful build:
  		return;
  
  	if (len > 0)
-@@ -507,7 +511,7 @@ static void generate_and_send_sums(int f
+@@ -509,7 +513,7 @@ static void generate_and_send_sums(int f
  
  		if (f_copy >= 0) {
  			full_write(f_copy, map, n1);
@@ -137,7 +131,7 @@ After applying this patch, run these commands for a successful build:
  				continue;
  		}
  
-@@ -1175,7 +1179,7 @@ static void recv_generator(char *fname, 
+@@ -1205,7 +1209,7 @@ static void recv_generator(char *fname, 
  		return;
  	}
  
@@ -146,7 +140,7 @@ After applying this patch, run these commands for a successful build:
  		return;
  
  	if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1230,7 +1234,7 @@ static void recv_generator(char *fname, 
+@@ -1268,7 +1272,7 @@ static void recv_generator(char *fname, 
  		goto notify_others;
  	}
  
@@ -155,7 +149,7 @@ After applying this patch, run these commands for a successful build:
  		if (!(backupptr = get_backup_name(fname))) {
  			close(fd);
  			return;
-@@ -1321,9 +1325,12 @@ void generate_files(int f_out, struct fi
+@@ -1359,9 +1363,12 @@ void generate_files(int f_out, struct fi
  	int save_ignore_existing = ignore_existing;
  	int save_ignore_non_existing = ignore_non_existing;
  	int save_do_progress = do_progress;
@@ -168,8 +162,8 @@ After applying this patch, run these commands for a successful build:
 +
  	if (protocol_version >= 29) {
  		itemizing = 1;
- 		maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
-@@ -1351,7 +1358,7 @@ void generate_files(int f_out, struct fi
+ 		maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
+@@ -1389,7 +1396,7 @@ void generate_files(int f_out, struct fi
  		do_delete_pass(flist);
  	do_progress = 0;
  
@@ -178,7 +172,7 @@ After applying this patch, run these commands for a successful build:
  		whole_file = 0;
  	if (verbose >= 2) {
  		rprintf(FINFO, "delta-transmission %s\n",
-@@ -1360,12 +1367,6 @@ void generate_files(int f_out, struct fi
+@@ -1398,12 +1405,6 @@ void generate_files(int f_out, struct fi
  			: "enabled");
  	}
  
@@ -191,7 +185,7 @@ After applying this patch, run these commands for a successful build:
  	for (i = 0; i < flist->count; i++) {
  		struct file_struct *file = flist->files[i];
  
-@@ -1409,23 +1410,34 @@ void generate_files(int f_out, struct fi
+@@ -1447,23 +1448,34 @@ void generate_files(int f_out, struct fi
  		delete_in_dir(NULL, NULL, NULL, NULL);
  
  	phase++;
@@ -232,7 +226,7 @@ After applying this patch, run these commands for a successful build:
  		if (local_name)
  			strlcpy(fbuf, local_name, sizeof fbuf);
  		else
-@@ -1437,27 +1449,43 @@ void generate_files(int f_out, struct fi
+@@ -1475,27 +1487,43 @@ void generate_files(int f_out, struct fi
  	phase++;
  	ignore_non_existing = save_ignore_non_existing;
  	ignore_existing = save_ignore_existing;
@@ -295,7 +289,7 @@ After applying this patch, run these commands for a successful build:
  extern int csum_length;
  extern int checksum_seed;
  extern int protocol_version;
--extern int remove_sent_files;
+-extern int remove_source_files;
  extern int preserve_hard_links;
  extern char *filesfrom_host;
  extern struct stats stats;
@@ -460,7 +454,7 @@ After applying this patch, run these commands for a successful build:
  static void read_msg_fd(void)
  {
  	char buf[2048];
-@@ -244,57 +242,6 @@ static void read_msg_fd(void)
+@@ -244,51 +242,6 @@ static void read_msg_fd(void)
  	tag = (tag >> 24) - MPLEX_BASE;
  
  	switch (tag) {
@@ -477,7 +471,7 @@ After applying this patch, run these commands for a successful build:
 -			exit_cleanup(RERR_STREAMIO);
 -		}
 -		read_loop(fd, buf, 4);
--		if (remove_sent_files)
+-		if (remove_source_files)
 -			decrement_active_files(IVAL(buf,0));
 -		flist_ndx_push(&redo_list, IVAL(buf,0));
 -		break;
@@ -487,10 +481,7 @@ After applying this patch, run these commands for a successful build:
 -			exit_cleanup(RERR_STREAMIO);
 -		}
 -		read_loop(fd, buf, len);
--		if (defer_forwarding_messages)
--			msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
--		else
--			io_multiplex_write(MSG_DELETED, buf, len);
+-		send_msg(MSG_DELETED, buf, len);
 -		break;
 -	case MSG_SUCCESS:
 -		if (len != 4 || !am_generator) {
@@ -498,12 +489,9 @@ After applying this patch, run these commands for a successful build:
 -			exit_cleanup(RERR_STREAMIO);
 -		}
 -		read_loop(fd, buf, len);
--		if (remove_sent_files) {
+-		if (remove_source_files) {
 -			decrement_active_files(IVAL(buf,0));
--			if (defer_forwarding_messages)
--				msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
--			else
--				io_multiplex_write(MSG_SUCCESS, buf, len);
+-			send_msg(MSG_SUCCESS, buf, len);
 -		}
 -		if (preserve_hard_links)
 -			flist_ndx_push(&hlink_list, IVAL(buf,0));
@@ -518,19 +506,7 @@ After applying this patch, run these commands for a successful build:
  	case MSG_INFO:
  	case MSG_ERROR:
  	case MSG_LOG:
-@@ -303,10 +250,7 @@ static void read_msg_fd(void)
- 			if (n >= sizeof buf)
- 				n = sizeof buf - 1;
- 			read_loop(fd, buf, n);
--			if (am_generator && am_server && defer_forwarding_messages)
--				msg_list_add(&msg2sndr, tag, buf, n);
--			else
--				rwrite((enum logcode)tag, buf, n);
-+			rwrite((enum logcode)tag, buf, n);
- 			len -= n;
- 		}
- 		break;
-@@ -341,70 +285,76 @@ void decrement_active_files(int ndx)
+@@ -332,75 +285,80 @@ void decrement_active_files(int ndx)
  	active_bytecnt -= the_file_list->files[ndx]->length;
  }
  
@@ -602,17 +578,21 @@ After applying this patch, run these commands for a successful build:
 +	no_flush--;
  }
  
- void send_msg(enum msgcode code, char *buf, int len)
+ int send_msg(enum msgcode code, char *buf, int len)
  {
 -	if (msg_fd_out < 0) {
-+	if (am_receiver())
-+		msg_list_add(code, buf, len);
-+	else
- 		io_multiplex_write(code, buf, len);
--		return;
--	}
++	if (!am_receiver()) {
+ 		if (!defer_forwarding_messages)
+ 			return io_multiplex_write(code, buf, len);
+ 		if (!io_multiplexing_out)
+ 			return 0;
+-		msg_list_add(&msg2sndr, code, buf, len);
+-		return 1;
+ 	}
 -	msg_list_add(&msg2genr, code, buf, len);
 -	msg2genr_flush(NORMAL_FLUSH);
++	msg_list_add(code, buf, len);
+ 	return 1;
  }
  
 -int get_redo_num(int itemizing, enum logcode code)
@@ -651,7 +631,7 @@ After applying this patch, run these commands for a successful build:
  	return flist_ndx_pop(&hlink_list);
  }
  
-@@ -484,11 +434,6 @@ static int read_timeout(int fd, char *bu
+@@ -480,11 +438,6 @@ static int read_timeout(int fd, char *bu
  		FD_ZERO(&r_fds);
  		FD_ZERO(&w_fds);
  		FD_SET(fd, &r_fds);
@@ -663,7 +643,7 @@ After applying this patch, run these commands for a successful build:
  		if (io_filesfrom_f_out >= 0) {
  			int new_fd;
  			if (io_filesfrom_buflen == 0) {
-@@ -521,9 +466,6 @@ static int read_timeout(int fd, char *bu
+@@ -517,9 +470,6 @@ static int read_timeout(int fd, char *bu
  			continue;
  		}
  
@@ -673,7 +653,7 @@ After applying this patch, run these commands for a successful build:
  		if (io_filesfrom_f_out >= 0) {
  			if (io_filesfrom_buflen) {
  				if (FD_ISSET(io_filesfrom_f_out, &w_fds)) {
-@@ -845,6 +787,8 @@ static void readfd(int fd, char *buffer,
+@@ -847,6 +797,8 @@ static void readfd(int fd, char *buffer,
  	}
  
  	if (fd == write_batch_monitor_in) {
@@ -682,7 +662,7 @@ After applying this patch, run these commands for a successful build:
  		if ((size_t)write(batch_fd, buffer, total) != total)
  			exit_cleanup(RERR_FILEIO);
  	}
-@@ -1106,7 +1050,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1115,7 +1067,6 @@ static void writefd_unbuffered(int fd,ch
  			 * to grab any messages they sent before they died. */
  			while (fd == sock_f_out && io_multiplexing_in) {
  				set_io_timeout(30);
@@ -690,7 +670,7 @@ After applying this patch, run these commands for a successful build:
  				readfd_unbuffered(sock_f_in, io_filesfrom_buf,
  						  sizeof io_filesfrom_buf);
  			}
-@@ -1117,7 +1060,7 @@ static void writefd_unbuffered(int fd,ch
+@@ -1126,7 +1077,7 @@ static void writefd_unbuffered(int fd,ch
  		defer_forwarding_messages = 1;
  
  		if (fd == sock_f_out) {
@@ -699,7 +679,7 @@ After applying this patch, run these commands for a successful build:
  				last_io_out = time(NULL);
  			sleep_for_bwlimit(cnt);
  		}
-@@ -1127,23 +1070,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1136,23 +1087,6 @@ static void writefd_unbuffered(int fd,ch
  	no_flush--;
  }
  
@@ -723,7 +703,7 @@ After applying this patch, run these commands for a successful build:
  /**
   * Write an message to a multiplexed stream. If this fails then rsync
   * exits.
-@@ -1169,14 +1095,15 @@ static void mplex_write(enum msgcode cod
+@@ -1178,14 +1112,15 @@ static void mplex_write(enum msgcode cod
  		defer_forwarding_messages = 1;
  		writefd_unbuffered(sock_f_out, buf, len);
  		defer_forwarding_messages = 0;
@@ -733,7 +713,8 @@ After applying this patch, run these commands for a successful build:
  	}
  }
  
- void io_flush(int flush_it_all)
+-void io_flush(int flush_it_all)
++void io_flush(UNUSED(int flush_it_all))
  {
 -	msg2genr_flush(flush_it_all);
 -	msg2sndr_flush();
@@ -742,7 +723,7 @@ After applying this patch, run these commands for a successful build:
  
  	if (!iobuf_out_cnt || no_flush)
  		return;
-@@ -1190,11 +1117,6 @@ void io_flush(int flush_it_all)
+@@ -1199,11 +1134,6 @@ void io_flush(int flush_it_all)
  
  static void writefd(int fd,char *buf,size_t len)
  {
@@ -754,7 +735,7 @@ After applying this patch, run these commands for a successful build:
  	if (fd == sock_f_out)
  		stats.total_written += len;
  
-@@ -1400,9 +1322,3 @@ void start_write_batch(int fd)
+@@ -1409,9 +1339,3 @@ void start_write_batch(int fd)
  	else
  		write_batch_monitor_in = fd;
  }
@@ -774,7 +755,7 @@ After applying this patch, run these commands for a successful build:
  extern int allow_8bit_chars;
  extern int protocol_version;
  extern int preserve_times;
-@@ -71,7 +70,6 @@ struct {
+@@ -75,7 +74,6 @@ struct {
  	{ RERR_IPC        , "error in IPC code" },
  	{ RERR_CRASHED    , "sibling process crashed" },
  	{ RERR_TERMINATED , "sibling process terminated abnormally" },
@@ -782,9 +763,9 @@ After applying this patch, run these commands for a successful build:
  	{ RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
  	{ RERR_WAITCHILD  , "waitpid() failed" },
  	{ RERR_MALLOC     , "error allocating core memory buffers" },
-@@ -227,8 +225,8 @@ void rwrite(enum logcode code, char *buf
- 	if (quiet && code == FINFO)
- 		return;
+@@ -241,8 +239,8 @@ void rwrite(enum logcode code, char *buf
+ 	if (len < 0)
+ 		exit_cleanup(RERR_MESSAGEIO);
  
 -	if (am_server && msg_fd_out >= 0) {
 -		/* Pass the message to our sibling. */
@@ -802,8 +783,8 @@ After applying this patch, run these commands for a successful build:
 -extern int am_generator;
  extern int am_daemon;
  extern int blocking_io;
- extern int remove_sent_files;
-@@ -87,9 +86,20 @@ struct pid_status {
+ extern int remove_source_files;
+@@ -96,9 +95,20 @@ struct pid_status {
  
  static time_t starttime, endtime;
  static int64 total_read, total_written;
@@ -824,7 +805,7 @@ After applying this patch, run these commands for a successful build:
  /* Works like waitpid(), but if we already harvested the child pid in our
   * remember_children(), we succeed instead of returning an error. */
  pid_t wait_process(pid_t pid, int *status_ptr, int flags)
-@@ -166,7 +176,7 @@ static void handle_stats(int f)
+@@ -175,7 +185,7 @@ static void handle_stats(int f)
  		show_flist_stats();
  	}
  
@@ -833,7 +814,7 @@ After applying this patch, run these commands for a successful build:
  		return;
  
  	if (am_daemon) {
-@@ -630,12 +640,30 @@ static void do_server_sender(int f_in, i
+@@ -683,12 +693,30 @@ static void do_server_sender(int f_in, i
  	exit_cleanup(0);
  }
  
@@ -867,7 +848,7 @@ After applying this patch, run these commands for a successful build:
  
  	/* The receiving side mustn't obey this, or an existing symlink that
  	 * points to an identical file won't be replaced by the referent. */
-@@ -644,70 +672,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -697,70 +725,16 @@ static int do_recv(int f_in,int f_out,st
  	if (preserve_hard_links)
  		init_hard_links();
  
@@ -943,7 +924,7 @@ After applying this patch, run these commands for a successful build:
  	generate_files(f_out, flist, local_name);
  
  	handle_stats(-1);
-@@ -718,10 +692,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -771,10 +745,13 @@ static int do_recv(int f_in,int f_out,st
  	}
  	io_flush(FULL_FLUSH);
  
@@ -961,7 +942,7 @@ After applying this patch, run these commands for a successful build:
  }
  
  
-@@ -1091,22 +1068,6 @@ static int start_client(int argc, char *
+@@ -1176,22 +1153,6 @@ static int start_client(int argc, char *
  	return ret;
  }
  
@@ -984,7 +965,7 @@ After applying this patch, run these commands for a successful build:
  RETSIGTYPE remember_children(UNUSED(int val))
  {
  #ifdef WNOHANG
-@@ -1198,8 +1159,6 @@ int main(int argc,char *argv[])
+@@ -1283,8 +1244,6 @@ int main(int argc,char *argv[])
  # endif
  	sigact.sa_flags = SA_NOCLDSTOP;
  #endif
@@ -1049,7 +1030,7 @@ After applying this patch, run these commands for a successful build:
  int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
-@@ -1300,6 +1300,7 @@ int parse_arguments(int *argc, const cha
+@@ -1302,6 +1302,7 @@ int parse_arguments(int *argc, const cha
  
  	if (do_progress && !verbose && !log_before_transfer && !am_server)
  		verbose = 1;
@@ -1059,7 +1040,7 @@ After applying this patch, run these commands for a successful build:
  		do_xfers = 0;
 --- old/pipe.c
 +++ new/pipe.c
-@@ -58,7 +58,7 @@ pid_t piped_child(char **command, int *f
+@@ -59,7 +59,7 @@ pid_t piped_child(char **command, int *f
  		exit_cleanup(RERR_IPC);
  	}
  
@@ -1068,7 +1049,7 @@ After applying this patch, run these commands for a successful build:
  	if (pid == -1) {
  		rsyserr(FERROR, errno, "fork");
  		exit_cleanup(RERR_IPC);
-@@ -122,7 +122,7 @@ pid_t local_child(int argc, char **argv,
+@@ -123,7 +123,7 @@ pid_t local_child(int argc, char **argv,
  		exit_cleanup(RERR_IPC);
  	}
  
@@ -1079,16 +1060,16 @@ After applying this patch, run these commands for a successful build:
  		exit_cleanup(RERR_IPC);
 --- old/receiver.c
 +++ new/receiver.c
-@@ -26,7 +26,7 @@ extern int verbose;
+@@ -25,7 +25,7 @@
+ extern int verbose;
  extern int do_xfers;
- extern int am_daemon;
  extern int am_server;
 -extern int do_progress;
 +extern int recv_progress;
  extern int log_before_transfer;
- extern int log_format_has_i;
- extern int daemon_log_format_has_i;
-@@ -155,7 +155,7 @@ static int receive_data(int f_in, char *
+ extern int stdout_format_has_i;
+ extern int logfile_format_has_i;
+@@ -157,7 +157,7 @@ static int receive_data(int f_in, char *
  		if (sum.remainder)
  			sum.flength -= sum.blength - sum.remainder;
  		for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
@@ -1097,7 +1078,7 @@ After applying this patch, run these commands for a successful build:
  				show_progress(offset, total_size);
  			sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
  				   CHUNK_SIZE);
-@@ -163,7 +163,7 @@ static int receive_data(int f_in, char *
+@@ -165,7 +165,7 @@ static int receive_data(int f_in, char *
  		}
  		if (offset < sum.flength) {
  			int32 len = sum.flength - offset;
@@ -1106,7 +1087,7 @@ After applying this patch, run these commands for a successful build:
  				show_progress(offset, total_size);
  			sum_update(map_ptr(mapbuf, offset, len), len);
  			offset = sum.flength;
-@@ -176,7 +176,7 @@ static int receive_data(int f_in, char *
+@@ -178,7 +178,7 @@ static int receive_data(int f_in, char *
  	}
  
  	while ((i = recv_token(f_in, &data)) != 0) {
@@ -1115,7 +1096,7 @@ After applying this patch, run these commands for a successful build:
  			show_progress(offset, total_size);
  
  		if (i > 0) {
-@@ -244,7 +244,7 @@ static int receive_data(int f_in, char *
+@@ -248,7 +248,7 @@ static int receive_data(int f_in, char *
  		ftruncate(fd, offset);
  #endif
  
@@ -1124,14 +1105,14 @@ After applying this patch, run these commands for a successful build:
  		end_progress(total_size);
  
  	if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-@@ -295,12 +295,12 @@ static void handle_delayed_updates(struc
+@@ -299,12 +299,12 @@ static void handle_delayed_updates(struc
  					"rename failed for %s (from %s)",
  					full_fname(fname), partialptr);
  			} else {
--				if (remove_sent_files
+-				if (remove_source_files
 -				    || (preserve_hard_links
 -				     && file->link_u.links)) {
-+				if (remove_sent_files) {
++				if (remove_source_files) {
  					SIVAL(numbuf, 0, i);
  					send_msg(MSG_SUCCESS,numbuf,4);
  				}
@@ -1140,7 +1121,7 @@ After applying this patch, run these commands for a successful build:
  				handle_partial_dir(partialptr, PDIR_DELETE);
  			}
  		}
-@@ -351,11 +351,6 @@ int recv_files(int f_in, struct file_lis
+@@ -355,11 +355,6 @@ int recv_files(int f_in, struct file_lis
  	if (verbose > 2)
  		rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
  
@@ -1152,7 +1133,7 @@ After applying this patch, run these commands for a successful build:
  	if (delay_updates)
  		delayed_bits = bitbag_create(flist->count);
  
-@@ -376,7 +371,7 @@ int recv_files(int f_in, struct file_lis
+@@ -382,7 +377,7 @@ int recv_files(int f_in, struct file_lis
  				rprintf(FINFO, "recv_files phase=%d\n", phase);
  			if (phase == 2 && delay_updates)
  				handle_delayed_updates(flist, local_name);
@@ -1161,22 +1142,22 @@ After applying this patch, run these commands for a successful build:
  			if (keep_partial && !partial_dir)
  				make_backups = 0; /* prevents double backup */
  			if (append_mode) {
-@@ -598,7 +593,7 @@ int recv_files(int f_in, struct file_lis
+@@ -607,7 +602,7 @@ int recv_files(int f_in, struct file_lis
  		/* log the transfer */
  		if (log_before_transfer)
- 			log_item(file, &initial_stats, iflags, NULL);
+ 			log_item(FCLIENT, file, &initial_stats, iflags, NULL);
 -		else if (!am_server && verbose && do_progress)
 +		else if (!am_server && verbose && recv_progress)
  			rprintf(FINFO, "%s\n", fname);
  
  		/* recv file data */
-@@ -641,11 +636,13 @@ int recv_files(int f_in, struct file_lis
+@@ -654,11 +649,13 @@ int recv_files(int f_in, struct file_lis
  		cleanup_disable();
  
  		if (recv_ok > 0) {
--			if (remove_sent_files
+-			if (remove_source_files
 -			    || (preserve_hard_links && file->link_u.links)) {
-+			if (remove_sent_files) {
++			if (remove_source_files) {
 +				decrement_active_files(i);
  				SIVAL(numbuf, 0, i);
  				send_msg(MSG_SUCCESS, numbuf, 4);
@@ -1186,7 +1167,7 @@ After applying this patch, run these commands for a successful build:
  		} else if (!recv_ok) {
  			int msgtype = phase || read_batch ? FERROR : FINFO;
  			if (msgtype == FERROR || verbose) {
-@@ -668,8 +665,8 @@ int recv_files(int f_in, struct file_lis
+@@ -681,8 +678,8 @@ int recv_files(int f_in, struct file_lis
  					errstr, fname, keptstr, redostr);
  			}
  			if (!phase) {
@@ -1199,7 +1180,7 @@ After applying this patch, run these commands for a successful build:
  	}
 --- old/rsync.c
 +++ new/rsync.c
-@@ -40,7 +40,6 @@ extern int omit_dir_times;
+@@ -39,7 +39,6 @@ extern int omit_dir_times;
  extern int am_root;
  extern int am_server;
  extern int am_sender;
@@ -1207,7 +1188,7 @@ After applying this patch, run these commands for a successful build:
  extern int am_starting_up;
  extern int allow_8bit_chars;
  extern int preserve_uid;
-@@ -303,5 +302,5 @@ const char *who_am_i(void)
+@@ -305,5 +304,5 @@ const char *who_am_i(void)
  {
  	if (am_starting_up)
  		return am_server ? "server" : "client";
@@ -1216,7 +1197,7 @@ After applying this patch, run these commands for a successful build:
  }
 --- old/rsync.h
 +++ new/rsync.h
-@@ -168,10 +168,8 @@ enum msgcode {
+@@ -169,10 +169,8 @@ enum msgcode {
  	MSG_DATA=0,	/* raw data on the multiplexed stream */
  	MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
  	MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
@@ -1227,7 +1208,7 @@ After applying this patch, run these commands for a successful build:
  };
  
  #include "errcode.h"
-@@ -322,6 +320,7 @@ enum msgcode {
+@@ -329,6 +327,7 @@ enum msgcode {
  #endif
  
  #include <assert.h>
@@ -1237,7 +1218,7 @@ After applying this patch, run these commands for a successful build:
  
 --- old/util.c
 +++ new/util.c
-@@ -410,49 +410,6 @@ int robust_rename(char *from, char *to, 
+@@ -415,49 +415,6 @@ int robust_rename(char *from, char *to, 
  	return -1;
  }