X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/87fd439059f5210483e20aa0f2da2ccf106b70e7..b435d7174cb971e85e4199999c748d51ba5d0a18:/flist.c

diff --git a/flist.c b/flist.c
index 05b53f6e..08ac3c92 100644
--- a/flist.c
+++ b/flist.c
@@ -27,8 +27,6 @@
 
 #include "rsync.h"
 
-extern struct stats stats;
-
 extern int verbose;
 extern int dry_run;
 extern int list_only;
@@ -58,30 +56,27 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
-extern int max_delete;
-extern int force_delete;
 extern int orig_umask;
-extern int make_backups;
-extern unsigned int curr_dir_len;
-extern char *log_format;
-extern char *backup_dir;
-extern char *backup_suffix;
-extern int backup_suffix_len;
+extern struct stats stats;
+extern struct file_list *the_file_list;
 
 extern char curr_dir[MAXPATHLEN];
 
+extern struct chmod_mode_struct *chmod_modes;
+
 extern struct filter_list_struct filter_list;
 extern struct filter_list_struct server_filter_list;
 
 int io_error;
+int checksum_len;
+dev_t filesystem_dev; /* used to implement -x */
 
 static char empty_sum[MD4_SUM_LENGTH];
+static int flist_count_offset;
 static unsigned int file_struct_len;
-static struct file_list *received_flist, *sorting_flist;
-static dev_t filesystem_dev; /* used to implement -x */
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
-static void output_flist(struct file_list *flist, const char *whose_list);
+static void output_flist(struct file_list *flist);
 
 void init_flist(void)
 {
@@ -89,9 +84,9 @@ void init_flist(void)
 
 	/* Figure out how big the file_struct is without trailing padding */
 	file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
+	checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 }
 
-
 static int show_filelist_p(void)
 {
 	return verbose && xfer_dirs && !am_server;
@@ -105,20 +100,17 @@ static void start_filelist_progress(char *kind)
 	rflush(FINFO);
 }
 
-
-static void emit_filelist_progress(const struct file_list *flist)
+static void emit_filelist_progress(int count)
 {
-	rprintf(FINFO, " %d files...\r", flist->count);
+	rprintf(FINFO, " %d files...\r", count);
 }
 
-
-static void maybe_emit_filelist_progress(const struct file_list *flist)
+static void maybe_emit_filelist_progress(int count)
 {
-	if (do_progress && show_filelist_p() && (flist->count % 100) == 0)
-		emit_filelist_progress(flist);
+	if (do_progress && show_filelist_p() && (count % 100) == 0)
+		emit_filelist_progress(count);
 }
 
-
 static void finish_filelist_progress(const struct file_list *flist)
 {
 	if (do_progress) {
@@ -134,7 +126,6 @@ void show_flist_stats(void)
 	/* Nothing yet */
 }
 
-
 static void list_file_entry(struct file_struct *f)
 {
 	char perms[11];
@@ -151,18 +142,17 @@ static void list_file_entry(struct file_struct *f)
 		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 			perms,
 			(double)f->length, timestring(f->modtime),
-			safe_fname(f_name(f)), safe_fname(f->u.link));
+			f_name(f, NULL), f->u.link);
 	} else
 #endif
 	{
 		rprintf(FINFO, "%s %11.0f %s %s\n",
 			perms,
 			(double)f->length, timestring(f->modtime),
-			safe_fname(f_name(f)));
+			f_name(f, NULL));
 	}
 }
 
