X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f14b3ef43028984105202aee81b679324c260394..8e41b68e8f975c02a5d9281be780ba5d1a385107:/flist.c

diff --git a/flist.c b/flist.c
index 9bdf89c1..e33cd585 100644
--- a/flist.c
+++ b/flist.c
@@ -7,8 +7,9 @@
  * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -38,6 +38,7 @@ extern int module_id;
 extern int ignore_errors;
 extern int numeric_ids;
 extern int recurse;
+extern int use_qsort;
 extern int xfer_dirs;
 extern int filesfrom_fd;
 extern int one_file_system;
@@ -49,8 +50,8 @@ extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_devices;
 extern int preserve_specials;
-extern int preserve_uid;
-extern int preserve_gid;
+extern int uid_ndx;
+extern int gid_ndx;
 extern int relative_paths;
 extern int implied_dirs;
 extern int file_extra_cnt;
@@ -70,6 +71,14 @@ extern struct chmod_mode_struct *chmod_modes;
 extern struct filter_list_struct filter_list;
 extern struct filter_list_struct server_filter_list;
 
+#ifdef ICONV_OPTION
+extern int ic_ndx;
+extern int need_unsorted_flist;
+extern iconv_t ic_send, ic_recv;
+#endif
+
+#define PTR_SIZE (sizeof (struct file_struct *))
+
 int io_error;
 int checksum_len;
 dev_t filesystem_dev; /* used to implement -x */
@@ -91,8 +100,9 @@ static char tmp_sum[MAX_DIGEST_LEN];
 
 static char empty_sum[MAX_DIGEST_LEN];
 static int flist_count_offset; /* for --delete --progress */
+static int dir_count = 0;
 
-static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void clean_flist(struct file_list *flist, int strip_root);
 static void output_flist(struct file_list *flist);
 
 void init_flist(void)
@@ -135,7 +145,7 @@ static void finish_filelist_progress(const struct file_list *flist)
 	if (do_progress) {
 		/* This overwrites the progress line */
 		rprintf(FINFO, "%d file%sto consider\n",
-			flist->count, flist->count == 1 ? " " : "s ");
+			flist->used, flist->used == 1 ? " " : "s ");
 	} else
 		rprintf(FINFO, "done\n");
 }
@@ -197,12 +207,12 @@ static int readlink_stat(const char *path, STRUCT_STAT *stp, char *linkbuf)
 				rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
 					path, linkbuf);
 			}
-			return do_stat(path, stp);
+			return x_stat(path, stp, NULL);
 		}
 	}
 	return 0;
 #else
-	return do_stat(path, stp);
+	return x_stat(path, stp, NULL);
 #endif
 }
 
@@ -210,17 +220,17 @@ int link_stat(const char *path, STRUCT_STAT *stp, int follow_dirlinks)
 {
 #ifdef SUPPORT_LINKS
 	if (copy_links)
-		return do_stat(path, stp);
-	if (do_lstat(path, stp) < 0)
+		return x_stat(path, stp, NULL);
+	if (x_lstat(path, stp, NULL) < 0)
 		return -1;
 	if (follow_dirlinks && S_ISLNK(stp->st_mode)) {
 		STRUCT_STAT st;
-		if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+		if (x_stat(path, &st, NULL) == 0 && S_ISDIR(st.st_mode))
 			*stp = st;
 	}
 	return 0;
 #else
-	return do_stat(path, stp);
+	return x_stat(path, stp, NULL);
 #endif
 }
 
@@ -255,42 +265,19 @@ static int is_excluded(char *fname, int is_dir, int filter_level)
 	return 0;
 }
 
