Commit cd6becec authored by Wayne Davison's avatar Wayne Davison

If --delay-updates is specified with --remove-sent-files, delay

the MSG_SUCCESS messages until we actually move the files into
place at the end.
parent 88b93c61
...@@ -597,7 +597,9 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, ...@@ -597,7 +597,9 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
cleanup_disable(); cleanup_disable();
if (recv_ok) { if (recv_ok) {
if (remove_sent_files) { if (delay_updates && delayed_bits[i/8] & (1 << (i % 8)))
;
else if (remove_sent_files) {
SIVAL(numbuf, 0, i); SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4); send_msg(MSG_SUCCESS, numbuf, 4);
} }
...@@ -654,6 +656,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, ...@@ -654,6 +656,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
full_fname(fname), full_fname(fname),
safe_fname(partialptr)); safe_fname(partialptr));
} else { } else {
if (remove_sent_files) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}
handle_partial_dir(partialptr, handle_partial_dir(partialptr,
PDIR_DELETE); PDIR_DELETE);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment