X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/abdcb21a7aa725cbf7a5a9e37f93484a133b69d1..1b42f628f495ff0cdaa8a7c219d8ce33192281fe:/flist.c

diff --git a/flist.c b/flist.c
index e6a80853..42518d9a 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,11 +17,11 @@
  * 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"
+#include "ifuncs.h"
 #include "rounding.h"
 #include "io.h"
 
@@ -50,8 +51,9 @@ 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 eol_nulls;
 extern int relative_paths;
 extern int implied_dirs;
 extern int file_extra_cnt;
@@ -63,6 +65,7 @@ extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
 extern struct stats stats;
+extern char *filesfrom_host;
 
 extern char curr_dir[MAXPATHLEN];
 
@@ -73,6 +76,7 @@ extern struct filter_list_struct server_filter_list;
 
 #ifdef ICONV_OPTION
 extern int ic_ndx;
+extern int filesfrom_convert;
 extern int need_unsorted_flist;
 extern iconv_t ic_send, ic_recv;
 #endif
@@ -89,6 +93,18 @@ int flist_cnt = 0; /* how many (non-tmp) file list objects exist */
 int file_total = 0; /* total of all active items over all file-lists */
 int flist_eof = 0; /* all the file-lists are now known */
 
+/* Starting from protocol version 26, we always use 64-bit ino_t and dev_t
+ * internally, even if this platform does not allow files to have 64-bit inums.
+ * The only exception is if we're on a platform with no 64-bit type at all.
+ *
+ * Because we use read_longint() to get these off the wire, if you transfer
+ * devices or (for protocols < 30) hardlinks with dev or inum > 2**32 to a
+ * machine with no 64-bit types then you will get an overflow error.
+ *
+ * Note that if you transfer devices from a 64-bit-devt machine (say, Solaris)
+ * to a 32-bit-devt machine (say, Linux-2.2/x86) then the device numbers will
+ * be truncated.  But it's a kind of silly thing to do anyhow. */
+
 /* The tmp_* vars are used as a cache area by make_file() to store data
  * that the sender doesn't need to remember in its file list.  The data
  * will survive just long enough to be used by send_file_entry(). */
@@ -101,6 +117,7 @@ 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 int high_hlink_ndx;
 
 static void clean_flist(struct file_list *flist, int strip_root);
 static void output_flist(struct file_list *flist);
@@ -145,7 +162,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");
 }
@@ -272,12 +289,12 @@ static const char *pathname, *orig_dir;
 static int pathname_len;
 
 
-/* Make sure flist can hold at least flist->count + extra entries. */
+/* 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 + extra <= flist->malloced)
+	if (flist->used + extra <= flist->malloced)
 		return;
 
 	if (flist->malloced < FLIST_START)
@@ -289,14 +306,14 @@ static void flist_expand(struct file_list *flist, int extra)
 
 	/* In case count jumped or we are starting the list
 	 * with a known size just set it. */
-	if (flist->malloced < flist->count + extra)
-		flist->malloced = flist->count + extra;
+	if (flist->malloced < flist->used + extra)
+		flist->malloced = flist->used + extra;
 
 	new_ptr = realloc_array(flist->files, struct file_struct *,
 				flist->malloced);
 
 	if (verbose >= 2 && flist->malloced != FLIST_START) {
-		rprintf(FCLIENT, "[%s] expand file_list to %.0f bytes, did%s move\n",
+		rprintf(FCLIENT, "[%s] expand file_list pointer array to %.0f bytes, did%s move\n",
 		    who_am_i(),
 		    (double)sizeof flist->files[0] * flist->malloced,
 		    (new_ptr == flist->files) ? " not" : "");
@@ -344,7 +361,7 @@ int push_pathname(const char *dir, int len)
 	return 1;
 }
 
-static void send_file_entry(int f, struct file_struct *file, int ndx)
+static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx)
 {
 	static time_t modtime;
 	static mode_t mode;
@@ -358,26 +375,25 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	char fname[MAXPATHLEN];
 	int first_hlink_ndx = -1;
 	int l1, l2;
-	int flags;
+	int xflags;
 
 #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) {
+		xbuf outbuf, inbuf;
+
+		INIT_CONST_XBUF(outbuf, fname);
+
+		if (file->dirname) {
+			INIT_XBUF_STRLEN(inbuf, (char*)file->dirname);
+			outbuf.size -= 2; /* Reserve room for '/' & 1 more char. */
+			if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0)
+				goto convert_error;
+			outbuf.size += 2;
+			outbuf.buf[outbuf.len++] = '/';
+		}
+
+		INIT_XBUF_STRLEN(inbuf, (char*)file->basename);
+		if (iconvbufs(ic_send, &inbuf, &outbuf, 0) < 0) {
 		  convert_error:
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
@@ -385,81 +401,86 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			    who_am_i(), f_name(file, fname), strerror(errno));
 			return;
 		}