-
 /**
  * Stat either a symlink or its referent, depending on the settings of
  * copy_links, copy_unsafe_links, etc.
@@ -192,7 +182,7 @@ static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 		if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
 			if (verbose > 1) {
 				rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
-					safe_fname(path), safe_fname(linkbuf));
+					path, linkbuf);
 			}
 			return do_stat(path, buffer);
 		}
@@ -268,9 +258,8 @@ static mode_t from_wire_mode(int mode)
 	return (mode_t)mode;
 }
 
-
 static void send_directory(int f, struct file_list *flist,
-			   char *fbuf, unsigned int offset);
+			   char *fbuf, int len);
 
 static char *flist_dir;
 static int flist_dir_len;
@@ -346,7 +335,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 	io_write_phase = "send_file_entry";
 
-	f_name_to(file, fname);
+	f_name(file, fname);
 
 	flags = base_flags;
 
@@ -421,10 +410,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 		} else
 			write_byte(f, flags);
 	} else {
-		if (!(flags & 0xFF) && !S_ISDIR(mode))
-			flags |= XMIT_TOP_DIR;
 		if (!(flags & 0xFF))
-			flags |= XMIT_LONG_NAME;
+			flags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
 		write_byte(f, flags);
 	}
 	if (flags & XMIT_SAME_NAME)
@@ -487,19 +474,15 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
 		char *sum;
 		if (S_ISREG(mode))
 			sum = file->u.sum;
-		else if (protocol_version < 28) {
+		else {
 			/* Prior to 28, we sent a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			write_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		write_buf(f, sum, checksum_len);
 	}
 
 	strlcpy(lastname, fname, MAXPATHLEN);
@@ -507,8 +490,6 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	io_write_phase = "unknown";
 }
 
-
-
 static struct file_struct *receive_file_entry(struct file_list *flist,
 					      unsigned short flags, int f)
 {
@@ -552,8 +533,8 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	if (l2 >= MAXPATHLEN - l1) {
 		rprintf(FERROR,
 			"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
-			flags, l1, l2, safe_fname(lastname));
-		overflow("receive_file_entry");
+			flags, l1, l2, lastname);
+		overflow_exit("receive_file_entry");
 	}
 
 	strlcpy(thisname, lastname, l1 + 1);
@@ -618,7 +599,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 		if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
 			rprintf(FERROR, "overflow: linkname_len=%d\n",
 				linkname_len - 1);
-			overflow("receive_file_entry");
+			overflow_exit("receive_file_entry");
 		}
 	}
 	else
@@ -660,8 +641,11 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 		if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
 			file->dir.depth--;
 		if (flags & XMIT_TOP_DIR) {
-			in_del_hier = 1;
+			in_del_hier = recurse;
 			del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
+			if (relative_paths && del_hier_name_len > 2
+			    && basename_len == 1+1 && *basename == '.')
+				del_hier_name_len -= 2;
 			file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
 		} else if (in_del_hier) {
 			if (!relative_paths || !del_hier_name_len
@@ -712,20 +696,16 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (sum_len || protocol_version < 28)) {
 		char *sum;
 		if (sum_len) {
 			file->u.sum = sum = bp;
 			/*bp += sum_len;*/
-		} else if (protocol_version < 28) {
+		} else {
 			/* Prior to 28, we get a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			read_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		read_buf(f, sum, checksum_len);
 	}
 
 	if (!preserve_perms) {
@@ -737,7 +717,6 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
 	return file;
 }
 
-
 /**
  * Create a file_struct for a named file by reading its stat()
  * information and performing extensive checks against global
@@ -772,8 +751,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 
 	if (strlcpy(thisname, fname, sizeof thisname)
 	    >= sizeof thisname - flist_dir_len) {
-		rprintf(FINFO, "skipping overly long name: %s\n",
-			safe_fname(fname));
+		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}
 	clean_fname(thisname, 0);
@@ -818,7 +796,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		goto skip_filters;
 
 	if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-		rprintf(FINFO, "skipping directory %s\n", safe_fname(thisname));
+		rprintf(FINFO, "skipping directory %s\n", thisname);
 		return NULL;
 	}
 
@@ -840,11 +818,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 				return NULL;
 	}
 
-skip_filters:
+  skip_filters:
 
 	if (verbose > 2) {
 		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
-			who_am_i(), safe_fname(thisname), filter_level);
+			who_am_i(), thisname, filter_level);
 	}
 
 	if ((basename = strrchr(thisname, '/')) != NULL) {
@@ -868,16 +846,16 @@ skip_filters:
 	linkname_len = 0;
 #endif
 
-	sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+	sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
+	        ? MD4_SUM_LENGTH : 0;
 
 	alloc_len = file_struct_len + dirname_len + basename_len
 	    + linkname_len + sum_len;
-	if (flist) {
-		bp = pool_alloc(flist->file_pool, alloc_len,
-		    "receive_file_entry");
-	} else {
+	if (flist)
+		bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
+	else {
 		if (!(bp = new_array(char, alloc_len)))
-			out_of_memory("receive_file_entry");
+			out_of_memory("make_file");
 	}
 
 	file = (struct file_struct *)bp;
@@ -887,7 +865,10 @@ skip_filters:
 	file->flags = flags;
 	file->modtime = st.st_mtime;
 	file->length = st.st_size;
-	file->mode = st.st_mode;
+	if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
+		file->mode = tweak_mode(st.st_mode, chmod_modes);
+	else
+		file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
 
@@ -951,7 +932,7 @@ skip_filters:
 		STRUCT_STAT st2;
 		int save_mode = file->mode;
 		file->mode = S_IFDIR; /* find a directory w/our name */
-		if (flist_find(received_flist, file) >= 0
+		if (flist_find(the_file_list, file) >= 0
 		    && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
 			file->modtime = st2.st_mtime;
 			file->length = st2.st_size;
@@ -963,24 +944,22 @@ skip_filters:
 			file->mode = save_mode;
 	}
 
-	if (!S_ISDIR(st.st_mode))
+	if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
 		stats.total_size += st.st_size;
 
 	return file;
 }
 
-
-void send_file_name(int f, struct file_list *flist, char *fname,
-		    int recursive, unsigned short base_flags)
+static struct file_struct *send_file_name(int f, struct file_list *flist,
+					  char *fname, unsigned short base_flags)
 {
 	struct file_struct *file;
-	char fbuf[MAXPATHLEN];
 
 	file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
 	if (!file)
-		return;
+		return NULL;
 
-	maybe_emit_filelist_progress(flist);
+	maybe_emit_filelist_progress(flist->count + flist_count_offset);
 
 	flist_expand(flist);
 
@@ -988,9 +967,17 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 		flist->files[flist->count++] = file;
 		send_file_entry(file, f, base_flags);
 	}
+	return file;
+}
 
