X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e4b619b46d6ad596a8e5ceaa6b5d34b0fd2cc527..c12895089cfc31fd372a0fcf0da6ffb6222fa73b:/compat.c

diff --git a/compat.c b/compat.c
index f62c191a..ed1f2a20 100644
--- 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
@@ -24,7 +23,7 @@
 
 int remote_protocol = 0;
 int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
-int incremental = 0;
+int inc_recurse = 0;
 
 extern int verbose;
 extern int am_server;
@@ -44,7 +43,12 @@ extern int preserve_gid;
 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)
 {
@@ -146,11 +150,28 @@ void setup_protocol(int f_out,int f_in)
 		}
 	} else if (protocol_version >= 30) {
 		if (recurse && !preserve_hard_links && !delete_before
-		 && !delete_after && !delay_updates)
-			incremental = 1;
+		 && !delete_after && !delay_updates && !prune_empty_dirs)
+			inc_recurse = 1;
 		need_messages_from_generator = 1;
 	}
 
+	if (make_backups && !backup_dir && delete_mode && !delete_excluded
+	 && !am_server) {
+		char *rule;
+		if (asprintf(&rule, "P%s *%s",
+			    !am_sender || protocol_version >= 30 ? "p" : "",
+			    backup_suffix) < 0)
+			out_of_memory("setup_protocol");
+		parse_rule(&filter_list, rule, 0, 0);
+		free(rule);
+	}
+	if (partial_dir && *partial_dir != '/' && !am_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);