summaryrefslogtreecommitdiff
path: root/sender.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-03-15 17:30:56 +0000
committerWayne Davison <wayned@samba.org>2005-03-15 17:30:56 +0000
commit8b48bf11549e2cc63c9380ac32885338b10f3c88 (patch)
tree9895ec95129735ee9b4aeab343fb084c5b9db48b /sender.c
parent42be53201fa2027f3d896a0611c9a8759c98c8d9 (diff)
downloadrsync-8b48bf11549e2cc63c9380ac32885338b10f3c88.tar.gz
Tweaked the end-of-phase code.
Diffstat (limited to 'sender.c')
-rw-r--r--sender.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/sender.c b/sender.c
index 74990ec7..be9e56fd 100644
--- a/sender.c
+++ b/sender.c
@@ -222,18 +222,17 @@ void send_files(struct file_list *flist, int f_out, int f_in)
i = read_int(f_in);
if (i == -1) {
- if (phase == 0) {
- phase++;
- csum_length = SUM_LENGTH;
- write_int(f_out, -1);
- if (verbose > 2)
- rprintf(FINFO, "send_files phase=%d\n", phase);
- /* For inplace: redo phase turns off the backup
- * flag so that we do a regular inplace send. */
- make_backups = 0;
- continue;
- }
- break;
+ if (phase)
+ break;
+ phase = 1;
+ csum_length = SUM_LENGTH;
+ if (verbose > 2)
+ rprintf(FINFO, "send_files phase=%d\n", phase);
+ write_int(f_out, -1);
+ /* For inplace: redo phase turns off the backup
+ * flag so that we do a regular inplace send. */
+ make_backups = 0;
+ continue;
}
iflags = read_item_attrs(f_in, f_out, i, &fnamecmp_type,