X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6c3862fae3b6003e0a124c51d84ddb3dff663fc6..1b1fef20b3c200069314aaa40d61b6a819b93c31:/generator.c

diff --git a/generator.c b/generator.c
index fe7f16bc..5bad8a55 100644
--- a/generator.c
+++ b/generator.c
@@ -42,6 +42,7 @@ extern int preserve_gid;
 extern int preserve_times;
 extern int omit_dir_times;
 extern int delete_during;
+extern int remove_sent_files;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -344,7 +345,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 			   struct file_struct *file, int ndx,
 			   int f_out, int f_out_name)
 {
-	static int missing_below = -1;
+	static int missing_below = -1, excluded_below = -1;
 	static char *fuzzy_dirname = NULL;
 	static struct file_list *fuzzy_dirlist = NULL;
 	struct file_struct *fuzzy_file = NULL;
@@ -354,7 +355,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 	int statret, stat_errno;
 	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
-	int itemizing, maybe_DEL_TERSE, maybe_PERMS_REPORT;
+	int itemizing, maybe_PERMS_REPORT;
 	uchar fnamecmp_type;
 	enum logcode code;
 
@@ -364,22 +365,18 @@ static void recv_generator(char *fname, struct file_list *flist,
 	if (protocol_version >= 29) {
 		itemizing = 1;
 		code = daemon_log_format_has_i ? 0 : FLOG;
-		maybe_DEL_TERSE = log_format_has_o_or_i ? 0 : DEL_TERSE;
 		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
 	} else if (am_daemon) {
 		itemizing = daemon_log_format_has_i && !dry_run;
 		code = itemizing || dry_run ? FCLIENT : FINFO;
-		maybe_DEL_TERSE = DEL_TERSE;
 		maybe_PERMS_REPORT = PERMS_REPORT;
 	} else if (!am_server) {
 		itemizing = log_format_has_i;
 		code = itemizing ? 0 : FINFO;
-		maybe_DEL_TERSE = log_format_has_o_or_i ? 0 : DEL_TERSE;
 		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
 	} else {
 		itemizing = 0;
 		code = FINFO;
-		maybe_DEL_TERSE = DEL_TERSE;
 		maybe_PERMS_REPORT = PERMS_REPORT;
 	}
 
@@ -401,14 +398,24 @@ static void recv_generator(char *fname, struct file_list *flist,
 			safe_fname(fname), ndx);
 	}
 
-	if (server_filter_list.head
-	    && check_filter(&server_filter_list, fname,
-			    S_ISDIR(file->mode)) < 0) {
-		if (verbose) {
-			rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
-				safe_fname(fname));
+	if (server_filter_list.head) {
+		if (excluded_below >= 0) {
+			if (file->dir.depth > excluded_below)
+				goto skipping;
+			excluded_below = -1;
+		}
+		if (check_filter(&server_filter_list, fname,
+				 S_ISDIR(file->mode)) < 0) {
+			if (S_ISDIR(file->mode))
+				excluded_below = file->dir.depth;
+		    skipping:
+			if (verbose) {
+				rprintf(FINFO,
+					"skipping server-excluded file \"%s\"\n",
+					safe_fname(fname));
+			}
+			return;
 		}
-		return;
 	}
 
 	if (missing_below >= 0 && file->dir.depth <= missing_below) {
@@ -461,7 +468,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 		 * we need to delete it.  If it doesn't exist, then
 		 * (perhaps recursively) create it. */
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			delete_file(fname, st.st_mode, maybe_DEL_TERSE);
+			delete_file(fname, st.st_mode, DEL_TERSE);
 			statret = -1;
 		}
 		if (dry_run && statret != 0 && missing_below < 0) {
@@ -532,7 +539,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 			if (S_ISLNK(st.st_mode))
 				delete_file(fname, st.st_mode, DEL_TERSE);
 			else {
-				delete_file(fname, st.st_mode, maybe_DEL_TERSE);
+				delete_file(fname, st.st_mode, DEL_TERSE);
 				statret = -1;
 			}
 		}
@@ -549,6 +556,11 @@ static void recv_generator(char *fname, struct file_list *flist,
 				rprintf(code, "%s -> %s\n", safe_fname(fname),
 					safe_fname(file->u.link));
 			}
+			if (remove_sent_files && !dry_run) {
+				char numbuf[4];
+				SIVAL(numbuf, 0, ndx);
+				send_msg(MSG_SUCCESS, numbuf, 4);
+			}
 		}
 #endif
 		return;
@@ -561,7 +573,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 			if (IS_DEVICE(st.st_mode))
 				delete_file(fname, st.st_mode, DEL_TERSE);
 			else {
-				delete_file(fname, st.st_mode, maybe_DEL_TERSE);
+				delete_file(fname, st.st_mode, DEL_TERSE);
 				statret = -1;
 			}
 			if (verbose > 2) {
@@ -661,7 +673,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 	}
 
 	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		if (delete_file(fname, st.st_mode, maybe_DEL_TERSE) != 0)
+		if (delete_file(fname, st.st_mode, DEL_TERSE) != 0)
 			return;
 		statret = -1;
 		stat_errno = ENOENT;
@@ -829,7 +841,7 @@ notify_others:
 #endif
 			}
 			*lb = len;
-			write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
+			write_buf(f_out_name, (char*)lenbuf, lb - lenbuf + 1);
 			write_buf(f_out_name, fuzzy_file->basename, len);
 		}
 	}
@@ -873,10 +885,10 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	}
 
 	if (verbose >= 2) {
-		rprintf(FINFO,
+		rprintf(FINFO, "delta-transmission %s\n",
 			whole_file > 0
-			? "delta-transmission disabled for local transfer or --whole-file\n"
-			: "delta transmission enabled\n");
+			? "disabled for local transfer or --whole-file"
+			: "enabled");
 	}
 
 	/* We expect to just sit around now, so don't exit on a timeout.