-	if (recursive && S_ISDIR(file->mode)
-	    && !(file->flags & FLAG_MOUNT_POINT) && f_name_to(file, fbuf)) {
+static void send_if_directory(int f, struct file_list *flist,
+			      struct file_struct *file,
+			      char *fbuf, unsigned int ol)
+{
+	char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
+
+	if (S_ISDIR(file->mode)
+	    && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) {
 		void *save_filters;
 		unsigned int len = strlen(fbuf);
 		if (len > 1 && fbuf[len-1] == '/')
@@ -1004,23 +991,25 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 		save_filters = push_local_filters(fbuf, len);
 		send_directory(f, flist, fbuf, len);
 		pop_local_filters(save_filters);
+		fbuf[ol] = '\0';
+		if (is_dot_dir)
+			fbuf[ol-1] = '.';
 	}
 }
 
-
-/* Note that the "recurse" value either contains -1, for infinite recursion,
- * or a number >= 0 indicating how many levels of recursion we will allow.
- * This function is normally called by the sender, but the receiving side
- * also calls it from delete_in_dir() with f set to -1 so that we just
- * construct the file list in memory without sending it over the wire.  Also,
- * get_dirlist() calls this with f set to -2, which indicates that local
- * filter rules should be ignored. */
+/* This function is normally called by the sender, but the receiving side also
+ * calls it from get_dirlist() with f set to -1 so that we just construct the
+ * file list in memory without sending it over the wire.  Also, get_dirlist()
+ * might call this with f set to -2, which also indicates that local filter
+ * rules should be ignored. */
 static void send_directory(int f, struct file_list *flist,
-			   char *fbuf, unsigned int len)
+			   char *fbuf, int len)
 {
 	struct dirent *di;
+	unsigned remainder;
 	char *p;
 	DIR *d;
+	int start = flist->count;
 
 	if (!(d = opendir(fbuf))) {
 		io_error |= IOERR_GENERAL;
@@ -1032,35 +1021,43 @@ static void send_directory(int f, struct file_list *flist,
 	if (len != 1 || *fbuf != '/')
 		*p++ = '/';
 	*p = '\0';
+	remainder = MAXPATHLEN - (p - fbuf);
 
 	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
 		char *dname = d_name(di);
 		if (dname[0] == '.' && (dname[1] == '\0'
 		    || (dname[1] == '.' && dname[2] == '\0')))
 			continue;
-		if (strlcpy(p, dname, MAXPATHLEN - len) < MAXPATHLEN - len) {
-			int do_subdirs = recurse >= 1 ? recurse-- : recurse;
-			send_file_name(f, flist, fbuf, do_subdirs, 0);
-		} else {
+		if (strlcpy(p, dname, remainder) >= remainder) {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot send long-named file %s\n",
 				full_fname(fbuf));
+			continue;
 		}
+
+		send_file_name(f, flist, fbuf, 0);
 	}
+
+	fbuf[len] = '\0';
+
 	if (errno) {
 		io_error |= IOERR_GENERAL;
-		*p = '\0';
 		rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf));
 	}
 
 	closedir(d);
-}
 
