aboutsummaryrefslogtreecommitdiffstats
path: root/sender.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-10-16 22:39:21 -0700
committerWayne Davison <wayned@samba.org>2009-10-17 00:03:32 -0700
commit20caffd2b361bcad51692998411e4cc566c04b40 (patch)
treee54933f78ef7d0441c3cb75f945b9d79e4ed7207 /sender.c
parentdf6350a8b83a9e669f5e5c822bf2dc929526a128 (diff)
downloadandroid_external_rsync-20caffd2b361bcad51692998411e4cc566c04b40.tar.gz
android_external_rsync-20caffd2b361bcad51692998411e4cc566c04b40.tar.bz2
android_external_rsync-20caffd2b361bcad51692998411e4cc566c04b40.zip
A major overhaul of I/O routines, creating perform_io().
Files-from data is now sent as multiplexed I/O so that it can mingle with any messages (such as debug output). Requires protocol 31. Protocol 31 no longer disables output verbosity in a couple instances that used to cause protocol issues. Got rid of MSG_* messages that have implied raw data that follows after them. We instead send a negative index value as a part of the raw data stream, which is guaranteed to be output together with the following data. This only affects the (in-progress) protocol 31 and the (self- contained) communication stream from the receiver to the generator. Added --debug=IO and improved --debug=FLIST. Some --debug=IO output requires --msgs2stderr to be used to see it (i.e. sending a message about sending a message would send another message, ad infinitum).
Diffstat (limited to 'sender.c')
-rw-r--r--sender.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sender.c b/sender.c
index f36c41dc..621cf20f 100644
--- a/sender.c
+++ b/sender.c
@@ -188,7 +188,7 @@ void send_files(int f_in, int f_out)
}
/* This call also sets cur_flist. */
- ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ ndx = read_ndx_and_attrs(f_in, f_out, &iflags, &fnamecmp_type,
xname, &xlen);
extra_flist_sending_enabled = False;