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

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 67349ac..3531531 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':
@@ -688,6 +687,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        files_from = alloc_sanitize_path(files_from, curr_dir);
        }
 
+       if (daemon_opt) {
+               daemon_opt = 0;
+               am_daemon = 1;
+               return 1;
+       }
+
        if (!backup_suffix)
                backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
        backup_suffix_len = strlen(backup_suffix);
@@ -750,9 +755,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                }
        }
 
-       if (daemon_opt)
-               am_daemon = 1;
-
        return 1;
 }