From b951e023ec1c81ec1ad4d6f6f3508bf3e19165e8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 24 Jan 2005 17:19:04 +0000 Subject: [PATCH] Moved the code that reads the extra byte for a modern inplace transfer up nearer the code that reads the index. --- sender.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sender.c b/sender.c index 741a8d24..10ea2fa9 100644 --- a/sender.c +++ b/sender.c @@ -138,6 +138,12 @@ void send_files(struct file_list *flist, int f_out, int f_in) exit_cleanup(RERR_PROTOCOL); } + if (inplace && protocol_version >= 29) { + uchar fnamecmp_type = read_byte(f_in); + updating_basis_file = fnamecmp_type == FNAMECMP_FNAME; + } else + updating_basis_file = inplace && !make_backups; + file = flist->files[i]; stats.current_file_index = i; @@ -152,11 +158,6 @@ void send_files(struct file_list *flist, int f_out, int f_in) } else offset = 0; fname2 = f_name_to(file, fname + offset); - if (inplace && protocol_version >= 29) { - uchar fnamecmp_type = read_byte(f_in); - updating_basis_file = fnamecmp_type == FNAMECMP_FNAME; - } else - updating_basis_file = inplace && !make_backups; if (verbose > 2) rprintf(FINFO, "send_files(%d, %s)\n", i, fname); -- 2.34.1