X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/552a218468739a50790a6b91c6a5c5c26c03bff6..ebd33e0cea4d1f54702167ce014823c72f2054bc:/generator.c

diff --git a/generator.c b/generator.c
index 98313e36..b991500a 100644
--- a/generator.c
+++ b/generator.c
@@ -291,6 +291,8 @@ static void do_delete_pass(struct file_list *flist)
 
 		delete_in_dir(flist, fbuf, file);
 	}
+	if (do_progress && !am_server)
+		rprintf(FINFO, "                    \r");
 }
 
 static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
@@ -1203,6 +1205,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
 		if (allowed_lull && !(i % lull_mod))
 			maybe_send_keepalive();
+		else if (!(i % 50))
+			maybe_flush_socket();
 	}
 	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
 	if (delete_during)
@@ -1276,8 +1280,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 				continue;
 			recv_generator(f_name(file), file, i, itemizing,
 				       maybe_PERMS_REPORT, code, -1);
-			if (allowed_lull && !(j++ % lull_mod))
+			if (allowed_lull && !(++j % lull_mod))
 				maybe_send_keepalive();
+			else if (!(j % 50))
+				maybe_flush_socket();
 		}
 	}
 	recv_generator(NULL, NULL, 0, 0, 0, code, -1);