From 58b1999e086721ff77d8f3d5e0d29e1e58c70a94 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 12 Aug 2004 18:20:07 +0000
Subject: [PATCH] Call clean_flist() with its new "collapse_dot_dot" arg.

---
 flist.c   |  4 ++--
 log.c     |  2 +-
 options.c | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flist.c b/flist.c
index 743df099..4e0af363 100644
--- a/flist.c
+++ b/flist.c
@@ -570,7 +570,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 
 	strlcpy(lastname, thisname, MAXPATHLEN);
 
-	clean_fname(thisname);
+	clean_fname(thisname, 0);
 
 	if (sanitize_paths)
 		sanitize_path(thisname, thisname, "", 0);
@@ -761,7 +761,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}
-	clean_fname(thisname);
+	clean_fname(thisname, 0);
 	if (sanitize_paths)
 		sanitize_path(thisname, thisname, "", 0);
 
diff --git a/log.c b/log.c
index daf96b4f..0b55457f 100644
--- a/log.c
+++ b/log.c
@@ -373,7 +373,7 @@ static void log_formatted(enum logcode code,
 			pathjoin(buf2, sizeof buf2,
 				 file->basedir ? file->basedir : "",
 				 f_name(file));
-			clean_fname(buf2);
+			clean_fname(buf2, 0);
 			n = buf2;
 			if (*n == '/') n++;
 			break;
diff --git a/options.c b/options.c
index 805b9e12..ec42bf8d 100644
--- a/options.c
+++ b/options.c
@@ -743,28 +743,28 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 	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,
-- 
2.34.1