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
A slightly better reset mechanism for send_file_entry() and
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
3f344ad
..
4560a91
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-45,9
+45,8
@@
void write_batch_flist_info(int flist_count, struct file_struct **files)
write_int(f, protocol_version);
write_int(f, flist_count);
write_int(f, protocol_version);
write_int(f, flist_count);
- reset_file_entry_vars();
for (i = 0; i < flist_count; i++)
for (i = 0; i < flist_count; i++)
- send_file_entry(files[i], f, files[i]->flags &
FLAG_DELETE
);
+ send_file_entry(files[i], f, files[i]->flags &
LIVE_FLAGS
);
send_file_entry(NULL, f, 0);
protocol_version = save_pv;
send_file_entry(NULL, f, 0);
protocol_version = save_pv;
@@
-157,7
+156,7
@@
struct file_list *create_flist_from_batch(void)
flags |= read_byte(f) << 8;
receive_file_entry(&batch_flist->files[i], flags, f);
}
flags |= read_byte(f) << 8;
receive_file_entry(&batch_flist->files[i], flags, f);
}
- re
set_file_entry_vars();
+ re
ceive_file_entry(NULL, 0, 0); /* Signal that we're done. */
protocol_version = save_pv;
stats.total_read = save_read;
protocol_version = save_pv;
stats.total_read = save_read;