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
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))
/* 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;