Changed add_filter() to parse_rule() and add_filter_file()

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 159a5a1..19d54c6 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -264,7 +264,7 @@ static int rsync_module(int f_in, int f_out, int i)
                } else {
                        rprintf(FLOG, "max connections (%d) reached\n",
                                lp_max_connections(i));
-                       io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+                       io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n",
                                lp_max_connections(i));
                }
                return -1;
@@ -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);
+       parse_rule(&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);
+       parse_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);
+       parse_rule(&server_filter_list, p,
+                  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);
+       parse_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);
+       parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
 
        log_init();