-		*obuf = '\0';
+		outbuf.buf[outbuf.len] = '\0';
 	} else
 #endif
 		f_name(file, fname);
 
-	flags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
+	xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
 
 	if (file->mode == mode)
-		flags |= XMIT_SAME_MODE;
+		xflags |= XMIT_SAME_MODE;
 	else
 		mode = file->mode;
+
+	if (protocol_version >= 30 && S_ISDIR(mode) && !(file->flags & FLAG_XFER_DIR))
+		xflags |= XMIT_NON_XFER_DIR;
+
 	if ((preserve_devices && IS_DEVICE(mode))
 	 || (preserve_specials && IS_SPECIAL(mode))) {
 		if (protocol_version < 28) {
 			if (tmp_rdev == rdev)
-				flags |= XMIT_SAME_RDEV_pre28;
+				xflags |= XMIT_SAME_RDEV_pre28;
 			else
 				rdev = tmp_rdev;
 		} else {
 			rdev = tmp_rdev;
 			if ((uint32)major(rdev) == rdev_major)
-				flags |= XMIT_SAME_RDEV_MAJOR;
+				xflags |= XMIT_SAME_RDEV_MAJOR;
 			else
 				rdev_major = major(rdev);
 			if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu)
-				flags |= XMIT_RDEV_MINOR_8_pre30;
+				xflags |= XMIT_RDEV_MINOR_8_pre30;
 		}
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
-	if (preserve_uid) {
+	if (uid_ndx) {
 		if ((uid_t)F_OWNER(file) == uid && *lastname)
-			flags |= XMIT_SAME_UID;
+			xflags |= XMIT_SAME_UID;
 		else {
 			uid = F_OWNER(file);
-			if (preserve_uid && !numeric_ids) {
+			if (uid_ndx && !numeric_ids) {
 				user_name = add_uid(uid);
 				if (inc_recurse && user_name)
-					flags |= XMIT_USER_NAME_FOLLOWS;
+					xflags |= XMIT_USER_NAME_FOLLOWS;
 			}
 		}
 	}
-	if (preserve_gid) {
+	if (gid_ndx) {
 		if ((gid_t)F_GROUP(file) == gid && *lastname)
-			flags |= XMIT_SAME_GID;
+			xflags |= XMIT_SAME_GID;
 		else {
 			gid = F_GROUP(file);
-			if (preserve_gid && !numeric_ids) {
+			if (gid_ndx && !numeric_ids) {
 				group_name = add_gid(gid);
 				if (inc_recurse && group_name)
-					flags |= XMIT_GROUP_NAME_FOLLOWS;
+					xflags |= XMIT_GROUP_NAME_FOLLOWS;
 			}
 		}
 	}
 	if (file->modtime == modtime)
-		flags |= XMIT_SAME_TIME;
+		xflags |= XMIT_SAME_TIME;
 	else
 		modtime = file->modtime;
 
 #ifdef SUPPORT_HARD_LINKS
 	if (tmp_dev != 0) {
 		if (protocol_version >= 30) {
-			struct idev_node *np = idev_node(tmp_dev, tmp_ino);
+			struct ht_int64_node *np = idev_find(tmp_dev, tmp_ino);
 			first_hlink_ndx = (int32)(long)np->data - 1;
 			if (first_hlink_ndx < 0) {
-				np->data = (void*)(long)(ndx + 1);
-				flags |= XMIT_HLINK_FIRST;
+				high_hlink_ndx = ndx + first_ndx;
+				np->data = (void*)(long)(high_hlink_ndx + 1);
+				xflags |= XMIT_HLINK_FIRST;
 			}
-			flags |= XMIT_HLINKED;
+			xflags |= XMIT_HLINKED;
 		} else {
 			if (tmp_dev == dev) {
 				if (protocol_version >= 28)
-					flags |= XMIT_SAME_DEV_pre30;
+					xflags |= XMIT_SAME_DEV_pre30;
 			} else
 				dev = tmp_dev;
-			flags |= XMIT_HLINKED;
+			xflags |= XMIT_HLINKED;
 		}
 	}
 #endif
@@ -470,67 +491,68 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	l2 = strlen(fname+l1);
 
 	if (l1 > 0)
-		flags |= XMIT_SAME_NAME;
+		xflags |= XMIT_SAME_NAME;
 	if (l2 > 255)
-		flags |= XMIT_LONG_NAME;
+		xflags |= XMIT_LONG_NAME;
 
 	/* We must make sure we don't send a zero flag byte or the
 	 * other end will terminate the flist transfer.  Note that
 	 * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
 	 * it's harmless way to add a bit to the first flag byte. */
 	if (protocol_version >= 28) {
-		if (!flags && !S_ISDIR(mode))
-			flags |= XMIT_TOP_DIR;
-		if ((flags & 0xFF00) || !flags) {
-			flags |= XMIT_EXTENDED_FLAGS;
-			write_shortint(f, flags);
+		if (!xflags && !S_ISDIR(mode))
+			xflags |= XMIT_TOP_DIR;
+		if ((xflags & 0xFF00) || !xflags) {
+			xflags |= XMIT_EXTENDED_FLAGS;
+			write_shortint(f, xflags);
 		} else
-			write_byte(f, flags);
+			write_byte(f, xflags);
 	} else {
-		if (!(flags & 0xFF))
-			flags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
-		write_byte(f, flags);
+		if (!(xflags & 0xFF))
+			xflags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
+		write_byte(f, xflags);
 	}
-	if (flags & XMIT_SAME_NAME)
+	if (xflags & XMIT_SAME_NAME)
 		write_byte(f, l1);
-	if (flags & XMIT_LONG_NAME)
+	if (xflags & XMIT_LONG_NAME)
 		write_varint30(f, l2);
 	else
 		write_byte(f, l2);
 	write_buf(f, fname + l1, l2);
 
 	if (first_hlink_ndx >= 0) {
-		write_varint30(f, first_hlink_ndx);
-		goto the_end;
+		write_varint(f, first_hlink_ndx);
+		if (first_hlink_ndx >= first_ndx)
+			goto the_end;
 	}
 
 	write_varlong30(f, F_LENGTH(file), 3);
-	if (!(flags & XMIT_SAME_TIME)) {
+	if (!(xflags & XMIT_SAME_TIME)) {
 		if (protocol_version >= 30)
 			write_varlong(f, modtime, 4);
 		else
 			write_int(f, modtime);
 	}
-	if (!(flags & XMIT_SAME_MODE))
+	if (!(xflags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
-	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
 		if (protocol_version < 30)
 			write_int(f, uid);
 		else {
 			write_varint(f, uid);
-			if (flags & XMIT_USER_NAME_FOLLOWS) {
+			if (xflags & XMIT_USER_NAME_FOLLOWS) {
 				int len = strlen(user_name);
 				write_byte(f, len);
 				write_buf(f, user_name, len);
 			}
 		}
 	}
-	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+	if (gid_ndx && !(xflags & XMIT_SAME_GID)) {
 		if (protocol_version < 30)
 			write_int(f, gid);
 		else {
 			write_varint(f, gid);
-			if (flags & XMIT_GROUP_NAME_FOLLOWS) {
+			if (xflags & XMIT_GROUP_NAME_FOLLOWS) {
 				int len = strlen(group_name);
 				write_byte(f, len);
 				write_buf(f, group_name, len);
@@ -540,14 +562,14 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	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))
 				write_int(f, (int)rdev);
 		} else {
-			if (!(flags & XMIT_SAME_RDEV_MAJOR))
+			if (!(xflags & XMIT_SAME_RDEV_MAJOR))
 				write_varint30(f, major(rdev));
 			if (protocol_version >= 30)
 				write_varint(f, minor(rdev));
-			else if (flags & XMIT_RDEV_MINOR_8_pre30)
+			else if (xflags & XMIT_RDEV_MINOR_8_pre30)
 				write_byte(f, minor(rdev));
 			else
 				write_int(f, minor(rdev));
@@ -571,7 +593,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			write_int(f, (int32)tmp_ino);
 		} else {
 			/* 64-bit dev_t and ino_t */
-			if (!(flags & XMIT_SAME_DEV_pre30))
+			if (!(xflags & XMIT_SAME_DEV_pre30))
 				write_longint(f, dev);
 			write_longint(f, tmp_ino);
 		}
@@ -646,25 +668,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 #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;
+		xbuf outbuf, inbuf;
 
-		if (icnt >= MAXPATHLEN) {
-			errno = E2BIG;
-			goto convert_error;
-		}
+		INIT_CONST_XBUF(outbuf, thisname);
+		INIT_XBUF(inbuf, lastname, basename_len, -1);
 
-		iconv(ic_recv, NULL,0, NULL,0);
-		if (iconv(ic_recv, &ibuf,&icnt, &obuf,&ocnt) == (size_t)-1) {
-		  convert_error:
+		if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 			    "[%s] cannot convert filename: %s (%s)\n",
 			    who_am_i(), lastname, strerror(errno));
-			obuf = thisname;
+			outbuf.len = 0;
 		}
-		*obuf = '\0';
+		outbuf.buf[outbuf.len] = '\0';
 	}
 #endif
 
@@ -689,33 +705,34 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #ifdef SUPPORT_HARD_LINKS
 	if (protocol_version >= 30
 	 && 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) {
+		first_hlink_ndx = read_varint(f);
+		if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->ndx_start + flist->used) {
 			rprintf(FERROR,
 				"hard-link reference out of range: %d (%d)\n",
-				first_hlink_ndx, flist->count);
+				first_hlink_ndx, flist->ndx_start + 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_OWNER(first);
-		if (preserve_gid)
-			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;
-		}
-		if (preserve_links && S_ISLNK(mode))
-			linkname_len = strlen(F_SYMLINK(first)) + 1;
-		else
-			linkname_len = 0;
-		goto create_object;
+		if (first_hlink_ndx >= flist->ndx_start) {
+			struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
+			file_length = F_LENGTH(first);
+			modtime = first->modtime;
+			mode = first->mode;
+			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 += DEV_EXTRA_CNT * EXTRA_LEN;
+			}
+			if (preserve_links && S_ISLNK(mode))
+				linkname_len = strlen(F_SYMLINK(first)) + 1;
+			else
+				linkname_len = 0;
+			goto create_object;
+		}
 	}
 #endif
 
@@ -739,7 +756,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	if (chmod_modes && !S_ISLNK(mode))
 		mode = tweak_mode(mode, chmod_modes);
 
-	if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
+	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
 		if (protocol_version < 30)
 			uid = (uid_t)read_int(f);
 		else {
@@ -750,7 +767,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 				uid = match_uid(uid);
 		}
 	}
-	if (preserve_gid && !(xflags & XMIT_SAME_GID)) {
+	if (gid_ndx && !(xflags & XMIT_SAME_GID)) {
 		if (protocol_version < 30)
 			gid = (gid_t)read_int(f);
 		else {
@@ -780,7 +797,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 				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);
@@ -804,7 +821,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		if (protocol_version < 28 && S_ISREG(mode))
 			xflags |= XMIT_HLINKED;
 		if (xflags & XMIT_HLINKED)
-			extra_len += EXTRA_LEN;
+			extra_len += (inc_recurse+1) * EXTRA_LEN;
 	}
 #endif
 
@@ -828,7 +845,7 @@ 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;
 		}
 		pool = dir_flist->file_pool;
 	} else
@@ -857,15 +874,15 @@ 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->count + flist->ndx_start;
+		F_NDX(file) = flist->used + flist->ndx_start;
 #endif
 
 	if (basename != thisname) {
@@ -885,6 +902,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 			    && lastname[del_hier_name_len-2] == '/')
 				del_hier_name_len -= 2;
 			file->flags |= FLAG_TOP_DIR | FLAG_XFER_DIR;
+		} else if (protocol_version >= 30) {
+			if (!(xflags & XMIT_NON_XFER_DIR))
+				file->flags |= FLAG_XFER_DIR;
 		} else if (in_del_hier) {
 			if (!relative_paths || !del_hier_name_len
 			 || (l1 >= del_hier_name_len
@@ -905,8 +925,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #ifdef SUPPORT_LINKS
 	if (linkname_len) {
 		bp = (char*)file->basename + basename_len;
-		if (first_hlink_ndx >= 0) {
-			struct file_struct *first = flist->files[first_hlink_ndx];
+		if (first_hlink_ndx >= flist->ndx_start) {
+			struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
 			memcpy(bp, F_SYMLINK(first), linkname_len);
 		} else
 			read_sbuf(f, bp, linkname_len - 1);
@@ -918,11 +938,14 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 #ifdef SUPPORT_HARD_LINKS
 	if (preserve_hard_links && xflags & XMIT_HLINKED) {
 		if (protocol_version >= 30) {
-			F_HL_GNUM(file) = xflags & XMIT_HLINK_FIRST
-					? flist->count : first_hlink_ndx;
+			if (xflags & XMIT_HLINK_FIRST) {
+				high_hlink_ndx = flist->ndx_start + flist->used;
+				F_HL_GNUM(file) = high_hlink_ndx;
+			} else
+				F_HL_GNUM(file) = first_hlink_ndx;
 		} else {
 			static int32 cnt = 0;
-			struct idev_node *np;
+			struct ht_int64_node *np;
 			int64 ino;
 			int32 ndx;
 			if (protocol_version < 26) {
@@ -933,7 +956,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 					dev = read_longint(f);
 				ino = read_longint(f);
 			}
-			np = idev_node(dev, ino);
+			np = idev_find(dev, ino);
 			ndx = (int32)(long)np->data - 1;
 			if (ndx < 0) {
 				ndx = cnt++;
@@ -946,13 +969,13 @@ 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;
 		}
-		if (first_hlink_ndx >= 0) {
-			struct file_struct *first = flist->files[first_hlink_ndx];
+		if (first_hlink_ndx >= flist->ndx_start) {
+			struct file_struct *first = flist->files[first_hlink_ndx - flist->ndx_start];
 			memcpy(bp, F_SUM(first), checksum_len);
 		} else
 			read_buf(f, bp, checksum_len);
@@ -973,38 +996,27 @@ static struct file_struct *recv_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
- * options.
+/* Create a file_struct for a named file by reading its stat() information
+ * and performing extensive checks against global options.
  *
- * @return the new file, or NULL if there was an error or this file
- * should be excluded.
- *
- * @todo There is a small optimization opportunity here to avoid
- * stat()ing the file in some circumstances, which has a certain cost.
- * We are called immediately after doing readdir(), and so we may
- * already know the d_type of the file.  We could for example avoid
- * statting directories if we're not recursing, but this is not a very
- * important case.  Some systems may not have d_type.
- **/
+ * Returns a pointer to the new file struct, or NULL if there was an error
+ * or this file should be excluded. */
 struct file_struct *make_file(const char *fname, struct file_list *flist,
 			      STRUCT_STAT *stp, int flags, int filter_level)
 {
 	static char *lastdir;
 	static int lastdir_len = -1;
 	struct file_struct *file;
-	STRUCT_STAT st;
 	char thisname[MAXPATHLEN];
 	char linkname[MAXPATHLEN];
 	int alloc_len, basename_len, linkname_len;
 	int extra_len = file_extra_cnt * EXTRA_LEN;
 	const char *basename;
 	alloc_pool_t *pool;
+	STRUCT_STAT st;
 	char *bp;
 
-	if (strlcpy(thisname, fname, sizeof thisname)
-	    >= sizeof thisname - pathname_len) {
+	if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
 		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}
@@ -1054,10 +1066,13 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	if (filter_level == NO_FILTERS)
 		goto skip_filters;
 
-	if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-		rprintf(FINFO, "skipping directory %s\n", thisname);
-		return NULL;
-	}
+	if (S_ISDIR(st.st_mode)) {
+		if (!xfer_dirs) {
+			rprintf(FINFO, "skipping directory %s\n", thisname);
+			return NULL;
+		}
+	} else
+		flags &= ~FLAG_XFER_DIR;
 
 	/* -x only affects directories because we need to avoid recursing
 	 * into a mount-point directory, not to avoid copying a symlinked
@@ -1095,7 +1110,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		if (flist->prev && S_ISDIR(st.st_mode)
 		 && flags & FLAG_DIVERT_DIRS) {
 			/* Room for parent/sibling/next-child info. */
-			extra_len += 3 * EXTRA_LEN;
+			extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN;
 			dir_count++;
 			pool = dir_flist->file_pool;
 		} else
@@ -1178,9 +1193,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)
@@ -1209,9 +1224,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			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;
@@ -1241,14 +1256,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;
 
@@ -1271,12 +1286,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, 1);
-	flist->files[flist->count++] = file;
+	flist->files[flist->used++] = file;
 	if (f >= 0) {
-		send_file_entry(f, file, flist->count - 1);
+		send_file_entry(f, file, flist->used - 1, flist->ndx_start);
 #ifdef SUPPORT_ACLS
 		if (preserve_acls && !S_ISLNK(file->mode)) {
 			send_acl(&sx, f);
@@ -1395,7 +1410,7 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
 	int i;
 	int32 *dp = NULL;
 	int32 *parent_dp = parent_ndx < 0 ? NULL
-			 : F_DIRNODE_P(dir_flist->sorted[parent_ndx]);
+			 : F_DIR_NODE_P(dir_flist->sorted[parent_ndx]);
 
 	flist_expand(dir_flist, dir_cnt);
 	dir_flist->sorted = dir_flist->files;
@@ -1406,7 +1421,7 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
 		if (!S_ISDIR(file->mode))
 			continue;
 
-		dir_flist->files[dir_flist->count++] = file;
+		dir_flist->files[dir_flist->used++] = file;
 		dir_cnt--;
 
 		if (!(file->flags & FLAG_XFER_DIR)
@@ -1414,13 +1429,13 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
 			continue;
 
 		if (dp)
-			DIR_NEXT_SIBLING(dp) = dir_flist->count - 1;
+			DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
 		else if (parent_dp)
-			DIR_FIRST_CHILD(parent_dp) = dir_flist->count - 1;
+			DIR_FIRST_CHILD(parent_dp) = dir_flist->used - 1;
 		else
-			send_dir_ndx = dir_flist->count - 1;
+			send_dir_ndx = dir_flist->used - 1;
 
-		dp = F_DIRNODE_P(file);
+		dp = F_DIR_NODE_P(file);
 		DIR_PARENT(dp) = parent_ndx;
 		DIR_FIRST_CHILD(dp) = -1;
 	}
@@ -1441,8 +1456,8 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 	char *p;
 	DIR *d;
 	int divert_dirs = (flags & FLAG_DIVERT_DIRS) != 0;
-	int start = 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);
 
@@ -1470,8 +1485,15 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 				full_fname(fbuf));
 			continue;
 		}
+		if (dname[0] == '\0') {
+			io_error |= IOERR_GENERAL;
+			rprintf(FINFO,
+				"cannot send file with empty name in %s\n",
+				full_fname(fbuf));
+			continue;
+		}
 
-		send_file_name(f, flist, fbuf, NULL, flags, filter_flags);
+		send_file_name(f, flist, fbuf, NULL, flags, filter_level);
 	}
 
 	fbuf[len] = '\0';
@@ -1484,8 +1506,8 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 	closedir(d);
 
 	if (f >= 0 && recurse && !divert_dirs) {
-		int i, end = flist->count - 1;
-		/* send_if_directory() bumps flist->count, so use "end". */
+		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);
 	}
@@ -1522,13 +1544,13 @@ 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->sorted[send_dir_ndx];
 		int dir_ndx, dstart = dir_count;
+		const char *pathname = F_PATHNAME(file);
 		int32 *dp;
 
 		flist = flist_new(0, "send_extra_file_list");
@@ -1541,9 +1563,10 @@ void send_extra_file_list(int f, int at_least)
 #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_DIRNODE_P(file);
+		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
@@ -1552,31 +1575,35 @@ void send_extra_file_list(int f, int at_least)
 		    && 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_DIRNODE_P(file);
+			if (F_PATHNAME(file) != pathname)
+				send1extra(f, file, flist);
+			dp = F_DIR_NODE_P(file);
 		}
 
 		write_byte(f, 0);
 
 #ifdef ICONV_OPTION
 		if (need_unsorted_flist) {
-			if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
 				out_of_memory("send_extra_file_list");
 			memcpy(flist->sorted, flist->files,
-			       flist->count * sizeof (struct file_struct*));
+			       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->count;
-		future_cnt += flist->count;
+		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);
 
@@ -1593,7 +1620,7 @@ void send_extra_file_list(int f, int at_least)
 				}
 				send_dir_depth--;
 				file = dir_flist->sorted[send_dir_ndx];
-				dp = F_DIRNODE_P(file);
+				dp = F_DIR_NODE_P(file);
 			}
 			send_dir_ndx = DIR_NEXT_SIBLING(dp);
 		}
