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
Renamed several exclude-related functions/variables using new
[rsync/rsync.git]
/
options.c
diff --git
a/options.c
b/options.c
index
ce0788d
..
3082e5c
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-23,8
+23,8
@@
extern int sanitize_paths;
extern int select_timeout;
extern int sanitize_paths;
extern int select_timeout;
-extern struct
exclude_list_struct exclude
_list;
-extern struct
exclude_list_struct server_exclude
_list;
+extern struct
filter_list_struct filter
_list;
+extern struct
filter_list_struct server_filter
_list;
int make_backups = 0;
int make_backups = 0;
@@
-643,17
+643,17
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
break;
case OPT_FILTER:
break;
case OPT_FILTER:
- add_
exclude(&exclude
_list, poptGetOptArg(pc), 0);
+ add_
filter(&filter
_list, poptGetOptArg(pc), 0);
break;
case OPT_EXCLUDE:
break;
case OPT_EXCLUDE:
- add_
exclude(&exclude
_list, poptGetOptArg(pc),
-
XFLG_DEF_EXCLUDE);
+ add_
filter(&filter
_list, poptGetOptArg(pc),
+ XFLG_DEF_EXCLUDE);
break;
case OPT_INCLUDE:
break;
case OPT_INCLUDE:
- add_
exclude(&exclude
_list, poptGetOptArg(pc),
-
XFLG_DEF_INCLUDE);
+ add_
filter(&filter
_list, poptGetOptArg(pc),
+ XFLG_DEF_INCLUDE);
break;
case OPT_EXCLUDE_FROM:
break;
case OPT_EXCLUDE_FROM:
@@
-661,13
+661,13
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
arg = poptGetOptArg(pc);
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
arg = poptGetOptArg(pc);
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
- if (server_
exclude
_list.head) {
+ if (server_
filter
_list.head) {
char *cp = (char *)arg;
clean_fname(cp, 1);
char *cp = (char *)arg;
clean_fname(cp, 1);
- if (check_
exclude(&server_exclude
_list, cp, 0) < 0)
+ if (check_
filter(&server_filter
_list, cp, 0) < 0)
goto options_rejected;
}
goto options_rejected;
}
- add_
exclude_file(&exclude
_list, arg, XFLG_FATAL_ERRORS
+ add_
filter_file(&filter
_list, arg, XFLG_FATAL_ERRORS
| (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE
: XFLG_DEF_EXCLUDE));
break;
| (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE
: XFLG_DEF_EXCLUDE));
break;
@@
-696,11
+696,11
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
case 'F':
switch (++F_option_cnt) {
case 1:
case 'F':
switch (++F_option_cnt) {
case 1:
- add_
exclude(&exclude
_list,
+ add_
filter(&filter
_list,
": /.rsync-filter", 0);
break;
case 2:
": /.rsync-filter", 0);
break;
case 2:
- add_
exclude(&exclude
_list,
+ add_
filter(&filter
_list,
"- .rsync-filter", 0);
break;
}
"- .rsync-filter", 0);
break;
}
@@
-921,33
+921,33
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (files_from)
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
if (files_from)
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
- if (server_
exclude
_list.head && !am_sender) {
- struct
exclude_list_struct *elp = &server_exclude
_list;
+ if (server_
filter
_list.head && !am_sender) {
+ struct
filter_list_struct *elp = &server_filter
_list;
int i;
if (tmpdir) {
clean_fname(tmpdir, 1);
int i;
if (tmpdir) {
clean_fname(tmpdir, 1);
- if (check_
exclude
(elp, tmpdir, 1) < 0)
+ if (check_
filter
(elp, tmpdir, 1) < 0)
goto options_rejected;
}
if (partial_dir) {
clean_fname(partial_dir, 1);
goto options_rejected;
}
if (partial_dir) {
clean_fname(partial_dir, 1);
- if (check_
exclude
(elp, partial_dir, 1) < 0)
+ if (check_
filter
(elp, partial_dir, 1) < 0)
goto options_rejected;
}
for (i = 0; i < basis_dir_cnt; i++) {
clean_fname(basis_dir[i], 1);
goto options_rejected;
}
for (i = 0; i < basis_dir_cnt; i++) {
clean_fname(basis_dir[i], 1);
- if (check_
exclude
(elp, basis_dir[i], 1) < 0)
+ if (check_
filter
(elp, basis_dir[i], 1) < 0)
goto options_rejected;
}
if (backup_dir) {
clean_fname(backup_dir, 1);
goto options_rejected;
}
if (backup_dir) {
clean_fname(backup_dir, 1);
- if (check_
exclude
(elp, backup_dir, 1) < 0)
+ if (check_
filter
(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
goto options_rejected;
}
}
- if (server_
exclude
_list.head && files_from) {
+ if (server_
filter
_list.head && files_from) {
clean_fname(files_from, 1);
clean_fname(files_from, 1);
- if (check_
exclude(&server_exclude
_list, files_from, 0) < 0) {
+ if (check_
filter(&server_filter
_list, files_from, 0) < 0) {
options_rejected:
snprintf(err_buf, sizeof err_buf,
"Your options have been rejected by the server.\n");
options_rejected:
snprintf(err_buf, sizeof err_buf,
"Your options have been rejected by the server.\n");
@@
-1016,7
+1016,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
else if (*partial_dir != '/') {
if (!*partial_dir || strcmp(partial_dir, ".") == 0)
partial_dir = NULL;
else if (*partial_dir != '/') {
- add_
exclude(&exclude
_list, partial_dir,
+ add_
filter(&filter
_list, partial_dir,
XFLG_DIRECTORY | XFLG_DEF_EXCLUDE);
}
keep_partial = 1;
XFLG_DIRECTORY | XFLG_DEF_EXCLUDE);
}
keep_partial = 1;