If the partial-dir value is relative, add a directory-exclude for it

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 563f043..3cee4ba 100644 (file)
--- a/options.c
+++ b/options.c
@@ -23,7 +23,6 @@
 
 extern int sanitize_paths;
 extern int select_timeout;
-extern char curr_dir[MAXPATHLEN];
 extern struct exclude_list_struct exclude_list;
 extern struct exclude_list_struct server_exclude_list;
 
@@ -541,32 +540,28 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        break;
 
                case OPT_EXCLUDE:
-                       if (am_server || sanitize_paths)
-                               return 0; /* Impossible... */
                        add_exclude(&exclude_list, poptGetOptArg(pc), 0);
                        break;
 
                case OPT_INCLUDE:
-                       if (am_server || sanitize_paths)
-                               return 0; /* Impossible... */
                        add_exclude(&exclude_list, poptGetOptArg(pc),
                                    XFLG_DEF_INCLUDE);
                        break;
 
                case OPT_EXCLUDE_FROM:
-                       if (am_server || sanitize_paths)
-                               return 0; /* Impossible... */
-                       arg = poptGetOptArg(pc);
-                       add_exclude_file(&exclude_list, arg,
-                                        XFLG_FATAL_ERRORS);
-                       break;
-
                case OPT_INCLUDE_FROM:
-                       if (am_server || sanitize_paths)
-                               return 0; /* Impossible... */
                        arg = poptGetOptArg(pc);
-                       add_exclude_file(&exclude_list, arg,
-                                        XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
+                       if (sanitize_paths)
+                               arg = sanitize_path(NULL, arg, NULL, 0);
+                       if (server_exclude_list.head) {
+                               char *cp = (char *)arg;
+                               clean_fname(cp, 1);
+                               if (check_exclude(&server_exclude_list, cp, 0) < 0)
+                                       goto options_rejected;
+                       }
+                       add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
+                                        | (opt == OPT_INCLUDE_FROM
+                                         ? XFLG_DEF_INCLUDE : 0));
                        break;
 
                case 'h':
@@ -729,43 +724,43 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (sanitize_paths) {
                int i;
                for (i = *argc; i-- > 0; )
-                       (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL);
+                       (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0);
                if (tmpdir)
-                       tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
                if (partial_dir)
-                       partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
+                       partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
                if (compare_dest)
-                       compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
+                       compare_dest = sanitize_path(NULL, compare_dest, NULL, 0);
                if (backup_dir)
-                       backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
+                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
                if (files_from)
-                       files_from = alloc_sanitize_path(files_from, curr_dir);
+                       files_from = sanitize_path(NULL, files_from, NULL, 0);
        }
        if (server_exclude_list.head && !am_sender) {
                struct exclude_list_struct *elp = &server_exclude_list;
                if (tmpdir) {
-                       clean_fname(tmpdir);
+                       clean_fname(tmpdir, 1);
                        if (check_exclude(elp, tmpdir, 1) < 0)
                                goto options_rejected;
                }
                if (partial_dir) {
-                       clean_fname(partial_dir);
+                       clean_fname(partial_dir, 1);
                        if (check_exclude(elp, partial_dir, 1) < 0)
                                goto options_rejected;
                }
                if (compare_dest) {
-                       clean_fname(compare_dest);
+                       clean_fname(compare_dest, 1);
                        if (check_exclude(elp, compare_dest, 1) < 0)
                                goto options_rejected;
                }
                if (backup_dir) {
-                       clean_fname(backup_dir);
+                       clean_fname(backup_dir, 1);
                        if (check_exclude(elp, backup_dir, 1) < 0)
                                goto options_rejected;
                }
        }
        if (server_exclude_list.head && files_from) {
-               clean_fname(files_from);
+               clean_fname(files_from, 1);
                if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
                    options_rejected:
                        snprintf(err_buf, sizeof err_buf,
@@ -832,10 +827,24 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                         am_server ? "server" : "client");
                return 0;
 #endif
-       } else if (partial_dir) {
-               if (strcmp(partial_dir, ".") == 0)
-                       partial_dir = NULL;
-               keep_partial = 1;
+               if (compare_dest) {
+                       snprintf(err_buf, sizeof err_buf,
+                                "--inplace does not yet work with %s\n",
+                                link_dest ? "--link-dest" : "--compare-dest");
+                       return 0;
+               }
+       } else {
+               if (keep_partial && !partial_dir)
+                       partial_dir = getenv("RSYNC_PARTIAL_DIR");
+               if (partial_dir) {
+                       if (!*partial_dir || strcmp(partial_dir, ".") == 0)
+                               partial_dir = NULL;
+                       else if (*partial_dir != '/') {
+                               add_exclude(&exclude_list, partial_dir,
+                                           XFLG_DIRECTORY);
+                       }
+                       keep_partial = 1;
+               }
        }
 
        if (files_from) {
@@ -1012,8 +1021,7 @@ void server_options(char **args,int *argc)
        if (am_sender) {
                if (delete_excluded)
                        args[ac++] = "--delete-excluded";
-               else if (delete_mode
-                   && (!delete_after || protocol_version < 27))
+               else if (delete_mode)
                        args[ac++] = "--delete";
 
                if (delete_after)