X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9970bed4d99f70dab4676ae92dab104a70aae56c..b769ad6a3e7ef871ea0aabd5b033018ba6cdbb90:/compat.c

diff --git a/compat.c b/compat.c
index b0574242..c9581357 100644
--- a/compat.c
+++ b/compat.c
@@ -54,16 +54,15 @@ extern char *dest_option;
 extern char *files_from;
 extern char *filesfrom_host;
 extern struct filter_list_struct filter_list;
+extern int need_unsorted_flist;
 #ifdef ICONV_OPTION
-extern char *iconv_opt;
 extern iconv_t ic_send, ic_recv;
 #endif
 
 /* These index values are for the file-list's extra-attribute array. */
-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
-#ifdef ICONV_OPTION
-int ic_ndx;
+int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
 
+#ifdef ICONV_OPTION
 int filesfrom_convert = 0;
 #endif
 
@@ -104,8 +103,11 @@ static void check_sub_protocol(void)
 
 void set_allow_inc_recurse(void)
 {
-	if (!recurse || delete_before || delete_after || use_qsort
-	 || (!am_sender && (delay_updates || prune_empty_dirs)))
+	if (!recurse || use_qsort)
+		allow_inc_recurse = 0;
+	else if (!am_sender
+	 && (delete_before || delete_after
+	  || delay_updates || prune_empty_dirs))
 		allow_inc_recurse = 0;
 	else if (am_server && !local_server
 	 && (!shell_cmd || strchr(shell_cmd, 'i') == NULL))
@@ -229,25 +231,24 @@ void setup_protocol(int f_out,int f_in)
 			exit_cleanup(RERR_PROTOCOL);
 		}
 	} else if (protocol_version >= 30) {
+		/* The inc_recurse var MUST be set to 0 or 1. */
 		if (am_server) {
-			inc_recurse = allow_inc_recurse;
+			inc_recurse = allow_inc_recurse ? 1 : 0;
 			write_byte(f_out, inc_recurse);
 		} else
-			inc_recurse = read_byte(f_in);
+			inc_recurse = read_byte(f_in) ? 1 : 0;
 		if (inc_recurse && !allow_inc_recurse) {
 			/* This should only be able to happen in a batch. */
 			fprintf(stderr,
 			    "Incompatible options specified for inc-recursive %s.\n",
-			    read_batch ? "batch file" : "protocol");
+			    read_batch ? "batch file" : "connection");
 			exit_cleanup(RERR_SYNTAX);
 		}
 		need_messages_from_generator = 1;
 	}
 
-#ifdef ICONV_OPTION
-	if (iconv_opt && (!am_sender || inc_recurse))
-		ic_ndx = ++file_extra_cnt;
-#endif
+	if (need_unsorted_flist && (!am_sender || inc_recurse))
+		unsort_ndx = ++file_extra_cnt;
 
 	if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
 		int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;