@@ -1617,6 +1644,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	int64 start_write;
 	int use_ff_fd = 0;
 	int flags, disable_buffering;
+	int reading_remotely = filesfrom_host != NULL;
+	int rl_flags = (reading_remotely ? 0 : RL_DUMP_COMMENTS)
+#ifdef ICONV_OPTION
+		     | (filesfrom_convert ? RL_CONVERT : 0)
+#endif
+		     | (eol_nulls || reading_remotely ? RL_EOL_NULLS : 0);
 
 	rprintf(FLOG, "building file list\n");
 	if (show_filelist_p())
@@ -1635,10 +1668,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	flist = cur_flist = flist_new(0, "send_file_list");
 	if (inc_recurse) {
 		dir_flist = flist_new(FLIST_TEMP, "send_file_list");
-		flags = FLAG_DIVERT_DIRS;
+		flags = FLAG_DIVERT_DIRS | FLAG_XFER_DIR;
 	} else {
 		dir_flist = cur_flist;
-		flags = 0;
+		flags = FLAG_XFER_DIR;
 	}
 
 	disable_buffering = io_start_buffering_out(f);
@@ -1657,7 +1690,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		int is_dot_dir;
 
 		if (use_ff_fd) {
-			if (read_filesfrom_line(filesfrom_fd, fbuf) == 0)
+			if (read_line(filesfrom_fd, fbuf, sizeof fbuf, rl_flags) == 0)
 				break;
 			sanitize_path(fbuf, fbuf, "", 0, NULL);
 		} else {
@@ -1763,16 +1796,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		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;
+				continue;
 			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);
