X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..085e2fd588d27cedc37edaee0575cfea7bb2f2d8:/generator.c

diff --git a/generator.c b/generator.c
index 4620859d..f0a752bd 100644
--- a/generator.c
+++ b/generator.c
@@ -1143,14 +1143,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
-	/* If we're not preserving permissions, change the file-list's
-	 * mode based on the local permissions and some heuristics. */
-	if (!preserve_perms) {
-		int exists = statret == 0
-			  && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
-		file->mode = dest_mode(file->mode, st.st_mode, exists);
-	}
-
 	if (S_ISDIR(file->mode)) {
 		/* The file to be received is a directory, so we need
 		 * to prepare appropriately.  If there is already a
@@ -1173,6 +1165,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				statret = -1;
 			new_root_dir = 0;
 		}
+		if (!preserve_perms) { /* See comment in non-dir code below. */
+			file->mode = dest_mode(file->mode, st.st_mode,
+					       statret == 0);
+		}
 		if (statret != 0 && basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
 					      itemizing, code);
@@ -1218,6 +1214,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
+	/* If we're not preserving permissions, change the file-list's
+	 * mode based on the local permissions and some heuristics. */
+	if (!preserve_perms) {
+		int exists = statret == 0 && !S_ISDIR(st.st_mode);
+		file->mode = dest_mode(file->mode, st.st_mode, exists);
+	}
+
 #ifdef SUPPORT_HARD_LINKS
 	if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
 	 && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
@@ -1661,7 +1664,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 		if (allowed_lull && !(++j % lull_mod))
 			maybe_send_keepalive();
 		else if (!(j % 200))
-			maybe_flush_socket();
+			maybe_flush_socket(0);
 	}
 }
 
@@ -1725,8 +1728,10 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
 		if (first_flist->in_progress || first_flist->to_redo)
 			break;
 
-		if (!read_batch)
+		if (!read_batch) {
 			write_ndx(sock_f_out, NDX_DONE);
+			maybe_flush_socket(1);
+		}
 
 		if (delete_during == 2 || !dir_tweaking) {
 			/* Skip directory touch-up. */
@@ -1847,7 +1852,7 @@ void generate_files(int f_out, const char *local_name)
 			if (allowed_lull && !(i % lull_mod))
 				maybe_send_keepalive();
 			else if (!(i % 200))
-				maybe_flush_socket();
+				maybe_flush_socket(0);
 		}
 
 		if (!inc_recurse) {