Save first filename and linenum in case exit_cleanup() recurses.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 49af4b4..546f63d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -29,8 +29,8 @@ extern int local_server;
 extern int sanitize_paths;
 extern int daemon_over_rsh;
 extern unsigned int module_dirlen;
-extern struct filter_list_struct filter_list;
-extern struct filter_list_struct daemon_filter_list;
+extern filter_rule_list filter_list;
+extern filter_rule_list daemon_filter_list;
 
 int make_backups = 0;
 
@@ -215,7 +215,7 @@ static const char *debug_verbosity[] = {
 static const char *info_verbosity[1+MAX_VERBOSITY] = {
        /*0*/ NULL,
        /*1*/ "COPY,DEL,FLIST,MISC,NAME,STATS,SYMSAFE",
-       /*2*/ "BACKUP,MOUNT,NAME2,REMOVE,SKIP",
+       /*2*/ "BACKUP,MISC2,MOUNT,NAME2,REMOVE,SKIP",
 };
 
 #define MAX_OUT_LEVEL 4 /* The largest N allowed for any flagN word. */
@@ -248,7 +248,7 @@ static struct output_struct info_words[COUNT_INFO+1] = {
        INFO_WORD(COPY, W_REC, "Mention files copied locally on the receiving side"),
        INFO_WORD(DEL, W_REC, "Mention deletions on the receiving side"),
        INFO_WORD(FLIST, W_CLI, "Mention file-list receiving/sending (levels 1-2)"),
-       INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information"),
+       INFO_WORD(MISC, W_SND|W_REC, "Mention miscellaneous information (levels 1-2)"),
        INFO_WORD(MOUNT, W_SND|W_REC, "Mention mounts that were found or skipped"),
        INFO_WORD(NAME, W_SND|W_REC, "Mention 1) updated file/dir names, 2) unchanged names"),
        INFO_WORD(PROGRESS, W_CLI, "Mention 1) per-file progress or 2) total transfer progress"),
@@ -279,6 +279,7 @@ static struct output_struct debug_words[COUNT_DEBUG+1] = {
        DEBUG_WORD(HASH, W_SND|W_REC, "Debug hashtable code"),
        DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions"),
        DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"),
+       DEBUG_WORD(IO, W_CLI|W_SRV, "Debug I/O routines (levels 1-4)"),
        DEBUG_WORD(OWN, W_REC, "Debug ownership changes in users & groups (levels 1-2)"),
        DEBUG_WORD(PROTO, W_CLI|W_SRV, "Debug protocol information"),
        DEBUG_WORD(RECV, W_REC, "Debug receiver functions"),
@@ -596,7 +597,7 @@ static void print_rsync_version(enum logcode f)
 #ifdef ICONV_OPTION
        iconv = "";
 #endif
-#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+#ifdef CAN_SET_SYMLINK_TIMES
        symtimes = "";
 #endif
 
@@ -1399,17 +1400,18 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        break;
 
                case OPT_FILTER:
-                       parse_rule(&filter_list, poptGetOptArg(pc), 0, 0);
+                       parse_filter_str(&filter_list, poptGetOptArg(pc),
+                                       rule_template(0), 0);
                        break;
 
                case OPT_EXCLUDE:
-                       parse_rule(&filter_list, poptGetOptArg(pc),
-                                  0, XFLG_OLD_PREFIXES);
+                       parse_filter_str(&filter_list, poptGetOptArg(pc),
+                                       rule_template(0), XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_INCLUDE:
-                       parse_rule(&filter_list, poptGetOptArg(pc),
-                                  FILTRULE_INCLUDE, XFLG_OLD_PREFIXES);
+                       parse_filter_str(&filter_list, poptGetOptArg(pc),
+                                       rule_template(FILTRULE_INCLUDE), XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_EXCLUDE_FROM:
@@ -1419,20 +1421,22 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                                arg = sanitize_path(NULL, arg, NULL, 0, SP_DEFAULT);
                        if (daemon_filter_list.head) {
                                int rej;
-                               char *dir, *cp = strdup(arg);
+                               char *cp = strdup(arg);
                                if (!cp)
                                        out_of_memory("parse_arguments");
                                if (!*cp)
-                                       goto options_rejected;
-                               dir = cp + (*cp == '/' ? module_dirlen : 0);
-                               clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
-                               rej = check_filter(&daemon_filter_list, FLOG, dir, 0) < 0;
+                                       rej = 1;
+                               else {
+                                       char *dir = cp + (*cp == '/' ? module_dirlen : 0);
+                                       clean_fname(dir, CFN_COLLAPSE_DOT_DOT_DIRS);
+                                       rej = check_filter(&daemon_filter_list, FLOG, dir, 0) < 0;
+                               }
                                free(cp);
                                if (rej)
                                        goto options_rejected;
                        }
                        parse_filter_file(&filter_list, arg,
-                               opt == OPT_INCLUDE_FROM ? FILTRULE_INCLUDE : 0,
+                               rule_template(opt == OPT_INCLUDE_FROM ? FILTRULE_INCLUDE : 0),
                                XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
                        break;
 
@@ -1489,10 +1493,10 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                case 'F':
                        switch (++F_option_cnt) {
                        case 1:
-                               parse_rule(&filter_list,": /.rsync-filter",0,0);
+                               parse_filter_str(&filter_list,": /.rsync-filter",rule_template(0),0);
                                break;
                        case 2:
-                               parse_rule(&filter_list,"- .rsync-filter",0,0);
+                               parse_filter_str(&filter_list,"- .rsync-filter",rule_template(0),0);
                                break;
                        }
                        break;
@@ -1895,7 +1899,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                list_only |= 1;
 
        if (xfer_dirs >= 4) {
-               parse_rule(&filter_list, "- /*/*", 0, 0);
+               parse_filter_str(&filter_list, "- /*/*", rule_template(0), 0);
                recurse = xfer_dirs = 1;
        } else if (recurse)
                xfer_dirs = 1;
@@ -1929,7 +1933,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        }
        if (!xfer_dirs && delete_mode) {
                snprintf(err_buf, sizeof err_buf,
-                       "--delete does not work without -r or -d.\n");
+                       "--delete does not work without --recursive (-r) or --dirs (-d).\n");
                return 0;
        }
 
@@ -1972,7 +1976,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
        }
        if (daemon_filter_list.head && !am_sender) {
-               struct filter_list_struct *elp = &daemon_filter_list;
+               filter_rule_list *elp = &daemon_filter_list;
                if (tmpdir) {
                        char *dir;
                        if (!*tmpdir)
@@ -2033,7 +2037,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
        } else if (make_backups && delete_mode && !delete_excluded && !am_server) {
                snprintf(backup_dir_buf, sizeof backup_dir_buf,
                        "P *%s", backup_suffix);
-               parse_rule(&filter_list, backup_dir_buf, 0, 0);
+               parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
        }
 
        if (make_backups && !backup_dir) {
@@ -2357,7 +2361,7 @@ void server_options(char **args, int *argc_p)
                        argstr[x++] = '.';
                if (allow_inc_recurse)
                        argstr[x++] = 'i';
-#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+#ifdef CAN_SET_SYMLINK_TIMES
                argstr[x++] = 'L';
 #endif
 #ifdef ICONV_OPTION