X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9742b386b3d5b3010675aef9febaffbf8ab2d2c0..e73eed8563d21ef9ce83725cb09a3c2e14a40dbe:/compat.c

diff --git a/compat.c b/compat.c
index 544bba76..fb002746 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;
@@ -45,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;
@@ -66,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;
 	}
 
@@ -83,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--;
 }
@@ -144,13 +151,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"
@@ -207,9 +209,10 @@ 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
-		 && !prune_empty_dirs && !use_qsort)
+		 && (!relative_paths || implied_dirs) && !use_qsort
+		 && !prune_empty_dirs)
 			inc_recurse = 1;
 		need_messages_from_generator = 1;
 	}