X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/554e0a8dd0079cd8d28dbb30ffd90010f2f97933..f9f6184f38903386033626ee5e715fcf990361e6:/main.c

diff --git a/main.c b/main.c
index 6ea93218..a5467782 100644
--- a/main.c
+++ b/main.c
@@ -280,10 +280,20 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	int recv_pipe[2];
 	int error_pipe[2];
 	extern int preserve_hard_links;
+	extern int delete_after;
+	extern int recurse;
+	extern int delete_mode;
 
 	if (preserve_hard_links)
 		init_hard_links(flist);
 
+	if (!delete_after) {
+		/* I moved this here from recv_files() to prevent a race condition */
+		if (recurse && delete_mode && !local_name && flist->count>0) {
+			delete_files(flist);
+		}
+	}
+
 	if (pipe(recv_pipe) < 0) {
 		rprintf(FERROR,"pipe failed in do_recv\n");
 		exit_cleanup(RERR_SOCKETIO);