+	if (recurse) {
+		int i, end = flist->count - 1;
+		for (i = start; i <= end; i++)
+			send_if_directory(f, flist, flist->files[i], fbuf, len);
+	}
+}
 
 struct file_list *send_file_list(int f, int argc, char *argv[])
 {
-	int l;
+	int len;
 	STRUCT_STAT st;
 	char *p, *dir, olddir[sizeof curr_dir];
 	char lastpath[MAXPATHLEN] = "";
@@ -1088,48 +1085,59 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	}
 
 	while (1) {
-		char fname2[MAXPATHLEN];
-		char *fname = fname2;
-		int do_subdirs;
+		char fbuf[MAXPATHLEN];
+		char *fn;
+		int is_dot_dir;
 
 		if (use_ff_fd) {
-			if (read_filesfrom_line(filesfrom_fd, fname) == 0)
+			if (read_filesfrom_line(filesfrom_fd, fbuf) == 0)
 				break;
-			sanitize_path(fname, fname, "", 0);
+			sanitize_path(fbuf, fbuf, "", 0);
 		} else {
 			if (argc-- == 0)
 				break;
-			strlcpy(fname, *argv++, MAXPATHLEN);
+			strlcpy(fbuf, *argv++, MAXPATHLEN);
 			if (sanitize_paths)
-				sanitize_path(fname, fname, "", 0);
+				sanitize_path(fbuf, fbuf, "", 0);
 		}
 
-		l = strlen(fname);
-		if (!l || fname[l - 1] == '/') {
-			if (l == 2 && fname[0] == '.') {
+		len = strlen(fbuf);
+		if (relative_paths) {
+			/* We clean up fbuf below. */
+			is_dot_dir = 0;
+		} else if (!len || fbuf[len - 1] == '/') {
+			if (len == 2 && fbuf[0] == '.') {
 				/* Turn "./" into just "." rather than "./." */
-				fname[1] = '\0';
-			} else if (l < MAXPATHLEN) {
-				fname[l++] = '.';
-				fname[l] = '\0';
+				fbuf[1] = '\0';
+			} else {
+				if (len + 1 >= MAXPATHLEN)
+					overflow_exit("send_file_list");
+				fbuf[len++] = '.';
+				fbuf[len] = '\0';
 			}
+			is_dot_dir = 1;
+		} else if (len > 1 && fbuf[len-1] == '.' && fbuf[len-2] == '.'
+		    && (len == 2 || fbuf[len-3] == '/')) {
+			if (len + 2 >= MAXPATHLEN)
+				overflow_exit("send_file_list");
+			fbuf[len++] = '/';
+			fbuf[len++] = '.';
+			fbuf[len] = '\0';
+			is_dot_dir = 1;
+		} else {
+			is_dot_dir = fbuf[len-1] == '.'
+				   && (len == 1 || fbuf[len-2] == '/');
 		}
-		if (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
-			if (!recurse && xfer_dirs)
-				recurse = 1; /* allow one level */
-		} else if (recurse > 0)
-			recurse = 0;
 
-		if (link_stat(fname, &st, keep_dirlinks) != 0) {
+		if (link_stat(fbuf, &st, keep_dirlinks) != 0) {
 			io_error |= IOERR_GENERAL;
 			rsyserr(FERROR, errno, "link_stat %s failed",
-				full_fname(fname));
+				full_fname(fbuf));
 			continue;
 		}
 
 		if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-			rprintf(FINFO, "skipping directory %s\n",
-				safe_fname(fname));
+			rprintf(FINFO, "skipping directory %s\n", fbuf);
 			continue;
 		}
 
@@ -1137,54 +1145,63 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		olddir[0] = '\0';
 
 		if (!relative_paths) {
-			p = strrchr(fname, '/');
+			p = strrchr(fbuf, '/');
 			if (p) {
-				*p = 0;
-				if (p == fname)
+				*p = '\0';
+				if (p == fbuf)
 					dir = "/";
 				else
-					dir = fname;
-				fname = p + 1;
-			}
-		} else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
-			/* this ensures we send the intermediate directories,
-			   thus getting their permissions right */
-			char *lp = lastpath, *fn = fname, *slash = fname;
-			*p = 0;
-			/* Skip any initial directories in our path that we
-			 * have in common with lastpath. */
-			while (*fn && *lp == *fn) {
-				if (*fn == '/')
-					slash = fn;
-				lp++, fn++;
+					dir = fbuf;
+				len -= p - fbuf + 1;
+				fn = p + 1;
+			} else
+				fn = fbuf;
+		} else {
+			if ((p = strstr(fbuf, "/./")) != NULL) {
+				*p = '\0';
+				if (p == fbuf)
+					dir = "/";
+				else
+					dir = fbuf;
+				len -= p - fbuf + 3;
+				fn = p + 3;
+			} else
+				fn = fbuf;
+			/* Get rid of trailing "/" and "/.". */
+			while (len) {
+				if (fn[len - 1] == '/')
+					len--;
+				else if (len >= 2 && fn[len - 1] == '.'
+						  && fn[len - 2] == '/') {
+					if (!(len -= 2) && !dir) {
+						len++;
+						break;
+					}
+				} else
+					break;
 			}
-			*p = '/';
-			if (fn != p || (*lp && *lp != '/')) {
-				int save_copy_links = copy_links;
-				int save_xfer_dirs = xfer_dirs;
-				copy_links = copy_unsafe_links;
-				xfer_dirs = 1;
-				while ((slash = strchr(slash+1, '/')) != 0) {
-					*slash = 0;
-					send_file_name(f, flist, fname, 0, 0);
-					*slash = '/';
-				}
-				copy_links = save_copy_links;
-				xfer_dirs = save_xfer_dirs;
-				*p = 0;
-				strlcpy(lastpath, fname, sizeof lastpath);
-				*p = '/';
+			fn[len] = '\0';
+			/* Reject a ".." dir in the active part of the path. */
+			if ((p = strstr(fbuf, "..")) != NULL
+			 && (p[2] == '/' || p[2] == '\0')
+			 && (p == fbuf || p[-1] == '/')) {
+				rprintf(FERROR,
+				    "using a \"..\" dir is invalid with --relative: %s\n",
+				    fbuf);
+				exit_cleanup(RERR_SYNTAX);
 			}
 		}
 
-		if (!*fname)
-			fname = ".";
+		if (!*fn) {
+			len = 1;
+			fn = ".";
+		}
 
 		if (dir && *dir) {
 			static char *lastdir;
 			static int lastdir_len;
 
-			strcpy(olddir, curr_dir); /* can't overflow */
+			strlcpy(olddir, curr_dir, sizeof olddir);
 
 			if (!push_dir(dir)) {
 				io_error |= IOERR_GENERAL;
@@ -1202,18 +1219,55 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			}
 		}
 
+		if (fn != fbuf)
+			memmove(fbuf, fn, len + 1);
+
+		if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
+			/* Send the implied directories at the start of the
+			 * source spec, so we get their permissions right. */
+			char *lp = lastpath, *slash = fbuf;
+			*p = '\0';
+			/* Skip any initial directories in our path that we
+			 * have in common with lastpath. */
+			for (fn = fbuf; *fn && *lp == *fn; lp++, fn++) {
+				if (*fn == '/')
+					slash = fn;
+			}
+			*p = '/';
+			if (fn != p || (*lp && *lp != '/')) {
+				int save_copy_links = copy_links;
+				int save_xfer_dirs = xfer_dirs;
+				copy_links = copy_unsafe_links;
+				xfer_dirs = 1;
+				while ((slash = strchr(slash+1, '/')) != 0) {
+					*slash = '\0';
+					send_file_name(f, flist, fbuf, 0);
+					*slash = '/';
+				}
+				copy_links = save_copy_links;
+				xfer_dirs = save_xfer_dirs;
+				*p = '\0';
+				strlcpy(lastpath, fbuf, sizeof lastpath);
+				*p = '/';
+			}
+		}
+
 		if (one_file_system)
 			filesystem_dev = st.st_dev;
 
-		do_subdirs = recurse >= 1 ? recurse-- : recurse;
-		send_file_name(f, flist, fname, do_subdirs, XMIT_TOP_DIR);
+		if (recurse || (xfer_dirs && is_dot_dir)) {
+			struct file_struct *file;
+			if ((file = send_file_name(f, flist, fbuf, XMIT_TOP_DIR)))
+				send_if_directory(f, flist, file, fbuf, len);
+		} else
+			send_file_name(f, flist, fbuf, 0);
 
 		if (olddir[0]) {
 			flist_dir = NULL;
 			flist_dir_len = 0;
 			if (!pop_dir(olddir)) {
 				rsyserr(FERROR, errno, "pop_dir %s failed",
-					full_fname(dir));
+					full_fname(olddir));
 				exit_cleanup(RERR_FILESELECT);
 			}
 		}
