X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/79cd0c7fa4a89ac4c48345059ce65d2411cbf767..d108e04f38ac0b376b6ac2af46a430b9b6dc988d:/compat.c diff --git a/compat.c b/compat.c index ab7d07ba..aa32de8e 100644 --- a/compat.c +++ b/compat.c @@ -34,9 +34,9 @@ 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; @@ -47,7 +47,6 @@ 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; @@ -146,13 +145,8 @@ void setup_protocol(int f_out,int f_in) } 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" @@ -209,7 +203,7 @@ void setup_protocol(int f_out,int f_in) 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)