+		} else if (!push_pathname(lastdir, lastdir_len))
 			continue;
-		}
 
 		if (fn != fbuf)
 			memmove(fbuf, fn, len + 1);
@@ -1804,7 +1832,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			if (fn != p || (*lp && *lp != '/')) {
 				int save_copy_links = copy_links;
 				int save_xfer_dirs = xfer_dirs;
-				int dir_flags = inc_recurse ? FLAG_DIVERT_DIRS : 0;
+				int dir_flags = flags & ~FLAG_XFER_DIR;
 				copy_links |= copy_unsafe_links;
 				xfer_dirs = 1;
 				while ((slash = strchr(slash+1, '/')) != 0) {
@@ -1826,7 +1854,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 | flags;
+			int top_flags = FLAG_TOP_DIR | flags;
 			file = send_file_name(f, flist, fbuf, &st,
 					      top_flags, ALL_FILTERS);
 			if (file && !inc_recurse)
@@ -1867,20 +1895,27 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 #ifdef ICONV_OPTION
 	if (need_unsorted_flist) {
 		if (inc_recurse) {
-			if (!(flist->sorted = new_array(struct file_struct *, flist->count)))
+			if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
 				out_of_memory("send_file_list");
 			memcpy(flist->sorted, flist->files,
-			       flist->count * sizeof (struct file_struct*));
+			       flist->used * sizeof (struct file_struct*));
 			clean_flist(flist, 0);
-		} else
+		} 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->count;
+	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_id_list(f);
@@ -1895,7 +1930,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);
@@ -1936,17 +1971,17 @@ struct file_list *recv_file_list(int f)
 
 	start_read = stats.total_read;
 
