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 max_delete;
+extern int implied_dirs;
extern int delay_updates;
extern int checksum_seed;
extern int basis_dir_cnt;
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;
{
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--;
}
}
if (protocol_version < 30) {
- if (max_delete == 0 && am_sender) {
- rprintf(FERROR,
- "--max-delete=0 requires protocol 30 or higher"
- " (negotiated %d).\n",
- protocol_version);
- exit_cleanup(RERR_PROTOCOL);
- }
+ if (append_mode == 1)
+ append_mode = 2;
if (preserve_acls && !local_server) {
rprintf(FERROR,
"--acls requires protocol 30 or higher"
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
- && !prune_empty_dirs && !use_qsort)
+ && (!relative_paths || implied_dirs) && !use_qsort
+ && !prune_empty_dirs)
inc_recurse = 1;
need_messages_from_generator = 1;
}