The improved --xattrs option is landing on the trunk.

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index b090c2a..3f4bd45 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) Andrew Tridgell 1996
  * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2004-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,31 +22,52 @@
 #include "rsync.h"
 
 int remote_protocol = 0;
-int flist_extra_cnt = 0; /* count of file-list extras that everyone gets */
+int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
+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 allow_inc_recurse;
 extern int fuzzy_basis;
 extern int read_batch;
 extern int max_delete;
+extern int delay_updates;
 extern int checksum_seed;
 extern int basis_dir_cnt;
 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;
+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)
 {
        if (am_sender)
-               flist_extra_cnt += PTR_EXTRA_LEN;
+               file_extra_cnt += PTR_EXTRA_LEN;
        else
-               flist_extra_cnt++;
+               file_extra_cnt++;
        if (preserve_uid)
-               preserve_uid = ++flist_extra_cnt;
+               preserve_uid = ++file_extra_cnt;
        if (preserve_gid)
-               preserve_gid = ++flist_extra_cnt;
+               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)
@@ -95,6 +115,27 @@ 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 (preserve_xattrs) {
+                       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)) {
+               if (protocol_version < 30)
+                       delete_before = 1;
+               else
+                       delete_during = 1;
        }
 
        if (protocol_version < 29) {
@@ -129,6 +170,19 @@ void setup_protocol(int f_out,int f_in)
                            protocol_version);
                        exit_cleanup(RERR_PROTOCOL);
                }
+       } else if (protocol_version >= 30) {
+               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;
+       }
+
+       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) {