extern int preserve_xattrs;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
-extern int delete_excluded;
-extern int make_backups;
extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
-extern char *backup_dir, *backup_suffix;
extern char *partial_dir;
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
protocol_version--;
}
+void set_allow_inc_recurse(void)
+{
+ 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))
+ allow_inc_recurse = 0;
+}
+
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)
if (preserve_xattrs)
xattrs_ndx = ++file_extra_cnt;
+ if (am_server)
+ set_allow_inc_recurse();
+
if (remote_protocol == 0) {
if (am_server && !local_server)
check_sub_protocol();
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- if (recurse && allow_inc_recurse
- && !delete_before && !delete_after && !delay_updates
- && !use_qsort && !prune_empty_dirs)
- inc_recurse = 1;
+ /* The inc_recurse var MUST be set to 0 or 1. */
+ if (am_server) {
+ inc_recurse = allow_inc_recurse ? 1 : 0;
+ write_byte(f_out, inc_recurse);
+ } else
+ 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" : "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;