X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ba2133d6add082b059728074febdac6c520a4351..79028af116752d192634f44e672f0b8b51ba7785:/main.c

diff --git a/main.c b/main.c
index c244ad66..5e2b03ed 100644
--- a/main.c
+++ b/main.c
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include "io.h"
 #if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -190,12 +191,12 @@ static void handle_stats(int f)
 
 	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;
@@ -208,22 +209,22 @@ static void handle_stats(int f)
 	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);
 		}
 	}
 }
@@ -608,7 +609,7 @@ static void fix_basis_dirs(void)
 }
 
 /* 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;
@@ -617,8 +618,8 @@ static void read_final_goodbye(int f_in, int f_out)
 	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) {
@@ -677,7 +678,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
 	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);
 }
@@ -726,8 +727,8 @@ static int do_recv(int f_in, int f_out, char *local_name)
 		io_flush(FULL_FLUSH);
 		handle_stats(f_in);
 
-		send_msg(MSG_DONE, "", 1);
-		write_longint(error_pipe[1], stats.total_read);
+		send_msg(MSG_DONE, "", 1, 0);
+		write_varlong(error_pipe[1], stats.total_read, 3);
 		io_flush(FULL_FLUSH);
 
 		/* Handle any keep-alive packets from the post-processing work
@@ -740,7 +741,7 @@ static int do_recv(int f_in, int f_out, char *local_name)
 			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",
@@ -899,7 +900,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
 	io_set_sock_fds(f_in, f_out);
 	setup_protocol(f_out, f_in);
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifdef ICONV_CONST
 	setup_iconv();
 #endif
 
@@ -936,7 +937,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 
 	io_set_sock_fds(f_in, f_out);
 	setup_protocol(f_out,f_in);
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#ifdef ICONV_CONST
 	setup_iconv();
 #endif
 
@@ -977,7 +978,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		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);