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
- Moved file-deletion code into generator.c.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
db42856
..
b745f6f
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-167,6
+167,13
@@
void send_files(struct file_list *flist, int f_out, int f_in)
}
if (i < 0 || i >= flist->count) {
}
if (i < 0 || i >= flist->count) {
+ /* Handle the new keep-alive (no-op) packet. */
+ if (i == flist->count && protocol_version >= 29
+ && read_shortint(f_in) == ITEM_IS_NEW) {
+ write_int(f_out, i);
+ write_shortint(f_out, ITEM_IS_NEW);
+ continue;
+ }
rprintf(FERROR, "Invalid file index %d (count=%d)\n",
i, flist->count);
exit_cleanup(RERR_PROTOCOL);
rprintf(FERROR, "Invalid file index %d (count=%d)\n",
i, flist->count);
exit_cleanup(RERR_PROTOCOL);
@@
-204,8
+211,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) {
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;
} else
updating_basis_file = inplace && !make_backups;