@@ -1258,7 +1312,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	stats.num_files = flist->count;
 
 	if (verbose > 3)
-		output_flist(flist, who_am_i());
+		output_flist(flist);
 
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
@@ -1266,7 +1320,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	return flist;
 }
 
-
 struct file_list *recv_file_list(int f)
 {
 	struct file_list *flist;
@@ -1279,7 +1332,6 @@ struct file_list *recv_file_list(int f)
 	start_read = stats.total_read;
 
 	flist = flist_new(WITH_HLINK, "recv_file_list");
-	received_flist = flist;
 
 	flist->count = 0;
 	flist->malloced = 1000;
@@ -1287,7 +1339,6 @@ struct file_list *recv_file_list(int f)
 	if (!flist->files)
 		goto oom;
 
-
 	while ((flags = read_byte(f)) != 0) {
 		struct file_struct *file;
 
@@ -1302,11 +1353,11 @@ struct file_list *recv_file_list(int f)
 
 		flist->files[flist->count++] = file;
 
-		maybe_emit_filelist_progress(flist);
+		maybe_emit_filelist_progress(flist->count);
 
 		if (verbose > 2) {
 			rprintf(FINFO, "recv_file_name(%s)\n",
-				safe_fname(f_name(file)));
+				f_name(file, NULL));
 		}
 	}
 	receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
