The ACL support has arrived! This version has a brand new protocol

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index e7693ee..66438c4 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -28,6 +28,7 @@ int inc_recurse = 0;
 extern int verbose;
 extern int am_server;
 extern int am_sender;
+extern int local_server;
 extern int inplace;
 extern int recurse;
 extern int fuzzy_basis;
@@ -40,10 +41,16 @@ extern int prune_empty_dirs;
 extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
+extern int preserve_acls;
 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;
+extern int make_backups;
+extern char *backup_dir, *backup_suffix;
+extern char *partial_dir;
 extern char *dest_option;
+extern struct filter_list_struct filter_list;
 
 void setup_protocol(int f_out,int f_in)
 {
@@ -55,6 +62,8 @@ 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 (remote_protocol == 0) {
                if (!read_batch)
@@ -102,6 +111,13 @@ void setup_protocol(int f_out,int f_in)
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
+               if (preserve_acls) {
+                       rprintf(FERROR,
+                           "--acls requires protocol 30 or higher"
+                           " (negotiated %d).\n",
+                           protocol_version);
+                       exit_cleanup(RERR_PROTOCOL);
+               }
        }
 
        if (delete_mode && !(delete_before+delete_during+delete_after)) {
@@ -150,6 +166,13 @@ void setup_protocol(int f_out,int f_in)
                need_messages_from_generator = 1;
        }
 
+       if (partial_dir && *partial_dir != '/' && (!am_server || local_server)) {
+               int flags = MATCHFLG_NO_PREFIXES | MATCHFLG_DIRECTORY;
+               if (!am_sender || protocol_version >= 30)
+                       flags |= MATCHFLG_PERISHABLE;
+               parse_rule(&filter_list, partial_dir, flags, 0);
+       }
+
        if (am_server) {
                if (!checksum_seed)
                        checksum_seed = time(NULL);