Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a hang in the inc_recurse batch-reading code.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
0627956
..
6b12720
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-1937,10
+1937,9
@@
void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
if (first_flist->in_progress || first_flist->to_redo)
break;
if (first_flist->in_progress || first_flist->to_redo)
break;
- if (!read_batch) {
- write_ndx(sock_f_out, NDX_DONE);
+ write_ndx(sock_f_out, NDX_DONE);
+ if (!read_batch)
maybe_flush_socket(1);
maybe_flush_socket(1);
- }
if (delete_during == 2 || !dir_tweaking) {
/* Skip directory touch-up. */
if (delete_during == 2 || !dir_tweaking) {
/* Skip directory touch-up. */
@@
-2086,9
+2085,6
@@
void generate_files(int f_out, const char *local_name)
}
} while ((cur_flist = cur_flist->next) != NULL);
}
} while ((cur_flist = cur_flist->next) != NULL);
- if (read_batch && inc_recurse)
- write_ndx(f_out, NDX_DONE);
-
if (delete_during)
delete_in_dir(NULL, NULL, &dev_zero);
phase++;
if (delete_during)
delete_in_dir(NULL, NULL, &dev_zero);
phase++;