X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/35da2ec35a651ed4883a47949755a4c2429684fc..968061bb65203ca9b0683ade0bf4bf238b8ce062:/compat.c diff --git a/compat.c b/compat.c index e2118069..aa32de8e 100644 --- a/compat.c +++ b/compat.c @@ -34,6 +34,7 @@ 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; @@ -46,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; @@ -145,6 +145,8 @@ void setup_protocol(int f_out,int f_in) } if (protocol_version < 30) { + if (append_mode == 1) + append_mode = 2; if (preserve_acls && !local_server) { rprintf(FERROR, "--acls requires protocol 30 or higher" @@ -201,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)