X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9863bdbc936f730dda710742dfa65aabc034a6c7..53ec55a88e932bee3f0a7ee9b95d2671602544b0:/flist.c

diff --git a/flist.c b/flist.c
index d694b451..afb1836b 100644
--- a/flist.c
+++ b/flist.c
@@ -21,11 +21,11 @@
  */
 
 #include "rsync.h"
+#include "ifuncs.h"
 #include "rounding.h"
 #include "io.h"
 
 extern int verbose;
-extern int list_only;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
@@ -52,6 +52,7 @@ extern int preserve_devices;
 extern int preserve_specials;
 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 +64,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 +75,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
@@ -113,6 +116,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);
@@ -167,35 +171,6 @@ void show_flist_stats(void)
 	/* Nothing yet */
 }
 
-static void list_file_entry(struct file_struct *f)
-{
-	char permbuf[PERMSTRING_SIZE];
-	double len;
-
-	if (!F_IS_ACTIVE(f)) {
-		/* this can happen if duplicate names were removed */
-		return;
-	}
-
-	permstring(permbuf, f->mode);
-	len = F_LENGTH(f);
-
-	/* TODO: indicate '+' if the entry has an ACL. */
-
-#ifdef SUPPORT_LINKS
-	if (preserve_links && S_ISLNK(f->mode)) {
-		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-			permbuf, len, timestring(f->modtime),
-			f_name(f, NULL), F_SYMLINK(f));
-	} else
-#endif
-	{
-		rprintf(FINFO, "%s %11.0f %s %s\n",
-			permbuf, len, timestring(f->modtime),
-			f_name(f, NULL));
-	}
-}
-
 /* Stat either a symlink or its referent, depending on the settings of
  * copy_links, copy_unsafe_links, etc.  Returns -1 on error, 0 on success.
  *
@@ -356,11 +331,13 @@ 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;
+#ifdef SUPPORT_HARD_LINKS
 	static int64 dev;
+#endif
 	static dev_t rdev;
 	static uint32 rdev_major;
 	static uid_t uid;
@@ -374,22 +351,21 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 
 #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,
@@ -397,21 +373,27 @@ 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);
 
-	xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
+	/* Initialize starting value of xflags. */
+	if (protocol_version >= 30 && S_ISDIR(file->mode)) {
+		if (file->flags & FLAG_CONTENT_DIR)
+			xflags = file->flags & FLAG_TOP_DIR;
+		else if (file->flags & FLAG_IMPLIED_DIR)
+			xflags = XMIT_TOP_DIR | XMIT_NO_CONTENT_DIR;
+		else
+			xflags = XMIT_NO_CONTENT_DIR;
+	} else
+		xflags = file->flags & FLAG_TOP_DIR; /* FLAG_TOP_DIR == XMIT_TOP_DIR */
 
 	if (file->mode == 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) {
@@ -465,7 +447,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			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);
+				high_hlink_ndx = ndx + first_ndx;
+				np->data = (void*)(long)(high_hlink_ndx + 1);
 				xflags |= XMIT_HLINK_FIRST;
 			}
 			xflags |= XMIT_HLINKED;
@@ -517,7 +500,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 
 	if (first_hlink_ndx >= 0) {
 		write_varint(f, first_hlink_ndx);
-		goto the_end;
+		if (first_hlink_ndx >= first_ndx)
+			goto the_end;
 	}
 
 	write_varlong30(f, F_LENGTH(file), 3);
@@ -617,7 +601,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 {
 	static int64 modtime;
 	static mode_t mode;
+#ifdef SUPPORT_HARD_LINKS
 	static int64 dev;
+#endif
 	static dev_t rdev;
 	static uint32 rdev_major;
 	static uid_t uid;
@@ -662,25 +648,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
 
@@ -705,33 +685,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_varint(f);
-		if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->used) {
+		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->used);
+				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 (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 (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;
 		}
-		if (preserve_links && S_ISLNK(mode))
-			linkname_len = strlen(F_SYMLINK(first)) + 1;
-		else
-			linkname_len = 0;
-		goto create_object;
 	}
 #endif
 
