X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c8e839461533cbe68637ad46baa84dff1e4bc4f2..7e4b6b7bc47b8ac00fa295ed60e6e13e28fd1a8a:/compat.c

diff --git a/compat.c b/compat.c
index 527485dd..c04fd4cd 100644
--- a/compat.c
+++ b/compat.c
@@ -6,8 +6,9 @@
  * 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 version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -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;
@@ -56,6 +58,9 @@ extern char *partial_dir;
 extern char *dest_option;
 extern struct filter_list_struct filter_list;
 
+/* These index values are for the file-list's extra-attribute array. */
+int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
+
 /* The server makes sure that if either side only supports a pre-release
  * version of a protocol, that both sides must speak a compatible version
  * of that protocol for it to be advertised as available. */
@@ -92,13 +97,13 @@ void setup_protocol(int f_out,int f_in)
 	else
 		file_extra_cnt++;
 	if (preserve_uid)
-		preserve_uid = ++file_extra_cnt;
+		uid_ndx = ++file_extra_cnt;
 	if (preserve_gid)
-		preserve_gid = ++file_extra_cnt;
+		gid_ndx = ++file_extra_cnt;
 	if (preserve_acls && !am_sender)
-		preserve_acls = ++file_extra_cnt;
+		acls_ndx = ++file_extra_cnt;
 	if (preserve_xattrs)
-		preserve_xattrs = ++file_extra_cnt;
+		xattrs_ndx = ++file_extra_cnt;
 
 	if (remote_protocol == 0) {
 		if (am_server && !local_server)
@@ -141,13 +146,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"
@@ -206,7 +206,8 @@ void setup_protocol(int f_out,int f_in)
 	} else if (protocol_version >= 30) {
 		if (recurse && allow_inc_recurse && !preserve_hard_links
 		 && !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;
 	}