- Made glob_expand_one() public.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index e211806..fb00274 100644 (file)
--- 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;
@@ -67,13 +67,19 @@ static void check_sub_protocol(void)
 {
        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;
        }
 
@@ -84,7 +90,7 @@ static void check_sub_protocol(void)
        }
 
        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--;
 }
@@ -145,6 +151,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 +209,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)