X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5df1fcf2452b92a48cd520c8363064892334f0d2..d8d36af4521e77ed284f7be91f95d53d972914b4:/options.c diff --git a/options.c b/options.c index 26dfd769..b14ef1c8 100644 --- a/options.c +++ b/options.c @@ -23,7 +23,7 @@ extern int sanitize_paths; extern char curr_dir[MAXPATHLEN]; -extern struct exclude_struct **exclude_list; +extern struct exclude_list_struct exclude_list; int make_backups = 0; @@ -183,7 +183,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", ipv6, (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (INO64_T) * 8)); + (int) (sizeof (uint64) * 8)); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); @@ -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':