Use the new sanitize_path() calling syntax.

diff --git a/flist.c b/flist.c
index 412b089..31fcf2f 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -573,7 +573,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        clean_fname(thisname);
 
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, NULL);
 
        if ((basename = strrchr(thisname, '/')) != NULL) {
                dirname_len = ++basename - thisname; /* counts future '\0' */
@@ -671,7 +671,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                file->u.link = bp;
                read_sbuf(f, bp, linkname_len - 1);
                if (sanitize_paths)
-                       sanitize_path(bp, lastdir);
+                       sanitize_path(bp, bp, lastdir);
                bp += linkname_len;
        }
 #endif
@@ -761,7 +761,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
        }
        clean_fname(thisname);
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, NULL);
 
        memset(sum, 0, SUM_LENGTH);
 
@@ -1077,13 +1077,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (use_ff_fd) {
                        if (read_filesfrom_line(filesfrom_fd, fname) == 0)
                                break;
-                       sanitize_path(fname, NULL);
+                       sanitize_path(fname, fname, NULL);
                } else {
                        if (argc-- == 0)
                                break;
                        strlcpy(fname, *argv++, MAXPATHLEN);
                        if (sanitize_paths)
-                               sanitize_path(fname, NULL);
+                               sanitize_path(fname, fname, NULL);
                }
 
                l = strlen(fname);

diff --git a/options.c b/options.c
index 563f043..d7d22af 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,17 +728,17 @@ 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], NULL);
                if (tmpdir)
-                       tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+                       tmpdir = sanitize_path(NULL, tmpdir, "");
                if (partial_dir)
-                       partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
+                       partial_dir = sanitize_path(NULL, partial_dir, "");
                if (compare_dest)
-                       compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
+                       compare_dest = sanitize_path(NULL, compare_dest, "");
                if (backup_dir)
-                       backup_dir = alloc_sanitize_path(backup_dir, curr_dir);
+                       backup_dir = sanitize_path(NULL, backup_dir, "");
                if (files_from)
-                       files_from = alloc_sanitize_path(files_from, curr_dir);
+                       files_from = sanitize_path(NULL, files_from, "");
        }
        if (server_exclude_list.head && !am_sender) {
                struct exclude_list_struct *elp = &server_exclude_list;