mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-10 18:37:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

We can't check the --*-dest args against the server filter rules

Browse Source 
here because we don't know what the args are going to be relative
to yet.
This commit is contained in:
Wayne Davison
2006-04-28 17:34:53 +00:00
parent 7c58c99184
commit d3ef985954
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
options.c
View File

@@ -893,12 +893,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
if (sanitize_paths)
arg = sanitize_path(NULL, arg, NULL, 0);
if (server_filter_list.head) {
char *cp = (char *)arg;
char *cp = strdup(arg);
if (!cp)
out_of_memory("parse_arguments");
if (!*cp)
goto options_rejected;
clean_fname(cp, 1);
if (check_filter(&server_filter_list, cp, 0) < 0)
goto options_rejected;
free(cp);
}
parse_filter_file(&filter_list, arg,
opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
@@ -1215,7 +1218,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
int i;
if (tmpdir) {
if (!*tmpdir)
goto options_rejected;
@@ -1228,13 +1230,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
if (check_filter(elp, partial_dir, 1) < 0)
goto options_rejected;
}
for (i = 0; i < basis_dir_cnt; i++) {
if (!*basis_dir[i])
goto options_rejected;
clean_fname(basis_dir[i], 1);
if (check_filter(elp, basis_dir[i], 1) < 0)
goto options_rejected;
}
if (backup_dir) {
if (!*backup_dir)
goto options_rejected;