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]
/
options.c
diff --git
a/options.c
b/options.c
index
817e430
..
c08a337
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-1399,17
+1399,18
@@
int parse_arguments(int *argc_p, const char ***argv_p)
break;
case OPT_FILTER:
break;
case OPT_FILTER:
- parse_rule(&filter_list, poptGetOptArg(pc), 0, 0);
+ load_filter_str(&filter_list, poptGetOptArg(pc),
+ filter_template(0), 0);
break;
case OPT_EXCLUDE:
break;
case OPT_EXCLUDE:
-
parse_rule
(&filter_list, poptGetOptArg(pc),
-
0
, XFLG_OLD_PREFIXES);
+
load_filter_str
(&filter_list, poptGetOptArg(pc),
+
filter_template(0)
, XFLG_OLD_PREFIXES);
break;
case OPT_INCLUDE:
break;
case OPT_INCLUDE:
-
parse_rule
(&filter_list, poptGetOptArg(pc),
-
MATCHFLG_INCLUDE
, XFLG_OLD_PREFIXES);
+
load_filter_str
(&filter_list, poptGetOptArg(pc),
+
filter_template(MATCHFLG_INCLUDE)
, XFLG_OLD_PREFIXES);
break;
case OPT_EXCLUDE_FROM:
break;
case OPT_EXCLUDE_FROM:
@@
-1431,8
+1432,8
@@
int parse_arguments(int *argc_p, const char ***argv_p)
if (rej)
goto options_rejected;
}
if (rej)
goto options_rejected;
}
-
parse
_filter_file(&filter_list, arg,
-
opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0
,
+
load
_filter_file(&filter_list, arg,
+
filter_template(opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0)
,
XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
break;
XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
break;
@@
-1489,10
+1490,10
@@
int parse_arguments(int *argc_p, const char ***argv_p)
case 'F':
switch (++F_option_cnt) {
case 1:
case 'F':
switch (++F_option_cnt) {
case 1:
-
parse_rule(&filter_list,": /.rsync-filter",0
,0);
+
load_filter_str(&filter_list,": /.rsync-filter",filter_template(0)
,0);
break;
case 2:
break;
case 2:
-
parse_rule(&filter_list,"- .rsync-filter",0
,0);
+
load_filter_str(&filter_list,"- .rsync-filter",filter_template(0)
,0);
break;
}
break;
break;
}
break;
@@
-1895,7
+1896,7
@@
int parse_arguments(int *argc_p, const char ***argv_p)
list_only |= 1;
if (xfer_dirs >= 4) {
list_only |= 1;
if (xfer_dirs >= 4) {
-
parse_rule(&filter_list, "- /*/*", 0
, 0);
+
load_filter_str(&filter_list, "- /*/*", filter_template(0)
, 0);
recurse = xfer_dirs = 1;
} else if (recurse)
xfer_dirs = 1;
recurse = xfer_dirs = 1;
} else if (recurse)
xfer_dirs = 1;
@@
-2033,7
+2034,7
@@
int parse_arguments(int *argc_p, const char ***argv_p)
} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
snprintf(backup_dir_buf, sizeof backup_dir_buf,
"P *%s", backup_suffix);
} else if (make_backups && delete_mode && !delete_excluded && !am_server) {
snprintf(backup_dir_buf, sizeof backup_dir_buf,
"P *%s", backup_suffix);
-
parse_rule(&filter_list, backup_dir_buf, 0
, 0);
+
load_filter_str(&filter_list, backup_dir_buf, filter_template(0)
, 0);
}
if (make_backups && !backup_dir) {
}
if (make_backups && !backup_dir) {