-	flist = flist_new(0, "recv_file_list");
-
 #ifdef SUPPORT_HARD_LINKS
-	if (preserve_hard_links && protocol_version < 30)
+	if (preserve_hard_links && !first_flist)
 		init_hard_links();
 #endif
 
+	flist = flist_new(0, "recv_file_list");
+
 	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;
@@ -1963,22 +1998,26 @@ struct file_list *recv_file_list(int f)
 
 		if (inc_recurse && S_ISDIR(file->mode)) {
 			flist_expand(dir_flist, 1);
-			dir_flist->files[dir_flist->count++] = file;
+			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);
@@ -1990,25 +2029,25 @@ struct file_list *recv_file_list(int f)
 		 * 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->count)))
+		if (!(flist->sorted = new_array(struct file_struct *, flist->used)))
 			out_of_memory("recv_file_list");
 		memcpy(flist->sorted, flist->files,
-		       flist->count * sizeof (struct file_struct*));
-		if (inc_recurse && dir_flist->count > dstart) {
+		       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->count);
+						dir_flist->used);
 			memcpy(dir_flist->sorted + dstart, dir_flist->files + dstart,
-			       (dir_flist->count - dstart) * sizeof (struct file_struct*));
-			fsort(dir_flist->sorted + dstart, dir_flist->count - 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->count > dstart) {
+		if (inc_recurse && dir_flist->used > dstart) {
 			dir_flist->sorted = dir_flist->files;
-			fsort(dir_flist->sorted + dstart, dir_flist->count - dstart);
+			fsort(dir_flist->sorted + dstart, dir_flist->used - dstart);
 		}
 	}
 
