We now look for the ITEM_USING_ALT_BASIS flag for an --inplace
authorWayne Davison <wayned@samba.org>
Tue, 22 Feb 2005 21:43:59 +0000 (21:43 +0000)
committerWayne Davison <wayned@samba.org>
Tue, 22 Feb 2005 21:43:59 +0000 (21:43 +0000)
transer that is using an alternate basis file (instead of reading
an extra byte after the flag word).

sender.c

index db42856..e771a9e 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -204,8 +204,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        iflags = ITEM_UPDATING | ITEM_MISSING_DATA;
 
                if (inplace && protocol_version >= 29) {
-                       uchar fnamecmp_type = read_byte(f_in);
-                       updating_basis_file = fnamecmp_type == FNAMECMP_FNAME;
+                       updating_basis_file = iflags & ITEM_USING_ALT_BASIS;
                } else
                        updating_basis_file = inplace && !make_backups;