@@ -1332,7 +1383,7 @@ struct file_list *recv_file_list(int f)
 	}
 
 	if (verbose > 3)
-		output_flist(flist, who_am_i());
+		output_flist(flist);
 
 	if (list_only) {
 		int i;
@@ -1348,18 +1399,16 @@ struct file_list *recv_file_list(int f)
 
 	return flist;
 
-oom:
+  oom:
 	out_of_memory("recv_file_list");
 	return NULL;		/* not reached */
 }
 
-
 static int file_compare(struct file_struct **file1, struct file_struct **file2)
 {
 	return f_name_cmp(*file1, *file2);
 }
 
-
 /* Search for an identically-named item in the file list.  Note that the
  * items must agree in their directory-ness, or no match is returned. */
 int flist_find(struct file_list *flist, struct file_struct *f)
@@ -1389,7 +1438,6 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 	return -1;
 }
 
-
 /*
  * Free up any resources a file_struct has allocated
  * and clear the file.
@@ -1401,7 +1449,6 @@ void clear_file(int i, struct file_list *flist)
 	memset(flist->files[i], 0, file_struct_len);
 }
 
-
 /*
  * allocate a new file list
  */
@@ -1441,7 +1488,6 @@ void flist_free(struct file_list *flist)
 	free(flist);
 }
 
-
 /*
  * This routine ensures we don't have any duplicate names in our file list.
  * duplicate names can cause corruption because of the pipelining
@@ -1450,13 +1496,15 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 {
 	int i, prev_i = 0;
 
-	if (!flist || flist->count == 0)
+	if (!flist)
 		return;
+	if (flist->count == 0) {
+		flist->high = -1;
+		return;
+	}
 
-	sorting_flist = flist;
 	qsort(flist->files, flist->count,
 	    sizeof flist->files[0], (int (*)())file_compare);
-	sorting_flist = NULL;
 
 	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
 		if (flist->files[i]->basename) {
@@ -1499,12 +1547,12 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			if (verbose > 1 && !am_server) {
 				rprintf(FINFO,
 					"removing duplicate name %s from file list (%d)\n",
-					safe_fname(f_name(file)), drop);
+					f_name(file, NULL), drop);
 			}
 			/* Make sure that if we unduplicate '.', that we don't
 			 * lose track of a user-specified top directory. */
-			if (flist->files[drop]->flags & FLAG_TOP_DIR)
-				flist->files[keep]->flags |= FLAG_TOP_DIR;
+			flist->files[keep]->flags |= flist->files[drop]->flags
+						   & (FLAG_TOP_DIR|FLAG_DEL_HERE);
 
 			clear_file(drop, flist);
 
@@ -1542,10 +1590,11 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 	}
 }
 
-static void output_flist(struct file_list *flist, const char *whose_list)
+static void output_flist(struct file_list *flist)
 {
 	char uidbuf[16], gidbuf[16], depthbuf[16];
 	struct file_struct *file;
+	const char *who = who_am_i();
 	int i;
 
 	for (i = 0; i < flist->count; i++) {
@@ -1561,15 +1610,14 @@ static void output_flist(struct file_list *flist, const char *whose_list)
 		if (!am_sender)
 			sprintf(depthbuf, "%d", file->dir.depth);
 		rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
-			whose_list, i, am_sender ? NS(file->dir.root) : depthbuf,
-			file->dirname ? safe_fname(file->dirname) : "",
+			who, i, am_sender ? NS(file->dir.root) : depthbuf,
+			file->dirname ? file->dirname : "",
 			file->dirname ? "/" : "", NS(file->basename),
 			S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
 			(double)file->length, uidbuf, gidbuf, file->flags);
 	}
 }
 
-
 enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
 enum fnc_type { t_PATH, t_ITEM };
 
@@ -1657,8 +1705,13 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 				break;
 			case s_SLASH:
 				type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
-				state1 = s_BASE;
 				c1 = (uchar*)f1->basename;
+				if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
+					type1 = t_ITEM;
+					state1 = s_TRAILING;
+					c1 = (uchar*)"";
+				} else
+					state1 = s_BASE;
 				break;
 			case s_BASE:
 				state1 = s_TRAILING;
