X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7c67065c060d500eba8d073da9568db2c658aad..91f4b31fe1031adc3ec3e3066534c9d6be979d21:/main.c

diff --git a/main.c b/main.c
index f29057c3..1c71d157 100644
--- a/main.c
+++ b/main.c
@@ -49,6 +49,8 @@ extern int preserve_hard_links;
 extern int protocol_version;
 extern int recurse;
 extern int relative_paths;
+extern int sanitize_paths;
+extern int module_id;
 extern int rsync_port;
 extern int whole_file;
 extern int read_batch;
@@ -59,11 +61,13 @@ extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
 extern struct stats stats;
 extern char *filesfrom_host;
+extern char *basis_dir[];
 extern char *rsync_path;
 extern char *shell_cmd;
 extern char *batch_name;
 
 int local_server = 0;
+int startdir_depth = 0;
 mode_t orig_umask = 0;
 struct file_list *the_file_list;
 
@@ -474,6 +478,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 					full_fname(dest_path));
 				exit_cleanup(RERR_FILESELECT);
 			}
+			if (sanitize_paths)
+				startdir_depth = count_dir_elements(dest_path);
 			return NULL;
 		}
 		if (flist->count > 1) {
@@ -526,6 +532,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 				full_fname(dest_path));
 			exit_cleanup(RERR_FILESELECT);
 		}
+		if (sanitize_paths)
+			startdir_depth = count_dir_elements(dest_path);
 
 		return NULL;
 	}
@@ -546,6 +554,8 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 			full_fname(dest_path));
 		exit_cleanup(RERR_FILESELECT);
 	}
+	if (sanitize_paths)
+		startdir_depth = count_dir_elements(dest_path);
 	*cp = '/';
 
 	return cp + 1;
@@ -785,6 +795,14 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 	if (argc > 0)
 		local_name = get_local_name(flist,argv[0]);
 
+	/* Now that we know what our destination directory turned out to be,
+	 * we can sanitize the --link-/copy-/compare-dest args correctly. */
+	if (sanitize_paths) {
+		char **dir;
+		for (dir = basis_dir; *dir; dir++)
+			*dir = sanitize_path(NULL, *dir, NULL, startdir_depth);
+	}
+
 	exit_code = do_recv(f_in,f_out,flist,local_name);
 	exit_cleanup(exit_code);
 }