@@ -820,7 +801,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
 
@@ -893,22 +874,26 @@ 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 (xflags & XMIT_TOP_DIR) {
+		if (protocol_version >= 30) {
+			if (!(xflags & XMIT_NO_CONTENT_DIR)) {
+				if (xflags & XMIT_TOP_DIR)
+					file->flags |= FLAG_TOP_DIR;
+				file->flags |= FLAG_CONTENT_DIR;
+			} else if (xflags & XMIT_TOP_DIR)
+				file->flags |= FLAG_IMPLIED_DIR;
+		} else 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
 			    && lastname[del_hier_name_len-1] == '.'
 			    && 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;
+			file->flags |= FLAG_TOP_DIR | FLAG_CONTENT_DIR;
 		} else if (in_del_hier) {
 			if (!relative_paths || !del_hier_name_len
 			 || (l1 >= del_hier_name_len
 			  && lastname[del_hier_name_len] == '/'))
-				file->flags |= FLAG_XFER_DIR;
+				file->flags |= FLAG_CONTENT_DIR;
 			else
 				in_del_hier = 0;
 		}
@@ -924,8 +909,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);
@@ -937,8 +922,11 @@ 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->used : 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 ht_int64_node *np;
@@ -970,8 +958,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 			/* 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);
@@ -1067,23 +1055,24 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			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
-	 * file if -L (or similar) was specified. */
-	if (one_file_system && st.st_dev != filesystem_dev
-	 && S_ISDIR(st.st_mode)) {
-		if (one_file_system > 1) {
-			if (verbose > 2) {
-				rprintf(FINFO, "skipping mount-point dir %s\n",
-					thisname);
+		/* -x only affects dirs because we need to avoid recursing
+		 * into a mount-point directory, not to avoid copying a
+		 * symlinked file if -L (or similar) was specified. */
+		if (one_file_system && st.st_dev != filesystem_dev
+		 && BITS_SETnUNSET(flags, FLAG_CONTENT_DIR, FLAG_TOP_DIR)) {
+			if (one_file_system > 1) {
+				if (verbose > 1) {
+					rprintf(FINFO,
+					    "[%s] skipping mount-point dir %s\n",
+					    who_am_i(), thisname);
+				}
+				return NULL;
 			}
-			return NULL;
+			flags |= FLAG_MOUNT_DIR;
+			flags &= ~FLAG_CONTENT_DIR;
 		}
-		flags |= FLAG_MOUNT_DIR;
-	}
+	} else
+		flags &= ~FLAG_CONTENT_DIR;
 
 	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
 		if (ignore_perishable)
@@ -1107,6 +1096,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 		 && flags & FLAG_DIVERT_DIRS) {
 			/* Room for parent/sibling/next-child info. */
 			extra_len += DIRNODE_EXTRA_CNT * EXTRA_LEN;
+			if (relative_paths)
+				extra_len += PTR_EXTRA_CNT * EXTRA_LEN;
 			dir_count++;
 			pool = dir_flist->file_pool;
 		} else
@@ -1256,7 +1247,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 {
 	struct file_struct *file;
 #if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
-	statx sx;
+	stat_x sx;
 #endif
 
 	file = make_file(fname, flist, stp, flags, filter_level);
@@ -1287,7 +1278,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 	flist_expand(flist, 1);
 	flist->files[flist->used++] = file;
 	if (f >= 0) {
-		send_file_entry(f, file, flist->used - 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);
@@ -1420,10 +1411,6 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
 		dir_flist->files[dir_flist->used++] = file;
 		dir_cnt--;
 
-		if (!(file->flags & FLAG_XFER_DIR)
-		 || file->flags & FLAG_MOUNT_DIR)
-			continue;
-
 		if (dp)
 			DIR_NEXT_SIBLING(dp) = dir_flist->used - 1;
 		else if (parent_dp)
@@ -1509,10 +1496,87 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
 	}
 }
 
