X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/566fce323799d3ff6111e0cc06a2381f5345f7fc..4e834af1400713ad564f7d6fc35912921a262467:/receiver.c

diff --git a/receiver.c b/receiver.c
index f39a9e56..6595c496 100644
--- a/receiver.c
+++ b/receiver.c
@@ -60,8 +60,10 @@ static void delete_one(char *fn, int is_dir)
 		}
 	} else {
 		if (do_rmdir(fn) != 0) {
-			if (errno == ENOTDIR && keep_dirlinks)
-				return delete_one(fn, 0);
+			if (errno == ENOTDIR && keep_dirlinks) {
+				delete_one(fn, 0);
+				return;
+			}
 			if (errno != ENOTEMPTY && errno != EEXIST) {
 				rsyserr(FERROR, errno,
 					"delete_one: rmdir %s failed",
@@ -301,11 +303,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 	char *fnamecmp;
 	char fnamecmpbuf[MAXPATHLEN];
 	struct map_struct *mapbuf;
-	int i;
 	struct file_struct *file;
-	int phase=0;
-	int recv_ok;
 	struct stats initial_stats;
+	int save_make_backups = make_backups;
+	int i, recv_ok, phase = 0;
 
 	if (verbose > 2) {
 		rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
@@ -321,15 +322,16 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 
 		i = read_int(f_in);
 		if (i == -1) {
-			if (phase == 0) {
-				phase++;
-				csum_length = SUM_LENGTH;
-				if (verbose > 2)
-					rprintf(FINFO,"recv_files phase=%d\n",phase);
-				send_msg(MSG_DONE, "", 0);
-				continue;
-			}
-			break;
+			if (phase)
+				break;
+			phase = 1;
+			csum_length = SUM_LENGTH;
+			if (verbose > 2)
+				rprintf(FINFO, "recv_files phase=%d\n", phase);
+			send_msg(MSG_DONE, "", 0);
+			if (keep_partial)
+				make_backups = 0; /* prevents double backup */
+			continue;
 		}
 
 		if (i < 0 || i >= flist->count) {
@@ -493,6 +495,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name)
 			}
 		}
 	}
+	make_backups = save_make_backups;
 
 	if (delete_after && recurse && delete_mode && !local_name
 	    && flist->count > 0)