@@ -1677,25 +1730,18 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 		if (!*c2) {
 			switch (state2) {
 			case s_DIR:
-				if (state1 == s_SLASH && sorting_flist) {
-					int j;
-					/* Optimize for future comparisons. */
-					for (j = 0;
-					     j < sorting_flist->count;
-					     j++) {
-						struct file_struct *fp
-						    = sorting_flist->files[j];
-						if (fp->dirname == f2->dirname)
-							fp->dirname = f1->dirname;
-					}
-				}
 				state2 = s_SLASH;
 				c2 = (uchar*)"/";
 				break;
 			case s_SLASH:
 				type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
-				state2 = s_BASE;
 				c2 = (uchar*)f2->basename;
+				if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
+					type2 = t_ITEM;
+					state2 = s_TRAILING;
+					c2 = (uchar*)"";
+				} else
+					state2 = s_BASE;
 				break;
 			case s_BASE:
 				state2 = s_TRAILING;
@@ -1718,16 +1764,24 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	return dif;
 }
 
-
 /* Return a copy of the full filename of a flist entry, using the indicated
- * buffer.  No size-checking is done because we checked the size when creating
- * the file_struct entry.
+ * buffer or one of 5 static buffers if fbuf is NULL.  No size-checking is
+ * done because we checked the size when creating the file_struct entry.
  */
-char *f_name_to(struct file_struct *f, char *fbuf)
+char *f_name(struct file_struct *f, char *fbuf)
 {
 	if (!f || !f->basename)
 		return NULL;
 
+	if (!fbuf) {
+		static char names[5][MAXPATHLEN];
+		static unsigned int n;
+
+		n = (n + 1) % (sizeof names / sizeof names[0]);
+
+		fbuf = names[n];
+	}
+
 	if (f->dirname) {
 		int len = strlen(f->dirname);
 		memcpy(fbuf, f->dirname, len);
@@ -1735,229 +1789,41 @@ char *f_name_to(struct file_struct *f, char *fbuf)
 		strcpy(fbuf + len + 1, f->basename);
 	} else
 		strcpy(fbuf, f->basename);
-	return fbuf;
-}
-
-
-/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
-char *f_name(struct file_struct *f)
-{
-	static char names[5][MAXPATHLEN];
-	static unsigned int n;
-
-	n = (n + 1) % (sizeof names / sizeof names[0]);
 
-	return f_name_to(f, names[n]);
+	return fbuf;
 }
 
-
-struct file_list *get_dirlist(const char *dirname, int ignore_filter_rules)
+/* Do a non-recursive scan of the named directory, possibly ignoring all
+ * exclude rules except for the daemon's.  If "dlen" is >=0, it is the length
+ * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
+ * buffer (the functions we call will append names onto the end, but the old
+ * dir value will be restored on exit). */
+struct file_list *get_dirlist(char *dirname, int dlen,
+			      int ignore_filter_rules)
 {
 	struct file_list *dirlist;
 	char dirbuf[MAXPATHLEN];
-	int dlen;
 	int save_recurse = recurse;
 
-	dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
-	if (dlen >= MAXPATHLEN)
-		return NULL;
+	if (dlen < 0) {
+		dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
+		if (dlen >= MAXPATHLEN)
+			return NULL;
+		dirname = dirbuf;
+	}
 
 	dirlist = flist_new(WITHOUT_HLINK, "get_dirlist");
+
 	recurse = 0;
-	send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen);
+	send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen);
 	recurse = save_recurse;
+	if (do_progress)
+		flist_count_offset += dirlist->count;
 
 	clean_flist(dirlist, 0, 0);
 
