From 0a68f869d7c1b390f7cafd72e52949305c06cad5 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 3 Feb 2005 19:00:17 +0000
Subject: [PATCH] Call add_filter() and add_filter_file() with their new flag
 args.

---
 clientserver.c | 19 ++++++++++---------
 main.c         |  2 +-
 options.c      | 20 +++++++++-----------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/clientserver.c b/clientserver.c
index 98909f50..4618fb74 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -324,24 +324,25 @@ static int rsync_module(int f_in, int f_out, int i)
 	}
 
 	p = lp_filter(i);
-	add_filter(&server_filter_list, p,
-	    XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS);
+	add_filter(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+		   XFLG_ANCHORED2ABS);
 
 	p = lp_include_from(i);
-	add_filter_file(&server_filter_list, p,
-	    XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
+	add_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
+	    XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
 	p = lp_include(i);
 	add_filter(&server_filter_list, p,
-	    XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
+		   MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+		   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
 	p = lp_exclude_from(i);
-	add_filter_file(&server_filter_list, p,
-	    XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
+	add_filter_file(&server_filter_list, p, 0,
+	    XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
 	p = lp_exclude(i);
-	add_filter(&server_filter_list, p,
-	    XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
+	add_filter(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+		   XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
 	log_init();
 
diff --git a/main.c b/main.c
index f48febe8..c788ecf2 100644
--- a/main.c
+++ b/main.c
@@ -623,7 +623,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 	if (delete_mode && !delete_excluded)
 		recv_filter_list(f_in);
 	if (cvs_exclude && protocol_version < 29)
-		add_filter(&filter_list, ":C", 0);
+		add_filter(&filter_list, ":C", 0, 0);
 
 	if (filesfrom_fd >= 0) {
 		/* We need to send the files-from names to the sender at the
diff --git a/options.c b/options.c
index 8eb38110..08e6a9c8 100644
--- a/options.c
+++ b/options.c
@@ -657,17 +657,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			break;
 
 		case OPT_FILTER:
-			add_filter(&filter_list, poptGetOptArg(pc), 0);
+			add_filter(&filter_list, poptGetOptArg(pc), 0, 0);
 			break;
 
 		case OPT_EXCLUDE:
 			add_filter(&filter_list, poptGetOptArg(pc),
-				   XFLG_DEF_EXCLUDE);
+				   0, XFLG_OLD_PREFIXES);
 			break;
 
 		case OPT_INCLUDE:
 			add_filter(&filter_list, poptGetOptArg(pc),
-				   XFLG_DEF_INCLUDE);
+				   MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES);
 			break;
 
 		case OPT_EXCLUDE_FROM:
@@ -681,9 +681,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				if (check_filter(&server_filter_list, cp, 0) < 0)
 					goto options_rejected;
 			}
-			add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS
-				| (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE
-							   : XFLG_DEF_EXCLUDE));
+			add_filter_file(&filter_list, arg,
+			    opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
+			    XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
 			break;
 
 		case 'h':
@@ -710,12 +710,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 		case 'F':
 			switch (++F_option_cnt) {
 			case 1:
-				add_filter(&filter_list,
-					    ": /.rsync-filter", 0);
+				add_filter(&filter_list,": /.rsync-filter",0,0);
 				break;
 			case 2:
-				add_filter(&filter_list,
-				 	    "- .rsync-filter", 0);
+				add_filter(&filter_list,"- .rsync-filter",0,0);
 				break;
 			}
 			break;
@@ -1041,7 +1039,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				partial_dir = NULL;
 			else if (*partial_dir != '/') {
 				add_filter(&filter_list, partial_dir,
-					    XFLG_DIRECTORY | XFLG_DEF_EXCLUDE);
+				    MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
 			}
 			keep_partial = 1;
 		}
-- 
2.34.1