+static char lastpath[MAXPATHLEN] = "";
+static int lastpath_len = 0;
+static struct file_struct *lastpath_struct;
+
+static void send_implied_dirs(int f, struct file_list *flist, char *fname,
+			      char *start, char *limit, int flags, int is_dot_dir)
+{
+	struct file_struct *file;
+	item_list *relname_list;
+	relnamecache **rnpp;
+	char *slash;
+	int len, need_new_dir;
+
+	flags = (flags | FLAG_IMPLIED_DIR) & ~(FLAG_TOP_DIR | FLAG_CONTENT_DIR);
+
+	if (inc_recurse) {
+		if (lastpath_struct && F_PATHNAME(lastpath_struct) == pathname
+		 && lastpath_len == limit - fname
+		 && strncmp(lastpath, fname, lastpath_len) == 0)
+			need_new_dir = 0;
+		else
+			need_new_dir = 1;
+	} else
+		need_new_dir = 1;
+
+	if (need_new_dir) {
+		int save_copy_links = copy_links;
+		int save_xfer_dirs = xfer_dirs;
+
+		copy_links = xfer_dirs = 1;
+
+		*limit = '\0';
+
+		for (slash = start; (slash = strchr(slash+1, '/')) != NULL; ) {
+			*slash = '\0';
+			send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
+			*slash = '/';
+		}
+
+		file = send_file_name(f, flist, fname, NULL, flags, ALL_FILTERS);
+		if (inc_recurse) {
+			if (file && !S_ISDIR(file->mode))
+				file = NULL;
+			lastpath_struct = file;
+		}
+
+		strlcpy(lastpath, fname, sizeof lastpath);
+		lastpath_len = limit - fname;
+
+		*limit = '/';
+
+		copy_links = save_copy_links;
+		xfer_dirs = save_xfer_dirs;
+
+		if (!inc_recurse)
+			return;
+	}
+
+	if (!lastpath_struct)
+		return; /* dir must have vanished */
+
+	len = strlen(limit+1);
+	memcpy(&relname_list, F_DIR_RELNAMES_P(lastpath_struct), sizeof relname_list);
+	if (!relname_list) {
+		if (!(relname_list = new0(item_list)))
+			out_of_memory("send_implied_dirs");
+		memcpy(F_DIR_RELNAMES_P(lastpath_struct), &relname_list, sizeof relname_list);
+	}
+	rnpp = EXPAND_ITEM_LIST(relname_list, relnamecache *, 32);
+	if (!(*rnpp = (relnamecache*)new_array(char, sizeof (relnamecache) + len)))
+		out_of_memory("send_implied_dirs");
+	(*rnpp)->is_dot_dir = is_dot_dir;
+	strlcpy((*rnpp)->fname, limit+1, len + 1);
+}
+
 static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 {
 	char fbuf[MAXPATHLEN];
-	int dlen;
+	item_list *relname_list;
+	int len, dlen, flags = FLAG_DIVERT_DIRS | FLAG_CONTENT_DIR;
+	size_t j;
 
 	f_name(file, fbuf);
 	dlen = strlen(fbuf);
@@ -1524,13 +1588,65 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
 
 	change_local_filter_dir(fbuf, dlen, send_dir_depth);
 
-	send_directory(f, flist, fbuf, dlen, FLAG_DIVERT_DIRS | FLAG_XFER_DIR);
+	if (file->flags & FLAG_CONTENT_DIR) {
+		if (one_file_system) {
+			STRUCT_STAT st;
+			if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+				io_error |= IOERR_GENERAL;
+				rsyserr(FERROR, errno, "link_stat %s failed",
+					full_fname(fbuf));
+				return;
+			}
+			filesystem_dev = st.st_dev;
+		}
+		send_directory(f, flist, fbuf, dlen, flags);
+	}
+
+	if (!relative_paths)
+		return;
+
+	memcpy(&relname_list, F_DIR_RELNAMES_P(file), sizeof relname_list);
+	if (!relname_list)
+		return;
+
+	for (j = 0; j < relname_list->count; j++) {
+		char *slash;
+		relnamecache *rnp = ((relnamecache**)relname_list->items)[j];
+		int is_dot_dir = rnp->is_dot_dir;
+
+		fbuf[dlen] = '/';
+		len = strlcpy(fbuf + dlen + 1, rnp->fname, sizeof fbuf - dlen - 1);
+		free(rnp);
+		if (len >= (int)sizeof fbuf)
+			continue; /* Impossible... */
+
+		slash = strchr(fbuf+dlen+1, '/');
+		if (slash) {
+			send_implied_dirs(f, flist, fbuf, fbuf+dlen+1, slash, flags, is_dot_dir);
+			continue;
+		}
+
+		if (is_dot_dir) {
+			STRUCT_STAT st;
+			if (link_stat(fbuf, &st, 1) != 0) {
+				io_error |= IOERR_GENERAL;
+				rsyserr(FERROR, errno, "link_stat %s failed",
+					full_fname(fbuf));
+				continue;
+			}
+			send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR | flags, ALL_FILTERS);
+		} else
+			send_file_name(f, flist, fbuf, NULL, FLAG_TOP_DIR | flags, ALL_FILTERS);
+	}
+
+	free(relname_list);
 }
 
 void send_extra_file_list(int f, int at_least)
 {
 	struct file_list *flist;
 	int64 start_write;
+	uint16 prev_flags;
 	int future_cnt, save_io_error = io_error;
 
 	if (flist_eof)
@@ -1546,6 +1662,7 @@ void send_extra_file_list(int f, int at_least)
 	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");
@@ -1561,6 +1678,7 @@ void send_extra_file_list(int f, int at_least)
 		flist->parent_ndx = dir_ndx;
 
 		send1extra(f, file, flist);
+		prev_flags = file->flags;
 		dp = F_DIR_NODE_P(file);
 
 		/* If there are any duplicate directory names that follow, we
@@ -1570,7 +1688,11 @@ 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];
+			/* Try to avoid some duplicate scanning of identical dirs. */
+			if (F_PATHNAME(file) == pathname && prev_flags & FLAG_CONTENT_DIR)
+				file->flags &= ~FLAG_CONTENT_DIR;
 			send1extra(f, file, flist);
+			prev_flags = file->flags;
 			dp = F_DIR_NODE_P(file);
 		}
 
