Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactorings to the filter code, most notably:
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
8d06286
..
ca48ecb
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-620,24
+620,24
@@
static int rsync_module(int f_in, int f_out, int i, const char *addr, const char
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
set_filter_dir(module_dir, module_dirlen);
p = lp_filter(i);
-
parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT
,
+
load_filter_str(&daemon_filter_list, p, filter_template(MATCHFLG_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3);
p = lp_include_from(i);
-
parse_filter_file(&daemon_filter_list, p, MATCHFLG_INCLUDE
,
+
load_filter_file(&daemon_filter_list, p, filter_template(MATCHFLG_INCLUDE)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
-
parse_rule
(&daemon_filter_list, p,
-
MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT
,
+
load_filter_str
(&daemon_filter_list, p,
+
filter_template(MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
-
parse_filter_file(&daemon_filter_list, p, 0
,
+
load_filter_file(&daemon_filter_list, p, filter_template(0)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
-
parse_rule(&daemon_filter_list, p, MATCHFLG_WORD_SPLIT
,
+
load_filter_str(&daemon_filter_list, p, filter_template(MATCHFLG_WORD_SPLIT)
,
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);
XFLG_ABS_IF_SLASH | XFLG_DIR2WILD3 | XFLG_OLD_PREFIXES);
log_init(1);