Use the new XFLG_* flags to call the add_exclude*() functions.

diff --git a/clientserver.c b/clientserver.c
index f96d5e6d1662f70644c80cadd6b0874316b72667..13e52f3deeef77d5fc13332fa33592aabf6c4392 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -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;
 

diff --git a/flist.c b/flist.c
index f547d7613f0c733e6064754676b1f8544f9fe4ec..012e6f0f5ae27c8f610a9ace98bbad98e3c44413 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -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,

diff --git a/options.c b/options.c
index 26dfd769963ce47b633f7c1c9e8dd1c42350dd7b..353153118e5b697d7869c77d513923002bad33b5 100644 (file)
--- a/options.c
+++ b/options.c
@@ -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':