mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-10-26 15:48:22 -04:00
Use the new XFLG_* flags to call the add_exclude*() functions.
This commit is contained in:
1 parent
3915fd7583
commit
357406ecb2
3 files changed
+12
-10
No files matched your search
+7
-4
@@ -302,16 +302,19 @@ static int rsync_module(int f_in, int f_out, int i)
|
||||
exclude_path_prefix = "";
|
||||
|
||||
p = lp_include_from(i);
|
||||
add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
|
||||
add_exclude_file(&server_exclude_list, p,
|
||||
XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
|
||||
|
||||
p = lp_include(i);
|
||||
add_exclude_line(&server_exclude_list, p, ADD_INCLUDE);
|
||||
add_exclude(&server_exclude_list, p,
|
||||
XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
|
||||
|
||||
p = lp_exclude_from(i);
|
||||
add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE);
|
||||
add_exclude_file(&server_exclude_list, p,
|
||||
XFLG_FATAL_ERRORS);
|
||||
|
||||
p = lp_exclude(i);
|
||||
add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE);
|
||||
add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
|
||||
|
||||
exclude_path_prefix = NULL;
|
||||
|
||||
|
||||
@@ -997,7 +997,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
|
||||
if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
|
||||
< MAXPATHLEN - offset) {
|
||||
add_exclude_file(&local_exclude_list, fname,
|
||||
MISSING_OK, ADD_EXCLUDE);
|
||||
XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
|
||||
} else {
|
||||
io_error |= IOERR_GENERAL;
|
||||
rprintf(FINFO,
|
||||
|
||||
@@ -510,13 +510,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
|
||||
break;
|
||||
|
||||
case OPT_EXCLUDE:
|
||||
add_exclude(&exclude_list, poptGetOptArg(pc),
|
||||
ADD_EXCLUDE);
|
||||
add_exclude(&exclude_list, poptGetOptArg(pc), 0);
|
||||
break;
|
||||
|
||||
case OPT_INCLUDE:
|
||||
add_exclude(&exclude_list, poptGetOptArg(pc),
|
||||
ADD_INCLUDE);
|
||||
XFLG_DEF_INCLUDE);
|
||||
break;
|
||||
|
||||
case OPT_EXCLUDE_FROM:
|
||||
@@ -524,7 +523,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
|
||||
if (sanitize_paths)
|
||||
arg = alloc_sanitize_path(arg, curr_dir);
|
||||
add_exclude_file(&exclude_list, arg,
|
||||
MISSING_FATAL, ADD_EXCLUDE);
|
||||
XFLG_FATAL_ERRORS);
|
||||
break;
|
||||
|
||||
case OPT_INCLUDE_FROM:
|
||||
@@ -532,7 +531,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
|
||||
if (sanitize_paths)
|
||||
arg = alloc_sanitize_path(arg, curr_dir);
|
||||
add_exclude_file(&exclude_list, arg,
|
||||
MISSING_FATAL, ADD_INCLUDE);
|
||||
XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
|
||||
break;
|
||||
|
||||
case 'h':
|
||||
|
||||
Reference in new issue
Block a user