-	return dirlist;
-}
-
-
-static int deletion_count = 0; /* used to implement --max-delete */
-
-static int is_backup_file(char *fn)
-{
-	int k = strlen(fn) - backup_suffix_len;
-	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
-}
-
-
-/* Delete a file or directory.  If DEL_FORCE_RECURSE is set in the flags, or if
- * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE
- * is not set in the flags. */
-int delete_file(char *fname, int mode, int flags)
-{
-	struct file_list *dirlist;
-	char buf[MAXPATHLEN];
-	int j, zap_dir, ok;
-	void *save_filters;
-
-	if (max_delete && deletion_count >= max_delete)
-		return -1;
-
-	if (!S_ISDIR(mode)) {
-		if (make_backups && (backup_dir || !is_backup_file(fname)))
-			ok = make_backup(fname);
-		else
-			ok = robust_unlink(fname) == 0;
-		if (ok) {
-			if ((verbose || log_format) && !(flags & DEL_TERSE))
-				log_delete(fname, mode);
-			deletion_count++;
-			return 0;
-		}
-		if (errno == ENOENT)
-			return 0;
-		rsyserr(FERROR, errno, "delete_file: unlink %s failed",
-			full_fname(fname));
-		return -1;
-	}
-
-	zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
-		&& !(flags & DEL_NO_RECURSE);
-	if (dry_run && zap_dir) {
-		ok = 0;
-		errno = ENOTEMPTY;
-	} else if (make_backups && !backup_dir && !is_backup_file(fname)
-	    && !(flags & DEL_FORCE_RECURSE))
-		ok = make_backup(fname);
-	else
-		ok = do_rmdir(fname) == 0;
-	if (ok) {
-		if ((verbose || log_format) && !(flags & DEL_TERSE))
-			log_delete(fname, mode);
-		deletion_count++;
-		return 0;
-	}
-	if (errno == ENOENT)
-		return 0;
-	if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
-		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
-			full_fname(fname));
-		return -1;
-	}
-	flags |= DEL_FORCE_RECURSE;
-
-	save_filters = push_local_filters(fname, strlen(fname));
-
-	dirlist = get_dirlist(fname, 0);
-	for (j = dirlist->count; j--; ) {
-		struct file_struct *fp = dirlist->files[j];
-		f_name_to(fp, buf);
-		if (delete_file(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
-			flist_free(dirlist);
-			return -1;
-		}
-	}
-	flist_free(dirlist);
-
-	pop_local_filters(save_filters);
-
-	if (max_delete && deletion_count >= max_delete)
-		return -1;
-
-	if (do_rmdir(fname) == 0) {
-		if ((verbose || log_format) && !(flags & DEL_TERSE))
-			log_delete(fname, mode);
-		deletion_count++;
-	} else if (errno != ENOTEMPTY && errno != ENOENT) {
-		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
-			full_fname(fname));
-		return -1;
-	}
-
-	return 0;
-}
-
-
-/* If an item in dir_list is not found in full_list, delete it from the
- * filesystem. */
-static void delete_missing(struct file_list *full_list,
-			   struct file_list *dir_list, const char *dirname)
-{
-	char fbuf[MAXPATHLEN];
-	int i;
-
-	if (max_delete && deletion_count >= max_delete)
-		return;
-
-	if (verbose > 2)
-		rprintf(FINFO, "delete_missing(%s)\n", safe_fname(dirname));
-
-	for (i = dir_list->count; i--; ) {
-		if (!dir_list->files[i]->basename)
-			continue;
-		if (flist_find(full_list, dir_list->files[i]) < 0) {
-			char *fn = f_name_to(dir_list->files[i], fbuf);
-			int mode = dir_list->files[i]->mode;
-			if (delete_file(fn, mode, DEL_FORCE_RECURSE) < 0)
-				break;
-		}
-	}
-}
-
-
-/* This function is used to implement per-directory deletion, and
- * is used by all the --delete-WHEN options.  Note that the fbuf
- * pointer must point to a MAXPATHLEN buffer with the name of the
- * directory in it (the functions we call will append names onto
- * the end, but the old dir value will be restored on exit). */
-void delete_in_dir(struct file_list *flist, char *fbuf,
-		   struct file_struct *file)
-{
-	static int min_depth = MAXPATHLEN, cur_depth = -1;
-	static void *filt_array[MAXPATHLEN/2+1];
-	struct file_list *dir_list;
-	STRUCT_STAT st;
-	int dlen;
-
-	if (!flist) {
-		while (cur_depth >= min_depth)
-			pop_local_filters(filt_array[cur_depth--]);
-		min_depth = MAXPATHLEN;
-		cur_depth = -1;
-		return;
-	}
-	if (file->dir.depth >= MAXPATHLEN/2+1)
-		return; /* Impossible... */
-
-	if (max_delete && deletion_count >= max_delete)
-		return;
-
-	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
-		rprintf(FINFO,
-			"IO error encountered -- skipping file deletion\n");
-		max_delete = -1; /* avoid duplicating the above warning */
-		return;
-	}
-
-	while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
-		pop_local_filters(filt_array[cur_depth--]);
-	cur_depth = file->dir.depth;
-	if (min_depth > cur_depth)
-		min_depth = cur_depth;
-	dlen = strlen(fbuf);
-	filt_array[cur_depth] = push_local_filters(fbuf, dlen);
-
-	if (link_stat(fbuf, &st, keep_dirlinks) < 0)
-		return;
-
-	if (one_file_system && file->flags & FLAG_TOP_DIR)
-		filesystem_dev = st.st_dev;
-
-	dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
-
-	recurse = 0;
-	send_directory(-1, dir_list, fbuf, dlen);
-	recurse = -1;
-	fbuf[dlen] = '\0';
-
-	clean_flist(dir_list, 0, 0);
-
 	if (verbose > 3)
-		output_flist(dir_list, "delete");
-
-	delete_missing(flist, dir_list, fbuf);
+		output_flist(dirlist);
 
-	flist_free(dir_list);
+	return dirlist;
 }