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
- Changed the file-list allocation to alloc all the memory we need
[rsync/rsync.git]
/
batch.c
diff --git
a/batch.c
b/batch.c
index
456bbb9
..
dc96c1d
100644
(file)
--- a/
batch.c
+++ b/
batch.c
@@
-45,8
+45,10
@@
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);
- for (i = 0; i < flist_count; i++)
- send_file_entry(files[i], f, files[i]->flags & LIVE_FLAGS);
+ for (i = 0; i < flist_count; i++) {
+ send_file_entry(files[i], f, files[i]->flags & FLAG_TOP_DIR ?
+ XMIT_TOP_DIR : 0);
+ }
send_file_entry(NULL, f, 0);
protocol_version = save_pv;
send_file_entry(NULL, f, 0);
protocol_version = save_pv;
@@
-149,7
+151,7
@@
struct file_list *create_flist_from_batch(void)
out_of_memory("create_flist_from_batch");
for (i = 0; (flags = read_byte(f)) != 0; i++) {
out_of_memory("create_flist_from_batch");
for (i = 0; (flags = read_byte(f)) != 0; i++) {
- if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+ if (protocol_version >= 28 && (flags &
XMIT_
EXTENDED_FLAGS))
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);
}