From 91f4b31fe1031adc3ec3e3066534c9d6be979d21 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 3 May 2006 00:48:20 +0000 Subject: [PATCH] Use the new calling syntax for sanitize_path(). --- exclude.c | 2 +- options.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/exclude.c b/exclude.c index eb2353c0..0da15b23 100644 --- a/exclude.c +++ b/exclude.c @@ -298,7 +298,7 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr, strlcpy(to, merge_file, *len_ptr + 1); merge_file = to; } - if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) { + if (!sanitize_path(fn, merge_file, r, dirbuf_depth, NULL)) { rprintf(FERROR, "merge-file name overflows: %s\n", merge_file); return NULL; diff --git a/options.c b/options.c index a80da6aa..14071c87 100644 --- a/options.c +++ b/options.c @@ -891,7 +891,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case OPT_INCLUDE_FROM: arg = poptGetOptArg(pc); if (sanitize_paths) - arg = sanitize_path(NULL, arg, NULL, 0); + arg = sanitize_path(NULL, arg, NULL, 0, NULL); if (server_filter_list.head) { char *cp = strdup(arg); if (!cp) @@ -1208,13 +1208,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (sanitize_paths) { int i; for (i = *argc; i-- > 0; ) - (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0); + (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL); if (tmpdir) - tmpdir = sanitize_path(NULL, tmpdir, NULL, 0); + tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL); if (partial_dir) - partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); + partial_dir = sanitize_path(NULL, partial_dir, NULL, 0, NULL); if (backup_dir) - backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL); } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; @@ -1410,7 +1410,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } else { if (sanitize_paths) - files_from = sanitize_path(NULL, files_from, NULL, 0); + files_from = sanitize_path(NULL, files_from, NULL, 0, NULL); if (server_filter_list.head) { if (!*files_from) goto options_rejected; -- 2.34.1