Added a way to exchange a protocol's sub-protocol value. This will be

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index 62b2ba0..4b57ec4 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -31,6 +31,7 @@ extern int am_sender;
 extern int local_server;
 extern int inplace;
 extern int recurse;
+extern int allow_inc_recurse;
 extern int fuzzy_basis;
 extern int read_batch;
 extern int max_delete;
@@ -41,6 +42,8 @@ extern int prune_empty_dirs;
 extern int protocol_version;
 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;
@@ -61,6 +64,10 @@ void setup_protocol(int f_out,int f_in)
                preserve_uid = ++file_extra_cnt;
        if (preserve_gid)
                preserve_gid = ++file_extra_cnt;
+       if (preserve_acls && !am_sender)
+               preserve_acls = ++file_extra_cnt;
+       if (preserve_xattrs)
+               preserve_xattrs = ++file_extra_cnt;
 
        if (remote_protocol == 0) {
                if (!read_batch)
@@ -68,6 +75,19 @@ void setup_protocol(int f_out,int f_in)
                remote_protocol = read_int(f_in);
                if (protocol_version > remote_protocol)
                        protocol_version = remote_protocol;
+               /* CVS support: fallback to finalized protocol if incompatible */
+               if (protocol_version >= 30) {
+                       int theirsub, oursub = PROTOCOL_SUBVERSION;
+                       if (!read_batch)
+                               write_varint(f_out, oursub);
+                       theirsub = read_varint(f_in);
+                       if (remote_protocol > PROTOCOL_VERSION)
+                               theirsub = 0; /* 0 == final version */
+                       if (protocol_version < PROTOCOL_VERSION)
+                               oursub = 0;
+                       if (theirsub != oursub)
+                               protocol_version--;
+               }
        }
        if (read_batch && remote_protocol > protocol_version) {
                rprintf(FERROR, "The protocol version in the batch file is too new (%d > %d).\n",
@@ -108,6 +128,20 @@ void setup_protocol(int f_out,int f_in)
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
+               if (preserve_acls && !local_server) {
+                       rprintf(FERROR,
+                           "--acls requires protocol 30 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+               if (preserve_xattrs && !local_server) {
+                       rprintf(FERROR,
+                           "--xattrs requires protocol 30 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
        }
 
        if (delete_mode && !(delete_before+delete_during+delete_after)) {
@@ -150,8 +184,9 @@ void setup_protocol(int f_out,int f_in)
                        exit_cleanup(RERR_PROTOCOL);
                }
        } else if (protocol_version >= 30) {
-               if (recurse && !preserve_hard_links && !delete_before
-                && !delete_after && !delay_updates && !prune_empty_dirs)
+               if (recurse && allow_inc_recurse && !preserve_hard_links
+                && !delete_before && !delete_after && !delay_updates
+                && !prune_empty_dirs)
                        inc_recurse = 1;
                need_messages_from_generator = 1;
        }