X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a72ba0cfac4128ed0627b7b534da6f6df9c69c01..411c04f06fa26642c6bfc29fd70128e3f870a455:/main.c

diff --git a/main.c b/main.c
index 410ce29e..d30350d1 100644
--- a/main.c
+++ b/main.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -669,7 +669,7 @@ static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
 	}
 
 	flist = send_file_list(f_out,argc,argv);
-	if (!flist || flist->count == 0)
+	if (!flist || flist->used == 0)
 		exit_cleanup(0);
 
 	io_start_buffering_in(f_in);
@@ -727,7 +727,7 @@ 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);
+		send_msg(MSG_DONE, "", 1, 0);
 		write_varlong(error_pipe[1], stats.total_read, 3);
 		io_flush(FULL_FLUSH);
 
@@ -900,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
 
@@ -937,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
 
@@ -1013,7 +1013,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 	if (inc_recurse && file_total == 1)
 		recv_additional_file_list(f_in);
 
-	if (flist && flist->count > 0) {
+	if (flist && flist->used > 0) {
 		local_name = get_local_name(flist, argv[0]);
 
 		fix_basis_dirs();