-static int to_wire_mode(mode_t mode)
-{
-#ifdef SUPPORT_LINKS
-#if _S_IFLNK != 0120000
-	if (S_ISLNK(mode))
-		return (mode & ~(_S_IFMT)) | 0120000;
-#endif
-#endif
-	return mode;
-}
-
-static mode_t from_wire_mode(int mode)
-{
-#if _S_IFLNK != 0120000
-	if ((mode & (_S_IFMT)) == 0120000)
-		return (mode & ~(_S_IFMT)) | _S_IFLNK;
-#endif
-	return mode;
-}
-
-static void send_directory(int f, struct file_list *flist, int ndx,
+static void send_directory(int f, struct file_list *flist,
 			   char *fbuf, int len, int flags);
 
-static const char *flist_dir, *orig_dir;
-static int flist_dir_len;
+static const char *pathname, *orig_dir;
+static int pathname_len;
 
 
-/**
- * Make sure @p flist is big enough to hold at least @p flist->count
- * entries.
- **/
-void flist_expand(struct file_list *flist)
+/* Make sure flist can hold at least flist->used + extra entries. */
+static void flist_expand(struct file_list *flist, int extra)
 {
 	struct file_struct **new_ptr;
 
-	if (flist->count < flist->malloced)
+	if (flist->used + extra <= flist->malloced)
 		return;
 
 	if (flist->malloced < FLIST_START)
@@ -300,12 +287,10 @@ void flist_expand(struct file_list *flist)
 	else
 		flist->malloced *= 2;
 
-	/*
-	 * In case count jumped or we are starting the list
-	 * with a known size just set it.
-	 */
-	if (flist->malloced < flist->count)
-		flist->malloced = flist->count;
+	/* In case count jumped or we are starting the list
+	 * with a known size just set it. */
+	if (flist->malloced < flist->used + extra)
+		flist->malloced = flist->used + extra;
 
 	new_ptr = realloc_array(flist->files, struct file_struct *,
 				flist->malloced);
@@ -323,15 +308,24 @@ void flist_expand(struct file_list *flist)
 		out_of_memory("flist_expand");
 }
 
-int push_flist_dir(const char *dir, int len)
+static void flist_done_allocating(struct file_list *flist)
 {
-	if (dir == flist_dir)
+	void *ptr = pool_boundary(flist->file_pool, 8*1024);
+	if (flist->pool_boundary == ptr)
+		flist->pool_boundary = NULL; /* list didn't use any pool memory */
+	else
+		flist->pool_boundary = ptr;
+}
+
+int push_pathname(const char *dir, int len)
+{
+	if (dir == pathname)
 		return 1;
 
 	if (!orig_dir)
 		orig_dir = strdup(curr_dir);
 
-	if (flist_dir && !pop_dir(orig_dir)) {
+	if (pathname && !pop_dir(orig_dir)) {
 		rsyserr(FERROR, errno, "pop_dir %s failed",
 			full_fname(orig_dir));
 		exit_cleanup(RERR_FILESELECT);
@@ -344,8 +338,8 @@ int push_flist_dir(const char *dir, int len)
 		return 0;
 	}
 
-	flist_dir = dir;
-	flist_dir_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0;
+	pathname = dir;
+	pathname_len = len >= 0 ? len : dir ? (int)strlen(dir) : 0;
 
 	return 1;
 }
@@ -366,7 +360,35 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	int l1, l2;
 	int flags;
 
-	f_name(file, fname);
+#ifdef ICONV_OPTION
+	if (ic_send != (iconv_t)-1) {
+		ICONV_CONST char *ibuf;
+		char *obuf = fname;
+		size_t ocnt = MAXPATHLEN, icnt;
+
+		iconv(ic_send, NULL,0, NULL,0);
+		if ((ibuf = (ICONV_CONST char *)file->dirname) != NULL) {
+		    icnt = strlen(ibuf);
+		    ocnt--; /* pre-subtract the space for the '/' */
+		    if (iconv(ic_send, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1)
+			goto convert_error;
+		    *obuf++ = '/';
+		}
+
+		ibuf = (ICONV_CONST char *)file->basename;
+		icnt = strlen(ibuf);
+		if (iconv(ic_send, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) {
+		  convert_error:
+			io_error |= IOERR_GENERAL;
+			rprintf(FINFO,
+			    "[%s] cannot convert filename: %s (%s)\n",
+			    who_am_i(), f_name(file, fname), strerror(errno));
+			return;
+		}
+		*obuf = '\0';
+	} else
+#endif
+		f_name(file, fname);
 
 	flags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
 
@@ -392,24 +414,24 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 		}
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
-	if (preserve_uid) {
-		if (F_UID(file) == uid && *lastname)
+	if (uid_ndx) {
+		if ((uid_t)F_OWNER(file) == uid && *lastname)
 			flags |= XMIT_SAME_UID;
 		else {
-			uid = F_UID(file);
-			if (preserve_uid && !numeric_ids) {
+			uid = F_OWNER(file);
+			if (uid_ndx && !numeric_ids) {
 				user_name = add_uid(uid);
 				if (inc_recurse && user_name)
 					flags |= XMIT_USER_NAME_FOLLOWS;
 			}
 		}
 	}
-	if (preserve_gid) {
-		if (F_GID(file) == gid && *lastname)
+	if (gid_ndx) {
+		if ((gid_t)F_GROUP(file) == gid && *lastname)
 			flags |= XMIT_SAME_GID;
 		else {
-			gid = F_GID(file);
-			if (preserve_gid && !numeric_ids) {
+			gid = F_GROUP(file);
+			if (gid_ndx && !numeric_ids) {
 				group_name = add_gid(gid);
 				if (inc_recurse && group_name)
 					flags |= XMIT_GROUP_NAME_FOLLOWS;
@@ -491,7 +513,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	}
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
-	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+	if (uid_ndx && !(flags & XMIT_SAME_UID)) {
 		if (protocol_version < 30)
 			write_int(f, uid);
 		else {
@@ -503,7 +525,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			}
 		}
 	}
-	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+	if (gid_ndx && !(flags & XMIT_SAME_GID)) {
 		if (protocol_version < 30)
 			write_int(f, gid);
 		else {
@@ -575,7 +597,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 }
 
 static struct file_struct *recv_file_entry(struct file_list *flist,
-					   int flags, int f)
+					   int xflags, int f)
 {
 	static int64 modtime;
 	static mode_t mode;
@@ -584,6 +606,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	static uint32 rdev_major;
 	static uid_t uid;
 	static gid_t gid;
+	static uint16 gid_flags;
 	static char lastname[MAXPATHLEN], *lastdir;
 	static int lastdir_depth, lastdir_len = -1;
 	static unsigned int del_hier_name_len = 0;
@@ -595,21 +618,22 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	int first_hlink_ndx = -1;
 	OFF_T file_length;
 	const char *basename;
-	char *bp;
 	struct file_struct *file;
+	alloc_pool_t *pool;
+	char *bp;
 
-	if (flags & XMIT_SAME_NAME)
+	if (xflags & XMIT_SAME_NAME)
 		l1 = read_byte(f);
 
-	if (flags & XMIT_LONG_NAME)
+	if (xflags & XMIT_LONG_NAME)
 		l2 = read_varint30(f);
 	else
 		l2 = read_byte(f);
 
 	if (l2 >= MAXPATHLEN - l1) {
 		rprintf(FERROR,
-			"overflow: flags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
-			flags, l1, l2, lastname, who_am_i());
+			"overflow: xflags=0x%x l1=%d l2=%d lastname=%s [%s]\n",
+			xflags, l1, l2, lastname, who_am_i());
 		overflow_exit("recv_file_entry");
 	}
 
@@ -617,7 +641,32 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	read_sbuf(f, &thisname[l1], l2);
 	thisname[l1 + l2] = 0;
 
-	strlcpy(lastname, thisname, MAXPATHLEN);
+	/* Abuse basename_len for a moment... */
+	basename_len = strlcpy(lastname, thisname, MAXPATHLEN);
+
+#ifdef ICONV_OPTION
+	if (ic_recv != (iconv_t)-1) {
+		char *obuf = thisname;
+		ICONV_CONST char *ibuf = (ICONV_CONST char *)lastname;
+		size_t ocnt = MAXPATHLEN, icnt = basename_len;
+
+		if (icnt >= MAXPATHLEN) {
+			errno = E2BIG;
+			goto convert_error;
+		}
+
+		iconv(ic_recv, NULL,0, NULL,0);
+		if (iconv(ic_recv, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) {
+		  convert_error:
+			io_error |= IOERR_GENERAL;
+			rprintf(FINFO,
+			    "[%s] cannot convert filename: %s (%s)\n",
+			    who_am_i(), lastname, strerror(errno));
+			obuf = thisname;
+		}
+		*obuf = '\0';
+	}
+#endif
 
 	clean_fname(thisname, 0);
 
@@ -639,28 +688,28 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 #ifdef SUPPORT_HARD_LINKS
 	if (protocol_version >= 30
-	 && BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
+	 && BITS_SETnUNSET(xflags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
 		struct file_struct *first;
 		first_hlink_ndx = read_varint30(f);
-		if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
+		if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->used) {
 			rprintf(FERROR,
 				"hard-link reference out of range: %d (%d)\n",
-				first_hlink_ndx, flist->count);
+				first_hlink_ndx, flist->used);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 		first = flist->files[first_hlink_ndx];
 		file_length = F_LENGTH(first);
 		modtime = first->modtime;
 		mode = first->mode;
-		if (preserve_uid)
-			uid = F_UID(first);
-		if (preserve_gid)
-			gid = F_GID(first);
+		if (uid_ndx)
+			uid = F_OWNER(first);
+		if (gid_ndx)
+			gid = F_GROUP(first);
 		if ((preserve_devices && IS_DEVICE(mode))
 		 || (preserve_specials && IS_SPECIAL(mode))) {
 			uint32 *devp = F_RDEV_P(first);
 			rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
-			extra_len += 2 * EXTRA_LEN;
+			extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 		}
 		if (preserve_links && S_ISLNK(mode))
 			linkname_len = strlen(F_SYMLINK(first)) + 1;
@@ -671,7 +720,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #endif
 
 	file_length = read_varlong30(f, 3);
-	if (!(flags & XMIT_SAME_TIME)) {
+	if (!(xflags & XMIT_SAME_TIME)) {
 		if (protocol_version >= 30) {
 			modtime = read_varlong(f, 4);
 #if SIZEOF_TIME_T < SIZEOF_INT64
@@ -684,53 +733,54 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		} else
 			modtime = read_int(f);
 	}
-	if (!(flags & XMIT_SAME_MODE))
+	if (!(xflags & XMIT_SAME_MODE))
 		mode = from_wire_mode(read_int(f));
 
 	if (chmod_modes && !S_ISLNK(mode))
 		mode = tweak_mode(mode, chmod_modes);
 
-	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
 		if (protocol_version < 30)
 			uid = (uid_t)read_int(f);
 		else {
 			uid = (uid_t)read_varint(f);
-			if (flags & XMIT_USER_NAME_FOLLOWS)
+			if (xflags & XMIT_USER_NAME_FOLLOWS)
 				uid = recv_user_name(f, uid);
 			else if (inc_recurse && am_root && !numeric_ids)
 				uid = match_uid(uid);
 		}
 	}
-	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+	if (gid_ndx && !(xflags & XMIT_SAME_GID)) {
 		if (protocol_version < 30)
 			gid = (gid_t)read_int(f);
 		else {
 			gid = (gid_t)read_varint(f);
-			if (flags & XMIT_GROUP_NAME_FOLLOWS)
-				gid = recv_group_name(f, gid);
+			gid_flags = 0;
+			if (xflags & XMIT_GROUP_NAME_FOLLOWS)
+				gid = recv_group_name(f, gid, &gid_flags);
 			else if (inc_recurse && (!am_root || !numeric_ids))
-				gid = match_gid(gid);
+				gid = match_gid(gid, &gid_flags);
 		}
 	}
 
 	if ((preserve_devices && IS_DEVICE(mode))
 	 || (preserve_specials && IS_SPECIAL(mode))) {
 		if (protocol_version < 28) {
-			if (!(flags & XMIT_SAME_RDEV_pre28))
+			if (!(xflags & XMIT_SAME_RDEV_pre28))
 				rdev = (dev_t)read_int(f);
 		} else {
 			uint32 rdev_minor;
-			if (!(flags & XMIT_SAME_RDEV_MAJOR))
+			if (!(xflags & XMIT_SAME_RDEV_MAJOR))
 				rdev_major = read_varint30(f);
 			if (protocol_version >= 30)
 				rdev_minor = read_varint(f);
-			else if (flags & XMIT_RDEV_MINOR_8_pre30)
+			else if (xflags & XMIT_RDEV_MINOR_8_pre30)
 				rdev_minor = read_byte(f);
 			else
 				rdev_minor = read_int(f);
 			rdev = MAKEDEV(rdev_major, rdev_minor);
 		}
-		extra_len += 2 * EXTRA_LEN;
+		extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 		file_length = 0;
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
@@ -752,8 +802,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
   create_object:
 	if (preserve_hard_links) {
 		if (protocol_version < 28 && S_ISREG(mode))
-			flags |= XMIT_HLINKED;
-		if (flags & XMIT_HLINKED)
+			xflags |= XMIT_HLINKED;
+		if (xflags & XMIT_HLINKED)
 			extra_len += EXTRA_LEN;
 	}
 #endif
@@ -778,14 +828,15 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	if (inc_recurse && S_ISDIR(mode)) {
 		if (one_file_system) {
 			/* Room to save the dir's device for -x */
-			extra_len += 2 * EXTRA_LEN;
+			extra_len += DEV_EXTRA_CNT * EXTRA_LEN;
 		}
-		flist = dir_flist;
-	}
+		pool = dir_flist->file_pool;
+	} else
+		pool = flist->file_pool;
 
 	alloc_len = FILE_STRUCT_LEN + extra_len + basename_len
 		  + linkname_len;
-	bp = pool_alloc(flist->file_pool, alloc_len, "recv_file_entry");
+	bp = pool_alloc(pool, alloc_len, "recv_file_entry");
 
 	memset(bp, 0, extra_len + FILE_STRUCT_LEN);
 	bp += extra_len;
@@ -796,7 +847,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	bp += basename_len + linkname_len; /* skip space for symlink too */
 
 #ifdef SUPPORT_HARD_LINKS
-	if (flags & XMIT_HLINKED)
+	if (xflags & XMIT_HLINKED)
 		file->flags |= FLAG_HLINKED;
 #endif
 	file->modtime = (time_t)modtime;
@@ -806,10 +857,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		OPT_EXTRA(file, 0)->unum = (uint32)(file_length >> 32);
 	}
 	file->mode = mode;
-	if (preserve_uid)
+	if (uid_ndx)
 		F_OWNER(file) = uid;
-	if (preserve_gid)
+	if (gid_ndx) {
 		F_GROUP(file) = gid;
+		file->flags |= gid_flags;
+	}
+#ifdef ICONV_OPTION
+	if (ic_ndx)
+		F_NDX(file) = flist->used + flist->ndx_start;
+#endif
 
 	if (basename != thisname) {
 		file->dirname = lastdir;
@@ -820,7 +877,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	if (S_ISDIR(mode)) {
 		if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
 			F_DEPTH(file)--;
-		if (flags & XMIT_TOP_DIR) {
+		if (xflags & XMIT_TOP_DIR) {
 			in_del_hier = recurse;
 			del_hier_name_len = F_DEPTH(file) == 0 ? 0 : l1 + l2;
 			if (relative_paths && del_hier_name_len > 2
@@ -859,10 +916,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #endif
 
 #ifdef SUPPORT_HARD_LINKS
-	if (preserve_hard_links && flags & XMIT_HLINKED) {
+	if (preserve_hard_links && xflags & XMIT_HLINKED) {
 		if (protocol_version >= 30) {
-			F_HL_GNUM(file) = flags & XMIT_HLINK_FIRST
-					? flist->count : first_hlink_ndx;
+			F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
+					? flist->used : first_hlink_ndx;
 		} else {
 			static int32 cnt = 0;
 			struct idev_node *np;
@@ -872,7 +929,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 				dev = read_int(f);
 				ino = read_int(f);
 			} else {
-				if (!(flags & XMIT_SAME_DEV_pre30))
+				if (!(xflags & XMIT_SAME_DEV_pre30))
 					dev = read_longint(f);
 				ino = read_longint(f);
 			}
@@ -889,7 +946,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 	if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
 		if (S_ISREG(mode))
-			bp = (char*)F_SUM(file);
+			bp = F_SUM(file);
 		else {
 			/* Prior to 28, we get a useless set of nulls. */
 			bp = tmp_sum;
@@ -943,10 +1000,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	int alloc_len, basename_len, linkname_len;
 	int extra_len = file_extra_cnt * EXTRA_LEN;
 	const char *basename;
+	alloc_pool_t *pool;
 	char *bp;
 
-	if (strlcpy(thisname, fname, sizeof thisname)
-	    >= sizeof thisname - flist_dir_len) {
+	if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
 		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}
@@ -970,7 +1027,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		if (save_errno == ENOENT) {
 #ifdef SUPPORT_LINKS
 			/* Avoid "vanished" error if symlink points nowhere. */
-			if (copy_links && do_lstat(thisname, &st) == 0
+			if (copy_links && x_lstat(thisname, &st, NULL) == 0
 			    && S_ISLNK(st.st_mode)) {
 				io_error |= IOERR_GENERAL;
 				rprintf(FERROR, "symlink has no referent: %s\n",
@@ -1033,12 +1090,17 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
   skip_filters:
 
 	/* Only divert a directory in the main transfer. */
-	if (flist && flist->prev && S_ISDIR(st.st_mode)
-	 && flags & FLAG_DIVERT_DIRS) {
-		flist = dir_flist;
-		/* Room for parent/sibling/next-child info. */
-		extra_len += 3 * EXTRA_LEN;
-	}
+	if (flist) {
+		if (flist->prev && S_ISDIR(st.st_mode)
+		 && flags & FLAG_DIVERT_DIRS) {
+			/* Room for parent/sibling/next-child info. */
+			extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN;
+			dir_count++;
+			pool = dir_flist->file_pool;
+		} else
+			pool = flist->file_pool;
+	} else
+		pool = NULL;
 
 	if (verbose > 2) {
 		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
@@ -1073,8 +1135,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 
 	alloc_len = FILE_STRUCT_LEN + extra_len + basename_len
 		  + linkname_len;
-	if (flist)
-		bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
+	if (pool)
+		bp = pool_alloc(pool, alloc_len, "make_file");
 	else {
 		if (!(bp = new_array(char, alloc_len)))
 			out_of_memory("make_file");
@@ -1115,9 +1177,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		OPT_EXTRA(file, 0)->unum = (uint32)(st.st_size >> 32);
 	}
 	file->mode = st.st_mode;
-	if (preserve_uid)
+	if (uid_ndx)
 		F_OWNER(file) = st.st_uid;
-	if (preserve_gid)
+	if (gid_ndx)
 		F_GROUP(file) = st.st_gid;
 
 	if (basename != thisname)
@@ -1133,7 +1195,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	if (always_checksum && am_sender && S_ISREG(st.st_mode))
 		file_checksum(thisname, tmp_sum, st.st_size);
 
-	F_ROOTDIR(file) = flist_dir;
+	F_PATHNAME(file) = pathname;
 
 	/* This code is only used by the receiver when it is building
 	 * a list of files for a delete pass. */
@@ -1142,13 +1204,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		int save_mode = file->mode;
 		file->mode = S_IFDIR; /* Find a directory with our name. */
 		if (flist_find(dir_flist, file) >= 0
-		    && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
+		 && x_stat(thisname, &st2, NULL) == 0 && S_ISDIR(st2.st_mode)) {
 			file->modtime = st2.st_mtime;
 			file->len32 = 0;
 			file->mode = st2.st_mode;
-			if (preserve_uid)
+			if (uid_ndx)
 				F_OWNER(file) = st2.st_uid;
-			if (preserve_gid)
+			if (gid_ndx)
 				F_GROUP(file) = st2.st_gid;
 		} else
 			file->mode = save_mode;
@@ -1157,10 +1219,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	if (basename_len == 0+1)
 		return NULL;
 
-	if (inc_recurse && flist == dir_flist) {
-		flist_expand(flist);
-		flist->files[flist->count++] = file;
-	}
+#ifdef ICONV_OPTION
+	if (ic_ndx)
+		F_NDX(file) = dir_count - 1;
+#endif
 
 	return file;
 }
@@ -1178,14 +1240,14 @@ void unmake_file(struct file_struct *file)
 
 static struct file_struct *send_file_name(int f, struct file_list *flist,
 					  char *fname, STRUCT_STAT *stp,
-					  int flags, int filter_flags)
+					  int flags, int filter_level)
 {
 	struct file_struct *file;
 #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
 	statx sx;
 #endif
 
-	file = make_file(fname, flist, stp, flags, filter_flags);
+	file = make_file(fname, flist, stp, flags, filter_level);
 	if (!file)
 		return NULL;
 
@@ -1208,12 +1270,12 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 	}
 #endif
 
-	maybe_emit_filelist_progress(flist->count + flist_count_offset);
+	maybe_emit_filelist_progress(flist->used + flist_count_offset);
 
-	flist_expand(flist);
-	flist->files[flist->count++] = file;
+	flist_expand(flist, 1);
+	flist->files[flist->used++] = file;
 	if (f >= 0) {
-		send_file_entry(f, file, flist->count - 1);
+		send_file_entry(f, file, flist->used - 1);
 #ifdef SUPPORT_ACLS
 		if (preserve_acls && !S_ISLNK(file->mode)) {
 			send_acl(&sx, f);
@@ -1250,7 +1312,7 @@ static void send_if_directory(int f, struct file_list *flist,
 			return;
 		}
 		save_filters = push_local_filters(fbuf, len);
-		send_directory(f, flist, -1, fbuf, len, flags);
+		send_directory(f, flist, fbuf, len, flags);
 		pop_local_filters(save_filters);
 		fbuf[ol] = '\0';
 		if (is_dot_dir)
@@ -1258,36 +1320,106 @@ static void send_if_directory(int f, struct file_list *flist,
 	}
 }
 
-static int file_compare(struct file_struct **file1, struct file_struct **file2)
+static int file_compare(const void *file1, const void *file2)
 {
-	return f_name_cmp(*file1, *file2);
+	return f_name_cmp(*(struct file_struct **)file1,
+			  *(struct file_struct **)file2);
 }
 
-/* We take an entire set of sibling dirs from dir_flist (start <= ndx <= end),
- * sort them by name, and link them into the tree, setting the appropriate
- * parent/child/sibling pointers. */
-static void add_dirs_to_tree(int parent_ndx, int start, int end)
+/* The guts of a merge-sort algorithm.  This was derived from the glibc
+ * version, but I (Wayne) changed the merge code to do less copying and
+ * to require only half the amount of temporary memory. */
+static void fsort_tmp(struct file_struct **fp, size_t num,
+		      struct file_struct **tmp)
+{
+	struct file_struct **f1, **f2, **t;
+	size_t n1, n2;
+
+	n1 = num / 2;
+	n2 = num - n1;
+	f1 = fp;
+	f2 = fp + n1;
+
+	if (n1 > 1)
+		fsort_tmp(f1, n1, tmp);
+	if (n2 > 1)
+		fsort_tmp(f2, n2, tmp);
+
+	while (f_name_cmp(*f1, *f2) <= 0) {
+		if (!--n1)
+			return;
+		f1++;
+	}
+
+	t = tmp;
+	memcpy(t, f1, n1 * PTR_SIZE);
+
+	*f1++ = *f2++, n2--;
+
+	while (n1 > 0 && n2 > 0) {
+		if (f_name_cmp(*t, *f2) <= 0)
+			*f1++ = *t++, n1--;
+		else
+			*f1++ = *f2++, n2--;
+	}
+
+	if (n1 > 0)
+		memcpy(f1, t, n1 * PTR_SIZE);
+}
+
+/* This file-struct sorting routine makes sure that any identical names in
+ * the file list stay in the same order as they were in the original list.
+ * This is particularly vital in inc_recurse mode where we expect a sort
+ * on the flist to match the exact order of a sort on the dir_flist. */
+static void fsort(struct file_struct **fp, size_t num)
+{
+	if (num <= 1)
+		return;
+
+	if (use_qsort)
+		qsort(fp, num, PTR_SIZE, file_compare);
+	else {
+		struct file_struct **tmp = new_array(struct file_struct *,
+						     (num+1) / 2);
+		fsort_tmp(fp, num, tmp);
+		free(tmp);
+	}
+}
+
+/* We take an entire set of sibling dirs from the sorted flist and link them
+ * into the tree, setting the appropriate parent/child/sibling pointers. */
+static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
+			     int dir_cnt)
 {
 	int i;
 	int32 *dp = NULL;
 	int32 *parent_dp = parent_ndx < 0 ? NULL
-			 : F_DIRNODE_P(dir_flist->files[parent_ndx]);
+			 : F_DIR_NODE_P(dir_flist->sorted[parent_ndx]);
+
+	flist_expand(dir_flist, dir_cnt);
+	dir_flist->sorted = dir_flist->files;
+
+	for (i = 0; dir_cnt; i++) {
+		struct file_struct *file = from_flist->sorted[i];
+
+		if (!S_ISDIR(file->mode))
+			continue;
 
-	qsort(dir_flist->files + start, end - start + 1,
-	      sizeof dir_flist->files[0], (int (*)())file_compare);
+		dir_flist->files[dir_flist->used++] = file;
+		dir_cnt--;
 
-	for (i = start; i <= end; i++) {
-		struct file_struct *file = dir_flist->files[i];
 		if (!(file->flags & FLAG_XFER_DIR)
 		 || file->flags & FLAG_MOUNT_DIR)
 			continue;
+
 		if (dp)
-			DIR_NEXT_SIBLING(dp) = i;
+			DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
 		else if (parent_dp)
-			DIR_FIRST_CHILD(parent_dp) = i;
+			DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1;
 		else
-			send_dir_ndx = i;
-		dp = F_DIRNODE_P(file);
+			send_dir_ndx = dir_flist->used - 1;
+
+		dp = F_DIR_NODE_P(file);
 		DIR_PARENT(dp) = parent_ndx;
 		DIR_FIRST_CHILD(dp) = -1;
 	}
@@ -1300,16 +1432,16 @@ static void add_dirs_to_tree(int parent_ndx, int start, int end)
  * 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, int parent_ndx,
-			   char *fbuf, int len, int flags)
+static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+			   int flags)
 {
 	struct dirent *di;
 	unsigned remainder;
 	char *p;
 	DIR *d;
 	int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
-	int start = divert_dirs ? dir_flist->count : flist->count;
-	int filter_flags = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
+	int start = flist->used;
+	int filter_level = f == -2 ? SERVER_FILTERS : ALL_FILTERS;
 
 	assert(flist != NULL);
 
@@ -1338,7 +1470,7 @@ static void send_directory(int f, struct file_list *flist, int parent_ndx,
 			continue;
 		}
 
-		send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
+		send_file_name(f, flist, fbuf, NULL, flags, filter_level);
 	}
 
 	fbuf[len] = '\0';
@@ -1350,22 +1482,34 @@ static void send_directory(int f, struct file_list *flist, int parent_ndx,
 
 	closedir(d);
 
-	if (f < 0)
-		return;
-
-	if (divert_dirs)
-		add_dirs_to_tree(parent_ndx, start, dir_flist->count - 1);
-	else if (recurse) {
-		int i, end = flist->count - 1;
-		/* send_if_directory() bumps flist->count, so use "end". */
+	if (f >= 0 && recurse && !divert_dirs) {
+		int i, end = flist->used - 1;
+		/* send_if_directory() bumps flist->used, so use "end". */
 		for (i = start; i <= end; i++)
 			send_if_directory(f, flist, flist->files[i], fbuf, len, flags);
 	}
 }
 
-void send_extra_file_list(int f, int at_least)
+static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 {
 	char fbuf[MAXPATHLEN];
+	int dlen;
+
+	f_name(file, fbuf);
+	dlen = strlen(fbuf);
+
+	if (F_PATHNAME(file) != pathname) {
+		if (!push_pathname(F_PATHNAME(file), -1))
+			exit_cleanup(RERR_FILESELECT);
+	}
+
+	change_local_filter_dir(fbuf, dlen, send_dir_depth);
+
+	send_directory(f, flist, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
+}
+
+void send_extra_file_list(int f, int at_least)
+{
 	struct file_list *flist;
 	int64 start_write;
 	int future_cnt, save_io_error = io_error;
@@ -1377,40 +1521,67 @@ void send_extra_file_list(int f, int at_least)
 	 * files in the upcoming file-lists. */
 	if (cur_flist->next) {
 		flist = first_flist->prev; /* the newest flist */
-		future_cnt = flist->count
-			   + flist->ndx_start - cur_flist->next->ndx_start;
+		future_cnt = flist->ndx_end - cur_flist->next->ndx_start + 1;
 	} else
 		future_cnt = 0;
 	while (future_cnt < at_least) {
-		struct file_struct *file = dir_flist->files[send_dir_ndx];
+		struct file_struct *file = dir_flist->sorted[send_dir_ndx];
+		int dir_ndx, dstart = dir_count;
 		int32 *dp;
-		int dlen;
-
-		f_name(file, fbuf);
-		dlen = strlen(fbuf);
-
-		if (F_ROOTDIR(file) != flist_dir) {
-			if (!push_flist_dir(F_ROOTDIR(file), -1))
-				exit_cleanup(RERR_FILESELECT);
-		}
 
 		flist = flist_new(0, "send_extra_file_list");
 		start_write = stats.total_written;
 
-		write_ndx(f, NDX_FLIST_OFFSET - send_dir_ndx);
-		change_local_filter_dir(fbuf, dlen, send_dir_depth);
-		send_directory(f, flist, send_dir_ndx, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
+#ifdef ICONV_OPTION
+		if (ic_ndx)
+			dir_ndx = F_NDX(file);
+		else
+#endif
+			dir_ndx = send_dir_ndx;
+		write_ndx(f, NDX_FLIST_OFFSET - dir_ndx);
+		flist->parent_ndx = dir_ndx;
+
+		send1extra(f, file, flist);
+		dp = F_DIR_NODE_P(file);
+
+		/* If there are any duplicate directory names that follow, we
+		 * send all the dirs together in one file-list.  The dir_flist
+		 * tree links all the child subdirs onto the last dup dir. */
+		while ((dir_ndx = DIR_NEXT_SIBLING(dp)) >= 0
+		    && dir_flist->sorted[dir_ndx]->flags & FLAG_DUPLICATE) {
+			send_dir_ndx = dir_ndx;
+			file = dir_flist->sorted[dir_ndx];
+			send1extra(f, file, flist);
+			dp = F_DIR_NODE_P(file);
+		}
+
 		write_byte(f, 0);
 
-		clean_flist(flist, 0, 0);
-		file_total += flist->count;
-		future_cnt += flist->count;
+#ifdef ICONV_OPTION
+		if (need_unsorted_flist) {
+			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
+				out_of_memory("send_extra_file_list");
+			memcpy(flist->sorted, flist->files,
+			       flist->used * sizeof (struct file_struct*));
+		} else
+#endif
+			flist->sorted = flist->files;
+
+		clean_flist(flist, 0);
+
+		flist->ndx_end = flist->ndx_start + flist->used - 1
+			       - (dir_count - dstart);
+
+		add_dirs_to_tree(send_dir_ndx, flist, dir_count - dstart);
+		flist_done_allocating(flist);
+
+		file_total += flist->used;
+		future_cnt += flist->used;
 		stats.flist_size += stats.total_written - start_write;
-		stats.num_files += flist->count;
+		stats.num_files += flist->used;
 		if (verbose > 3)
 			output_flist(flist);
 
-		dp = F_DIRNODE_P(file);
 		if (DIR_FIRST_CHILD(dp) >= 0) {
 			send_dir_ndx = DIR_FIRST_CHILD(dp);
 			send_dir_depth++;
@@ -1423,8 +1594,8 @@ void send_extra_file_list(int f, int at_least)
 					goto finish;
 				}
 				send_dir_depth--;
-				file = dir_flist->files[send_dir_ndx];
-				dp = F_DIRNODE_P(file);
+				file = dir_flist->sorted[send_dir_ndx];
+				dp = F_DIR_NODE_P(file);
 			}
 			send_dir_ndx = DIR_NEXT_SIBLING(dp);
 		}
@@ -1437,7 +1608,9 @@ void send_extra_file_list(int f, int at_least)
 
 struct file_list *send_file_list(int f, int argc, char *argv[])
 {
-	int len;
+	static const char *lastdir;
+	static int lastdir_len = -1;
+	int len, dirlen;
 	STRUCT_STAT st;
 	char *p, *dir;
 	char lastpath[MAXPATHLEN] = "";
@@ -1589,23 +1762,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			fn = ".";
 		}
 
-		if (dir && *dir) {
-			static const char *lastdir;
-			static int lastdir_len = -1;
-			int len = strlen(dir);
-
-			if (len != lastdir_len || memcmp(lastdir, dir, len) != 0) {
-				if (!push_flist_dir(strdup(dir), len))
-					goto push_error;
-				lastdir = flist_dir;
-				lastdir_len = flist_dir_len;
-			} else if (!push_flist_dir(lastdir, lastdir_len)) {
-			  push_error:
-				io_error |= IOERR_GENERAL;
-				rsyserr(FERROR, errno, "push_dir %s failed in %s",
-					full_fname(dir), curr_dir);
-				continue;
-			}
+		dirlen = dir ? strlen(dir) : 0;
+		if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0) {
+			if (!push_pathname(dir ? strdup(dir) : NULL, dirlen))
+				goto push_error;
+			lastdir = pathname;
+			lastdir_len = pathname_len;
+		} else if (!push_pathname(lastdir, lastdir_len)) {
+		  push_error:
+			io_error |= IOERR_GENERAL;
+			rsyserr(FERROR, errno, "push_dir %s failed in %s",
+				full_fname(dir), curr_dir);
+			continue;
 		}
 
 		if (fn != fbuf)
@@ -1660,9 +1828,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 		if (recurse || (xfer_dirs && is_dot_dir)) {
 			struct file_struct *file;
-			int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR
-				      | (is_dot_dir ? 0 : flags)
-				      | (inc_recurse ? FLAG_DIVERT_DIRS : 0);
+			int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR | flags;
 			file = send_file_name(f, flist, fbuf, &st,
 					      top_flags, ALL_FILTERS);
 			if (file && !inc_recurse)
@@ -1692,16 +1858,41 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
 			     + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
 
-	/* Sort the list without removing any duplicates in non-incremental
-	 * mode.  This allows the receiving side to ask for whatever name it
-	 * kept.  For incremental mode, the sender also removes duplicates
-	 * in this initial file-list so that it avoids re-sending duplicated
-	 * directories. */
-	clean_flist(flist, 0, inc_recurse);
-	file_total += flist->count;
+	/* When converting names, both sides keep an unsorted file-list array
+	 * because the names will differ on the sending and receiving sides
+	 * (both sides will use the unsorted index number for each item). */
+
+	/* Sort the list without removing any duplicates.  This allows the
+	 * receiving side to ask for whatever name it kept.  For incremental
+	 * recursion mode, the sender marks duplicate dirs so that it can
+	 * send them together in a single file-list. */
+#ifdef ICONV_OPTION
+	if (need_unsorted_flist) {
+		if (inc_recurse) {
+			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
+				out_of_memory("send_file_list");
+			memcpy(flist->sorted, flist->files,
+			       flist->used * sizeof (struct file_struct*));
+			clean_flist(flist, 0);
+		} else {
+			flist->sorted = flist->files;
+			flist->low = 0;
+			flist->high = flist->used - 1;
+		}
+	} else
+#endif
+	{
+		flist->sorted = flist->files;
+		clean_flist(flist, 0);
+	}
+	file_total += flist->used;
+
+	/* We don't subtract dir_count for the first send since we
+	 * might have one or more dot dirs which need to get sent. */
+	flist->ndx_end = flist->ndx_start + flist->used - 1;
 
 	if (!numeric_ids && !inc_recurse)
-		send_uid_list(f);
+		send_id_list(f);
 
 	/* send the io_error flag */
 	if (protocol_version < 30)
@@ -1713,7 +1904,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		io_end_buffering_out();
 
 	stats.flist_size = stats.total_written - start_write;
-	stats.num_files = flist->count;
+	stats.num_files = flist->used;
 
 	if (verbose > 3)
 		output_flist(flist);
@@ -1722,7 +1913,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		rprintf(FINFO, "send_file_list done\n");
 
 	if (inc_recurse) {
-		add_dirs_to_tree(-1, 0, dir_flist->count - 1);
+		add_dirs_to_tree(-1, flist, dir_count);
+		flist_done_allocating(flist);
 		if (send_dir_ndx < 0) {
 			write_ndx(f, NDX_FLIST_EOF);
 			flist_eof = 1;
@@ -1763,7 +1955,7 @@ struct file_list *recv_file_list(int f)
 	if (inc_recurse) {
 		if (flist->ndx_start == 0)
 			dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
-		dstart = dir_flist->count;
+		dstart = dir_flist->used;
 	} else {
 		dir_flist = flist;
 		dstart = 0;
@@ -1772,41 +1964,73 @@ struct file_list *recv_file_list(int f)
 	while ((flags = read_byte(f)) != 0) {
 		struct file_struct *file;
 
-		flist_expand(flist);
+		flist_expand(flist, 1);
 
 		if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
 			flags |= read_byte(f) << 8;
 		file = recv_file_entry(flist, flags, f);
 
 		if (inc_recurse && S_ISDIR(file->mode)) {
-			flist_expand(dir_flist);
-			dir_flist->files[dir_flist->count++] = file;
+			flist_expand(dir_flist, 1);
+			dir_flist->files[dir_flist->used++] = file;
 		}
 
-		flist->files[flist->count++] = file;
+		flist->files[flist->used++] = file;
 
-		maybe_emit_filelist_progress(flist->count);
+		maybe_emit_filelist_progress(flist->used);
 
 		if (verbose > 2) {
 			rprintf(FINFO, "recv_file_name(%s)\n",
 				f_name(file, NULL));
 		}
 	}
-	file_total += flist->count;
+	file_total += flist->used;
+
+	flist->ndx_end = flist->ndx_start + flist->used - 1;
+	if (inc_recurse && flist->ndx_start)
+		flist->ndx_end -= dir_flist->used - dstart;
 
 	if (verbose > 2)
-		rprintf(FINFO, "received %d names\n", flist->count);
+		rprintf(FINFO, "received %d names\n", flist->used);
 
 	if (show_filelist_p())
 		finish_filelist_progress(flist);
 
-	clean_flist(flist, relative_paths, 1);
+#ifdef ICONV_OPTION
+	if (need_unsorted_flist) {
+		/* Create an extra array of index pointers that we can sort for
+		 * the generator's use (for wading through the files in sorted
+		 * order and for calling flist_find()).  We keep the "files"
+		 * list unsorted for our exchange of index numbers with the
+		 * other side (since their names may not sort the same). */
+		if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
+			out_of_memory("recv_file_list");
+		memcpy(flist->sorted, flist->files,
+		       flist->used * sizeof (struct file_struct*));
+		if (inc_recurse && dir_flist->used > dstart) {
+			dir_flist->sorted = realloc_array(dir_flist->sorted,
+						struct file_struct *,
+						dir_flist->used);
+			memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
+			       (dir_flist->used - dstart) * sizeof (struct file_struct*));
+			fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
+		}
+	} else
+#endif
+	{
+		flist->sorted = flist->files;
+		if (inc_recurse && dir_flist->used > dstart) {
+			dir_flist->sorted = dir_flist->files;
+			fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
+		}
+	}
+
+	if (inc_recurse)
+		flist_done_allocating(flist);
+	else if (f >= 0)
+		recv_id_list(f, flist);
 
-	if (inc_recurse) {
-		qsort(dir_flist->files + dstart, dir_flist->count - dstart,
-		      sizeof dir_flist->files[0], (int (*)())file_compare);
-	} else if (f >= 0)
-		recv_uid_list(f, flist);
+	clean_flist(flist, relative_paths);
 
 	if (protocol_version < 30) {
 		/* Recv the io_error flag */
@@ -1821,7 +2045,7 @@ struct file_list *recv_file_list(int f)
 
 	if (list_only) {
 		int i;
-		for (i = 0; i < flist->count; i++)
+		for (i = flist->low; i <= flist->high; i++)
 			list_file_entry(flist->files[i]);
 	}
 
@@ -1829,7 +2053,7 @@ struct file_list *recv_file_list(int f)
 		rprintf(FINFO, "recv_file_list done\n");
 
 	stats.flist_size += stats.total_read - start_read;
-	stats.num_files += flist->count;
+	stats.num_files += flist->used;
 
 	return flist;
 }
@@ -1845,14 +2069,18 @@ void recv_additional_file_list(int f)
 		change_local_filter_dir(NULL, 0, 0);
 	} else {
 		ndx = NDX_FLIST_OFFSET - ndx;
-		if (ndx < 0 || ndx >= dir_flist->count) {
+		if (ndx < 0 || ndx >= dir_flist->used) {
 			ndx = NDX_FLIST_OFFSET - ndx;
 			rprintf(FERROR,
-				"Invalid dir index: %d (%d - %d)\n",
-				ndx, NDX_FLIST_OFFSET,
-				NDX_FLIST_OFFSET - dir_flist->count);
+				"[%s] Invalid dir index: %d (%d - %d)\n",
+				who_am_i(), ndx, NDX_FLIST_OFFSET,
+				NDX_FLIST_OFFSET - dir_flist->used + 1);
 			exit_cleanup(RERR_PROTOCOL);
 		}
+		if (verbose > 3) {
+			rprintf(FINFO, "[%s] receiving flist for dir %d\n",
+				who_am_i(), ndx);
+		}
 		flist = recv_file_list(f);
 		flist->parent_ndx = ndx;
 	}
@@ -1867,36 +2095,36 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 
 	while (low <= high) {
 		mid = (low + high) / 2;
-		if (F_IS_ACTIVE(flist->files[mid]))
+		if (F_IS_ACTIVE(flist->sorted[mid]))
 			mid_up = mid;
 		else {
 			/* Scan for the next non-empty entry using the cached
 			 * distance values.  If the value isn't fully up-to-
 			 * date, update it. */
-			mid_up = mid + F_DEPTH(flist->files[mid]);
-			if (!F_IS_ACTIVE(flist->files[mid_up])) {
+			mid_up = mid + F_DEPTH(flist->sorted[mid]);
+			if (!F_IS_ACTIVE(flist->sorted[mid_up])) {
 				do {
-				    mid_up += F_DEPTH(flist->files[mid_up]);
-				} while (!F_IS_ACTIVE(flist->files[mid_up]));
-				F_DEPTH(flist->files[mid]) = mid_up - mid;
+				    mid_up += F_DEPTH(flist->sorted[mid_up]);
+				} while (!F_IS_ACTIVE(flist->sorted[mid_up]));
+				F_DEPTH(flist->sorted[mid]) = mid_up - mid;
 			}
 			if (mid_up > high) {
 				/* If there's nothing left above us, set high to
 				 * a non-empty entry below us and continue. */
-				high = mid - (int)flist->files[mid]->len32;
-				if (!F_IS_ACTIVE(flist->files[high])) {
+				high = mid - (int)flist->sorted[mid]->len32;
+				if (!F_IS_ACTIVE(flist->sorted[high])) {
 					do {
-					    high -= (int)flist->files[high]->len32;
-					} while (!F_IS_ACTIVE(flist->files[high]));
-					flist->files[mid]->len32 = mid - high;
+					    high -= (int)flist->sorted[high]->len32;
+					} while (!F_IS_ACTIVE(flist->sorted[high]));
+					flist->sorted[mid]->len32 = mid - high;
 				}
 				continue;
 			}
 		}
-		diff = f_name_cmp(flist->files[mid_up], f);
+		diff = f_name_cmp(flist->sorted[mid_up], f);
 		if (diff == 0) {
 			if (protocol_version < 29
-			    && S_ISDIR(flist->files[mid_up]->mode)
+			    && S_ISDIR(flist->sorted[mid_up]->mode)
 			    != S_ISDIR(f->mode))
 				return -1;
 			return mid_up;
@@ -1935,34 +2163,41 @@ struct file_list *flist_new(int flags, char *msg)
 
 	memset(flist, 0, sizeof flist[0]);
 
-	if (!(flags & FLIST_TEMP)) {
-		if (first_flist) {
-			flist->ndx_start = first_flist->prev->ndx_start
-					 + first_flist->prev->count;
-		}
+	if (flags & FLIST_TEMP) {
+		if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
+						out_of_memory, POOL_INTERN)))
+			out_of_memory(msg);
+	} else {
 		/* This is a doubly linked list with prev looping back to
 		 * the end of the list, but the last next pointer is NULL. */
-		if (!first_flist)
+		if (!first_flist) {
+			flist->file_pool = pool_create(NORMAL_EXTENT, 0,
+						out_of_memory, POOL_INTERN);
+			if (!flist->file_pool)
+				out_of_memory(msg);
+
 			first_flist = cur_flist = flist->prev = flist;
-		else {
+		} else {
+			flist->file_pool = first_flist->file_pool;
+
+			flist->ndx_start = first_flist->prev->ndx_end + 2;
+
 			flist->prev = first_flist->prev;
 			flist->prev->next = first_flist->prev = flist;
 		}
+		flist->pool_boundary = pool_boundary(flist->file_pool, 0);
 		flist_cnt++;
 	}
 
-	if (!(flist->file_pool = pool_create(FILE_EXTENT, 0, out_of_memory, POOL_INTERN)))
-		out_of_memory(msg);
-
 	return flist;
 }
 
 /* Free up all elements in a flist. */
 void flist_free(struct file_list *flist)
 {
-	if (!flist->prev)
-		; /* Was FLIST_TEMP dir-list. */
-	else if (flist == flist->prev) {
+	if (!flist->prev) {
+		/* Was FLIST_TEMP dir-list. */
+	} else if (flist == flist->prev) {
 		first_flist = cur_flist = NULL;
 		file_total = 0;
 		flist_cnt = 0;
@@ -1977,48 +2212,58 @@ void flist_free(struct file_list *flist)
 				flist->next = first_flist;
 		}
 		flist->next->prev = flist->prev;
-		file_total -= flist->count;
+		file_total -= flist->used;
 		flist_cnt--;
 	}
 
-	pool_destroy(flist->file_pool);
+	if (!flist->prev || !flist_cnt)
+		pool_destroy(flist->file_pool);
+	else
+		pool_free_old(flist->file_pool, flist->pool_boundary);
+
+	if (flist->sorted && flist->sorted != flist->files)
+		free(flist->sorted);
 	free(flist->files);
 	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
- */
-static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
+/* This routine ensures we don't have any duplicate names in our file list.
+ * duplicate names can cause corruption because of the pipelining. */
+static void clean_flist(struct file_list *flist, int strip_root)
 {
 	char fbuf[MAXPATHLEN];
-	int i, prev_i = 0;
+	int i, prev_i;
 
 	if (!flist)
 		return;
-	if (flist->count == 0) {
+	if (flist->used == 0) {
 		flist->high = -1;
+		flist->low = 0;
 		return;
 	}
 
-	qsort(flist->files, flist->count,
-	    sizeof flist->files[0], (int (*)())file_compare);
+	fsort(flist->sorted, flist->used);
 
-	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
-		if (F_IS_ACTIVE(flist->files[i])) {
-			prev_i = i;
-			break;
+	if (!am_sender || inc_recurse) {
+		for (i = prev_i = 0; i < flist->used; i++) {
+			if (F_IS_ACTIVE(flist->sorted[i])) {
+				prev_i = i;
+				break;
+			}
 		}
+		flist->low = prev_i;
+	} else {
+		i = prev_i = flist->used - 1;
+		flist->low = 0;
 	}
-	flist->low = prev_i;
-	while (++i < flist->count) {
+
+	while (++i < flist->used) {
 		int j;
-		struct file_struct *file = flist->files[i];
+		struct file_struct *file = flist->sorted[i];
 
 		if (!F_IS_ACTIVE(file))
 			continue;
-		if (f_name_cmp(file, flist->files[prev_i]) == 0)
+		if (f_name_cmp(file, flist->sorted[prev_i]) == 0)
 			j = prev_i;
 		else if (protocol_version >= 29 && S_ISDIR(file->mode)) {
 			int save_mode = file->mode;
@@ -2031,36 +2276,39 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		} else
 			j = -1;
 		if (j >= 0) {
-			struct file_struct *fp = flist->files[j];
 			int keep, drop;
 			/* If one is a dir and the other is not, we want to
 			 * keep the dir because it might have contents in the
 			 * list. */
-			if (S_ISDIR(file->mode) != S_ISDIR(fp->mode)) {
-				if (S_ISDIR(file->mode))
+			if (S_ISDIR(file->mode)) {
+				struct file_struct *fp = flist->sorted[j];
+				if (!S_ISDIR(fp->mode))
 					keep = i, drop = j;
 				else
 					keep = j, drop = i;
-			} else if (protocol_version < 27)
+			} else
 				keep = j, drop = i;
-			else
-				keep = i, drop = j;
-			if (verbose > 1 && !am_server) {
-				rprintf(FINFO,
-					"removing duplicate name %s from file list (%d)\n",
-					f_name(file, fbuf), drop);
-			}
-			/* Make sure we don't lose track of a user-specified
-			 * top directory. */
-			flist->files[keep]->flags |= flist->files[drop]->flags
-						   & (FLAG_TOP_DIR|FLAG_XFER_DIR);
 
-			clear_file(flist->files[drop]);
+			if (am_sender)
+				flist->sorted[drop]->flags |= FLAG_DUPLICATE;
+			else {
+				if (verbose > 1) {
+					rprintf(FINFO,
+					    "removing duplicate name %s from file list (%d)\n",
+					    f_name(file, fbuf), drop + flist->ndx_start);
+				}
+				/* Make sure we don't lose track of a user-specified
+				 * top directory. */
+				flist->sorted[keep]->flags |= flist->sorted[drop]->flags
+							   & (FLAG_TOP_DIR|FLAG_XFER_DIR);
+
+				clear_file(flist->sorted[drop]);
+			}
 
 			if (keep == i) {
 				if (flist->low == drop) {
 					for (j = drop + 1;
-					     j < i && !F_IS_ACTIVE(flist->files[j]);
+					     j < i && !F_IS_ACTIVE(flist->sorted[j]);
 					     j++) {}
 					flist->low = j;
 				}
@@ -2069,13 +2317,13 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		} else
 			prev_i = i;
 	}
-	flist->high = no_dups ? prev_i : flist->count - 1;
+	flist->high = prev_i;
 
 	if (strip_root) {
 		/* We need to strip off the leading slashes for relative
 		 * paths, but this must be done _after_ the sorting phase. */
 		for (i = flist->low; i <= flist->high; i++) {
-			struct file_struct *file = flist->files[i];
+			struct file_struct *file = flist->sorted[i];
 
 			if (!file->dirname)
 				continue;
@@ -2086,13 +2334,13 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		}
 	}
 
-	if (prune_empty_dirs && no_dups) {
+	if (prune_empty_dirs && !am_sender) {
 		int j, prev_depth = 0;
 
 		prev_i = 0; /* It's OK that this isn't really true. */
 
 		for (i = flist->low; i <= flist->high; i++) {
-			struct file_struct *fp, *file = flist->files[i];
+			struct file_struct *fp, *file = flist->sorted[i];
 
 			/* This temporarily abuses the F_DEPTH() value for a
 			 * directory that is in a chain that might get pruned.
@@ -2100,7 +2348,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			if (S_ISDIR(file->mode) && F_DEPTH(file)) {
 				/* Dump empty dirs when coming back down. */
 				for (j = prev_depth; j >= F_DEPTH(file); j--) {
-					fp = flist->files[prev_i];
+					fp = flist->sorted[prev_i];
 					if (F_DEPTH(fp) >= 0)
 						break;
 					prev_i = -F_DEPTH(fp)-1;
@@ -2111,7 +2359,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 						       ALL_FILTERS)) {
 					/* Keep dirs through this dir. */
 					for (j = prev_depth-1; ; j--) {
-						fp = flist->files[prev_i];
+						fp = flist->sorted[prev_i];
 						if (F_DEPTH(fp) >= 0)
 							break;
 						prev_i = -F_DEPTH(fp)-1;
@@ -2123,7 +2371,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			} else {
 				/* Keep dirs through this non-dir. */
 				for (j = prev_depth; ; j--) {
-					fp = flist->files[prev_i];
+					fp = flist->sorted[prev_i];
 					if (F_DEPTH(fp) >= 0)
 						break;
 					prev_i = -F_DEPTH(fp)-1;
@@ -2133,7 +2381,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		}
 		/* Dump all remaining empty dirs. */
 		while (1) {
-			struct file_struct *fp = flist->files[prev_i];
+			struct file_struct *fp = flist->sorted[prev_i];
 			if (F_DEPTH(fp) >= 0)
 				break;
 			prev_i = -F_DEPTH(fp)-1;
@@ -2141,12 +2389,12 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		}
 
 		for (i = flist->low; i <= flist->high; i++) {
-			if (F_IS_ACTIVE(flist->files[i]))
+			if (F_IS_ACTIVE(flist->sorted[i]))
 				break;
 		}
 		flist->low = i;
 		for (i = flist->high; i >= flist->low; i--) {
-			if (F_IS_ACTIVE(flist->files[i]))
+			if (F_IS_ACTIVE(flist->sorted[i]))
 				break;
 		}
 		flist->high = i;
@@ -2161,24 +2409,26 @@ static void output_flist(struct file_list *flist)
 	const char *who = who_am_i();
 	int i;
 
-	rprintf(FINFO, "[%s] flist start=%d, count=%d, low=%d, high=%d\n",
-		who, flist->ndx_start, flist->count, flist->low, flist->high);
-	for (i = 0; i < flist->count; i++) {
-		file = flist->files[i];
-		if ((am_root || am_sender) && preserve_uid) {
-			snprintf(uidbuf, sizeof uidbuf, " uid=%ld",
-				 (long)F_UID(file));
+	rprintf(FINFO, "[%s] flist start=%d, end=%d, used=%d, low=%d, high=%d\n",
+		who, flist->ndx_start, flist->ndx_end, flist->used, flist->low, flist->high);
+	for (i = 0; i < flist->used; i++) {
+		file = flist->sorted[i];
+		if ((am_root || am_sender) && uid_ndx) {
+			snprintf(uidbuf, sizeof uidbuf, " uid=%u",
+				 F_OWNER(file));
 		} else
 			*uidbuf = '\0';
-		if (preserve_gid && F_GID(file) != GID_NONE) {
-			snprintf(gidbuf, sizeof gidbuf, " gid=%ld",
-				 (long)F_GID(file));
+		if (gid_ndx) {
+			static char parens[] = "(\0)\0\0\0";
+			char *pp = parens + (file->flags & FLAG_SKIP_GROUP ? 0 : 3);
+			snprintf(gidbuf, sizeof gidbuf, " gid=%s%u%s",
+				 pp, F_GROUP(file), pp + 2);
 		} else
 			*gidbuf = '\0';
 		if (!am_sender)
 			snprintf(depthbuf, sizeof depthbuf, "%d", F_DEPTH(file));
 		if (F_IS_ACTIVE(file)) {
-			root = am_sender ? NS(F_ROOTDIR(file)) : depthbuf;
+			root = am_sender ? NS(F_PATHNAME(file)) : depthbuf;
 			if ((dir = file->dirname) == NULL)
 				dir = slash = "";
 			else
@@ -2187,9 +2437,12 @@ static void output_flist(struct file_list *flist)
 			trail = S_ISDIR(file->mode) ? "/" : "";
 		} else
 			root = dir = slash = name = trail = "";
-		rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
-			who, i, root, dir, slash, name, trail, (int)file->mode,
-			(double)F_LENGTH(file), uidbuf, gidbuf, file->flags);
+		rprintf(FINFO,
+			"[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
+			who, i + flist->ndx_start,
+			root, dir, slash, name, trail,
+			(int)file->mode, (double)F_LENGTH(file),
+			uidbuf, gidbuf, file->flags);
 	}
 }
 
@@ -2373,6 +2626,7 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 	char dirbuf[MAXPATHLEN];
 	int save_recurse = recurse;
 	int save_xfer_dirs = xfer_dirs;
+	int save_prune_empty_dirs = prune_empty_dirs;
 
 	if (dlen < 0) {
 		dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
@@ -2385,13 +2639,16 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 
 	recurse = 0;
 	xfer_dirs = 1;
-	send_directory(ignore_filter_rules ? -2 : -1, dirlist, -1, dirname, dlen, 0);
+	send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen, 0);
 	xfer_dirs = save_xfer_dirs;
 	recurse = save_recurse;
 	if (do_progress)
-		flist_count_offset += dirlist->count;
+		flist_count_offset += dirlist->used;
 
-	clean_flist(dirlist, 0, 0);
+	prune_empty_dirs = 0;
+	dirlist->sorted = dirlist->files;
+	clean_flist(dirlist, 0);
+	prune_empty_dirs = save_prune_empty_dirs;
 
 	if (verbose > 3)
 		output_flist(dirlist);