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

diff --git a/generator.c b/generator.c
index fe7f16bc..bbf0e240 100644
--- a/generator.c
+++ b/generator.c
@@ -344,7 +344,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;
@@ -401,14 +401,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) {