@@ -2032,7 +2071,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]);
 	}
 
@@ -2040,7 +2079,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;
 }
@@ -2056,12 +2095,12 @@ 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,
 				"[%s] Invalid dir index: %d (%d - %d)\n",
 				who_am_i(), ndx, NDX_FLIST_OFFSET,
-				NDX_FLIST_OFFSET - dir_flist->count + 1);
+				NDX_FLIST_OFFSET - dir_flist->used + 1);
 			exit_cleanup(RERR_PROTOCOL);
 		}
 		if (verbose > 3) {
@@ -2144,12 +2183,10 @@ struct file_list *flist_new(int flags, char *msg)
 {
 	struct file_list *flist;
 
-	flist = new(struct file_list);
+	flist = new0(struct file_list);
 	if (!flist)
 		out_of_memory(msg);
 
-	memset(flist, 0, sizeof flist[0]);
-
 	if (flags & FLIST_TEMP) {
 		if (!(flist->file_pool = pool_create(SMALL_EXTENT, 0,
 						out_of_memory, POOL_INTERN)))
@@ -2167,8 +2204,9 @@ struct file_list *flist_new(int flags, char *msg)
 		} else {
 			flist->file_pool = first_flist->file_pool;
 
-			flist->ndx_start = first_flist->prev->ndx_start
-					 + first_flist->prev->count;
+			flist->ndx_start = first_flist->prev->ndx_end + 2;
+			if (flist->ndx_start <= high_hlink_ndx)
+				flist->ndx_start = high_hlink_ndx + 1;
 
 			flist->prev = first_flist->prev;
 			flist->prev->next = first_flist->prev = flist;
@@ -2200,7 +2238,7 @@ 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--;
 	}
 
@@ -2224,15 +2262,16 @@ static void clean_flist(struct file_list *flist, int strip_root)
 
 	if (!flist)
 		return;
-	if (flist->count == 0) {
+	if (flist->used == 0) {
 		flist->high = -1;
+		flist->low = 0;
 		return;
 	}
 
-	fsort(flist->sorted, flist->count);
+	fsort(flist->sorted, flist->used);
 
 	if (!am_sender || inc_recurse) {
-		for (i = prev_i = 0; i < flist->count; i++) {
+		for (i = prev_i = 0; i < flist->used; i++) {
 			if (F_IS_ACTIVE(flist->sorted[i])) {
 				prev_i = i;
 				break;
@@ -2240,11 +2279,11 @@ static void clean_flist(struct file_list *flist, int strip_root)
 		}
 		flist->low = prev_i;
 	} else {
-		i = prev_i = flist->count - 1;
+		i = prev_i = flist->used - 1;
 		flist->low = 0;
 	}
 
-	while (++i < flist->count) {
+	while (++i < flist->used) {
 		int j;
 		struct file_struct *file = flist->sorted[i];
 
@@ -2266,19 +2305,20 @@ static void clean_flist(struct file_list *flist, int strip_root)
 			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. */
+			 * list.  Otherwise keep the first one. */
 			if (S_ISDIR(file->mode)) {
 				struct file_struct *fp = flist->sorted[j];
-				if (!S_ISDIR(fp->mode))
+				if (!S_ISDIR(fp->mode) || !(fp->flags & FLAG_XFER_DIR))
 					keep = i, drop = j;
-				else
+				else {
+					if (am_sender)
+						file->flags |= FLAG_DUPLICATE;
 					keep = j, drop = i;
+				}
 			} else
 				keep = j, drop = i;
 
-			if (am_sender)
-				flist->sorted[drop]->flags |= FLAG_DUPLICATE;
-			else {
+			if (!am_sender) {
 				if (verbose > 1) {
 					rprintf(FINFO,
 					    "removing duplicate name %s from file list (%d)\n",
@@ -2396,16 +2436,16 @@ 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++) {
+	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) && preserve_uid) {
+		if ((am_root || am_sender) && uid_ndx) {
 			snprintf(uidbuf, sizeof uidbuf, " uid=%u",
 				 F_OWNER(file));
 		} else
 			*uidbuf = '\0';
-		if (preserve_gid) {
+		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",
@@ -2436,6 +2476,8 @@ static void output_flist(struct file_list *flist)
 enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
 enum fnc_type { t_PATH, t_ITEM };
 
+static int found_prefix;
+
 /* Compare the names of two file_struct entities, similar to how strcmp()
  * would do if it were operating on the joined strings.
  *
@@ -2451,7 +2493,7 @@ enum fnc_type { t_PATH, t_ITEM };
  * cannot (and never is in the current codebase).  The basename component
  * may be NULL (for a removed item), in which case it is considered to be
  * after any existing item. */
-int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
+int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
 {
 	int dif;
 	const uchar *c1, *c2;
@@ -2556,6 +2598,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 				}
 				/* FALL THROUGH */
 			case s_TRAILING:
+				found_prefix = 1;
 				if (!*c1)
 					return 0;
 				type2 = t_ITEM;
@@ -2569,6 +2612,16 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	return dif;
 }
 
+/* Returns 1 if f1's filename has all of f2's filename as a prefix.  This does
+ * not match if f2's basename is not an exact match of a path element in f1.
+ * E.g. /path/foo is not a prefix of /path/foobar/baz, but /path/foobar is. */
+int f_name_has_prefix(const struct file_struct *f1, const struct file_struct *f2)
+{
+	found_prefix = 0;
+	f_name_cmp(f1, f2);
+	return found_prefix;
+}
+
 char *f_name_buf(void)
 {
 	static char names[5][MAXPATHLEN];
@@ -2583,7 +2636,7 @@ char *f_name_buf(void)
  * 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(struct file_struct *f, char *fbuf)
+char *f_name(const struct file_struct *f, char *fbuf)
 {
 	if (!f || !F_IS_ACTIVE(f))
 		return NULL;
@@ -2613,6 +2666,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);
@@ -2629,10 +2683,12 @@ struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
 	xfer_dirs = save_xfer_dirs;
 	recurse = save_recurse;
 	if (do_progress)
-		flist_count_offset += dirlist->count;
+		flist_count_offset += dirlist->used;
 
+	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);