*/
#include "rsync.h"
+#include "io.h"
#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
#include <locale.h>
#endif
if (am_server) {
if (am_sender) {
- write_longint(f, total_read);
- write_longint(f, total_written);
- write_longint(f, stats.total_size);
+ write_varlong30(f, total_read, 3);
+ write_varlong30(f, total_written, 3);
+ write_varlong30(f, stats.total_size, 3);
if (protocol_version >= 29) {
- write_longint(f, stats.flist_buildtime);
- write_longint(f, stats.flist_xfertime);
+ write_varlong30(f, stats.flist_buildtime, 3);
+ write_varlong30(f, stats.flist_xfertime, 3);
}
}
return;
else if (!am_sender) {
/* Read the first two in opposite order because the meaning of
* read/write swaps when switching from sender to receiver. */
- total_written = read_longint(f);
- total_read = read_longint(f);
- stats.total_size = read_longint(f);
+ total_written = read_varlong30(f, 3);
+ total_read = read_varlong30(f, 3);
+ stats.total_size = read_varlong30(f, 3);
if (protocol_version >= 29) {
- stats.flist_buildtime = read_longint(f);
- stats.flist_xfertime = read_longint(f);
+ stats.flist_buildtime = read_varlong30(f, 3);
+ stats.flist_xfertime = read_varlong30(f, 3);
}
} else if (write_batch) {
/* The --read-batch process is going to be a client
* receiver, so we need to give it the stats. */
- write_longint(batch_fd, total_read);
- write_longint(batch_fd, total_written);
- write_longint(batch_fd, stats.total_size);
+ write_varlong30(batch_fd, total_read, 3);
+ write_varlong30(batch_fd, total_written, 3);
+ write_varlong30(batch_fd, stats.total_size, 3);
if (protocol_version >= 29) {
- write_longint(batch_fd, stats.flist_buildtime);
- write_longint(batch_fd, stats.flist_xfertime);
+ write_varlong30(batch_fd, stats.flist_buildtime, 3);
+ write_varlong30(batch_fd, stats.flist_xfertime, 3);
}
}
}
}
/* This is only called by the sender. */
-static void read_final_goodbye(int f_in, int f_out)
+static void read_final_goodbye(int f_in)
{
int i, iflags, xlen;
uchar fnamecmp_type;
if (protocol_version < 29)
i = read_int(f_in);
else {
- i = read_ndx_and_attrs(f_in, f_out, &iflags,
- &fnamecmp_type, xname, &xlen);
+ i = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
+ xname, &xlen);
}
if (i != NDX_DONE) {
io_flush(FULL_FLUSH);
handle_stats(f_out);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out);
+ read_final_goodbye(f_in);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
handle_stats(f_in);
send_msg(MSG_DONE, "", 1);
- write_longint(error_pipe[1], stats.total_read);
+ write_varlong(error_pipe[1], stats.total_read, 3);
io_flush(FULL_FLUSH);
/* Handle any keep-alive packets from the post-processing work
kluge_around_eof = -1;
/* This should only get stopped via a USR2 signal. */
- read_ndx_and_attrs(f_in, -1, &iflags, &fnamecmp_type,
+ read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
xname, &xlen);
rprintf(FERROR, "Invalid packet at end of run [%s]\n",
io_flush(FULL_FLUSH);
handle_stats(-1);
if (protocol_version >= 24)
- read_final_goodbye(f_in, f_out);
+ read_final_goodbye(f_in);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);