extern int recurse;
extern int use_qsort;
extern int allow_inc_recurse;
-extern int relative_paths;
extern int append_mode;
extern int fuzzy_basis;
extern int read_batch;
-extern int implied_dirs;
extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
extern int prune_empty_dirs;
extern int protocol_version;
+extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_acls;
extern int preserve_xattrs;
-extern int preserve_hard_links;
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;
+#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 filesfrom_convert = 0;
+#endif
/* The server makes sure that if either side only supports a pre-release
* version of a protocol, that both sides must speak a compatible version
{
char *dot;
int their_protocol, their_sub;
+#if SUBPROTOCOL_VERSION != 0
int our_sub = protocol_version < PROTOCOL_VERSION ? 0 : SUBPROTOCOL_VERSION;
+#else
+ int our_sub = 0;
+#endif
if (!shell_cmd || !(dot = strchr(shell_cmd, '.'))
|| !(their_protocol = atoi(shell_cmd))
|| !(their_sub = atoi(dot+1))) {
+#if SUBPROTOCOL_VERSION != 0
if (our_sub)
protocol_version--;
+#endif
return;
}
}
if (their_protocol > protocol_version)
- their_sub = 0; /* 0 == final version */
+ their_sub = 0; /* 0 == final version of older protocol */
if (their_sub != our_sub)
protocol_version--;
}
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)
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
- if (recurse && allow_inc_recurse && !preserve_hard_links
+ if (recurse && allow_inc_recurse
&& !delete_before && !delete_after && !delay_updates
- && (!relative_paths || implied_dirs) && !use_qsort
- && !prune_empty_dirs)
+ && !use_qsort && !prune_empty_dirs)
inc_recurse = 1;
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)
parse_rule(&filter_list, partial_dir, flags, 0);
}
+
+#ifdef ICONV_OPTION
+ if (protect_args && files_from) {
+ if (am_sender)
+ filesfrom_convert = filesfrom_host && ic_send != (iconv_t)-1;
+ else
+ filesfrom_convert = !filesfrom_host && ic_recv != (iconv_t)-1;
+ }
+#endif
+
if (am_server) {
if (!checksum_seed)
checksum_seed = time(NULL);