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
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;