@@ -1632,12 +1754,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	int len, dirlen;
 	STRUCT_STAT st;
 	char *p, *dir;
-	char lastpath[MAXPATHLEN] = "";
 	struct file_list *flist;
 	struct timeval start_tv, end_tv;
 	int64 start_write;
 	int use_ff_fd = 0;
-	int flags, disable_buffering;
+	int disable_buffering;
+	int flags = recurse ? FLAG_CONTENT_DIR : 0;
+	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())
@@ -1648,6 +1776,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	start_write = stats.total_written;
 	gettimeofday(&start_tv, NULL);
 
+	if (relative_paths && protocol_version >= 30)
+		implied_dirs = 1; /* We send flagged implied dirs */
+
 #ifdef SUPPORT_HARD_LINKS
 	if (preserve_hard_links && protocol_version >= 30 && !cur_flist)
 		init_hard_links();
@@ -1656,11 +1787,9 @@ 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 | FLAG_XFER_DIR;
-	} else {
+		flags |= FLAG_DIVERT_DIRS;
+	} else
 		dir_flist = cur_flist;
-		flags = FLAG_XFER_DIR;
-	}
 
 	disable_buffering = io_start_buffering_out(f);
 	if (filesfrom_fd >= 0) {
@@ -1678,7 +1807,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 {
@@ -1761,9 +1890,14 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				} else
 					break;
 			}
-			if (len == 1 && fn[0] == '/')
-				fn[len++] = '.';
 			fn[len] = '\0';
