Improved the build rule for getfsdev and added getfsdev.o to the

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 563f043..ec42bf8 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;
 
@@ -729,43 +728,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,