Clarified something in the new --hard-links text.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index c90e2f7..aa32de8 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -33,9 +33,11 @@ extern int inplace;
 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;
@@ -45,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;
@@ -144,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"
@@ -207,9 +203,10 @@ 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
-                && !prune_empty_dirs && !use_qsort)
+                && (!relative_paths || implied_dirs) && !use_qsort
+                && !prune_empty_dirs)
                        inc_recurse = 1;
                need_messages_from_generator = 1;
        }