+			if (len == 1) {
+				if (fn[0] == '/') {
+					fn = "/.";
+					len = 2;
+				} else if (fn[0] == '.')
+					is_dot_dir = 1;
+			}
 			/* Reject a ".." dir in the active part of the path. */
 			for (p = fn; (p = strstr(p, "..")) != NULL; p += 2) {
 				if ((p[2] == '/' || p[2] == '\0')
@@ -1779,26 +1913,22 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (!*fn) {
 			len = 1;
 			fn = ".";
+			is_dot_dir = 1;
 		}
 
 		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);
 
-		if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+		if (link_stat(fbuf, &st, copy_dirlinks || is_dot_dir) != 0) {
 			io_error |= IOERR_GENERAL;
 			rsyserr(FERROR, errno, "link_stat %s failed",
 				full_fname(fbuf));
@@ -1810,7 +1940,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			continue;
 		}
 
-		if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
+		if (inc_recurse && relative_paths && *fbuf) {
+			if ((p = strchr(fbuf+1, '/')) != NULL) {
+				send_implied_dirs(f, flist, fbuf, fbuf, p, flags, is_dot_dir);
+				continue;
+			}
+		} else if (implied_dirs && (p=strrchr(fbuf,'/')) && p != fbuf) {
 			/* Send the implied directories at the start of the
 			 * source spec, so we get their permissions right. */
 			char *lp = lastpath, *slash = fbuf;
@@ -1822,24 +1957,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 					slash = fn;
 			}
 			*p = '/';
-			if (fn != p || (*lp && *lp != '/')) {
-				int save_copy_links = copy_links;
-				int save_xfer_dirs = xfer_dirs;
-				int dir_flags = flags & ~FLAG_XFER_DIR;
-				copy_links |= copy_unsafe_links;
-				xfer_dirs = 1;
-				while ((slash = strchr(slash+1, '/')) != 0) {
-					*slash = '\0';
-					send_file_name(f, flist, fbuf, NULL,
-						       dir_flags, ALL_FILTERS);
-					*slash = '/';
-				}
-				copy_links = save_copy_links;
-				xfer_dirs = save_xfer_dirs;
-				*p = '\0';
-				strlcpy(lastpath, fbuf, sizeof lastpath);
-				*p = '/';
-			}
+			if (fn != p || (*lp && *lp != '/'))
+				send_implied_dirs(f, flist, fbuf, slash, p, flags, 0);
 		}
 
 		if (one_file_system)
@@ -1847,7 +1966,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 | flags;
+			int top_flags = FLAG_TOP_DIR | FLAG_CONTENT_DIR | flags;
 			file = send_file_name(f, flist, fbuf, &st,
 					      top_flags, ALL_FILTERS);
 			if (file && !inc_recurse)
@@ -1965,7 +2084,7 @@ struct file_list *recv_file_list(int f)
 	start_read = stats.total_read;
 
 #ifdef SUPPORT_HARD_LINKS
-	if (preserve_hard_links && protocol_version < 30)
+	if (preserve_hard_links && !first_flist)
 		init_hard_links();
 #endif
 
@@ -2062,12 +2181,6 @@ struct file_list *recv_file_list(int f)
 	if (verbose > 3)
 		output_flist(flist);
 
-	if (list_only) {
-		int i;
-		for (i = flist->low; i <= flist->high; i++)
-			list_file_entry(flist->files[i]);
-	}
-
 	if (verbose > 2)
 		rprintf(FINFO, "recv_file_list done\n");
 
@@ -2176,8 +2289,7 @@ struct file_list *flist_new(int flags, char *msg)
 {
 	struct file_list *flist;
 
-	flist = new0(struct file_list);
-	if (!flist)
+	if (!(flist = new0(struct file_list)))
 		out_of_memory(msg);
 
 	if (flags & FLIST_TEMP) {
@@ -2198,6 +2310,8 @@ struct file_list *flist_new(int flags, char *msg)
 			flist->file_pool = first_flist->file_pool;
 
 			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;
@@ -2296,29 +2410,29 @@ 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))
 					keep = i, drop = j;
-				else
+				else {
+					if (am_sender)
+						file->flags |= FLAG_DUPLICATE;
+					else { /* Make sure we merge our vital flags. */
+						fp->flags |= file->flags & (FLAG_TOP_DIR|FLAG_CONTENT_DIR);
+						fp->flags &= file->flags | ~FLAG_IMPLIED_DIR;
+					}
 					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",
 					    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]);
 			}