X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5688c74d25002c82091b0b558b3bbea2c2b45614..3932c423732eefb0ba9035c6467e757e8a484728:/compat.c

diff --git a/compat.c b/compat.c
index eaa7c55a..7bbbb3b5 100644
--- a/compat.c
+++ b/compat.c
@@ -108,7 +108,7 @@ static void check_sub_protocol(void)
 void setup_protocol(int f_out,int f_in)
 {
 	if (am_sender)
-		file_extra_cnt += PTR_EXTRA_LEN;
+		file_extra_cnt += PTR_EXTRA_CNT;
 	else
 		file_extra_cnt++;
 	if (preserve_uid)
@@ -119,10 +119,6 @@ void setup_protocol(int f_out,int f_in)
 		acls_ndx = ++file_extra_cnt;
 	if (preserve_xattrs)
 		xattrs_ndx = ++file_extra_cnt;
-#ifdef ICONV_OPTION
-	if (iconv_opt && (!am_sender || inc_recurse))
-		ic_ndx = ++file_extra_cnt;
-#endif
 
 	if (remote_protocol == 0) {
 		if (am_server && !local_server)
@@ -230,6 +226,11 @@ void setup_protocol(int f_out,int f_in)
 		need_messages_from_generator = 1;
 	}
 
+#ifdef ICONV_OPTION
+	if (iconv_opt && (!am_sender || inc_recurse))
+		ic_ndx = ++file_extra_cnt;
+#endif
+
 	if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
 		int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
 		if (!am_sender || protocol_version >= 30)