X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/98b1689dcba04ad6385eca04a3d9c02b5f65f1e7..9439c0cb5a4b020b9bfcfe0351e33c17b9c53b54:/flist.c

diff --git a/flist.c b/flist.c
index ce723928..eb94d004 100644
--- a/flist.c
+++ b/flist.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison
+ * 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,6 +22,7 @@
 
 #include "rsync.h"
 #include "rounding.h"
+#include "io.h"
 
 extern int verbose;
 extern int list_only;
@@ -30,7 +30,8 @@ extern int am_root;
 extern int am_server;
 extern int am_daemon;
 extern int am_sender;
-extern int incremental;
+extern int am_generator;
+extern int inc_recurse;
 extern int do_progress;
 extern int always_checksum;
 extern int module_id;
@@ -42,6 +43,8 @@ extern int filesfrom_fd;
 extern int one_file_system;
 extern int copy_dirlinks;
 extern int keep_dirlinks;
+extern int preserve_acls;
+extern int preserve_xattrs;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_devices;
@@ -84,9 +87,9 @@ static dev_t tmp_rdev;
 #ifdef SUPPORT_HARD_LINKS
 static int64 tmp_dev, tmp_ino;
 #endif
-static char tmp_sum[MD4_SUM_LENGTH];
+static char tmp_sum[MAX_DIGEST_LEN];
 
-static char empty_sum[MD4_SUM_LENGTH];
+static char empty_sum[MAX_DIGEST_LEN];
 static int flist_count_offset; /* for --delete --progress */
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
@@ -98,12 +101,14 @@ void init_flist(void)
 		rprintf(FINFO, "FILE_STRUCT_LEN=%d, EXTRA_LEN=%d\n",
 			(int)FILE_STRUCT_LEN, (int)EXTRA_LEN);
 	}
-	checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
+	checksum_len = protocol_version < 21 ? 2
+		     : protocol_version < 30 ? MD4_DIGEST_LEN
+		     : MD5_DIGEST_LEN;
 }
 
 static int show_filelist_p(void)
 {
-	return verbose && xfer_dirs && !am_server && !incremental;
+	return verbose && xfer_dirs && !am_server && !inc_recurse;
 }
 
 static void start_filelist_progress(char *kind)
@@ -153,6 +158,8 @@ static void list_file_entry(struct file_struct *f)
 	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",
@@ -190,12 +197,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
 }
 
@@ -203,17 +210,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
 }
 
@@ -248,26 +255,6 @@ 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,
 			   char *fbuf, int len, int flags);
 
@@ -332,8 +319,8 @@ int push_flist_dir(const char *dir, int len)
 
 	if (dir && !push_dir(dir, 0)) {
 		io_error |= IOERR_GENERAL;
-		rsyserr(FERROR, errno, "push_dir %s failed",
-			full_fname(dir));
+		rsyserr(FERROR, errno, "push_dir %s failed in %s",
+			full_fname(dir), curr_dir);
 		return 0;
 	}
 
@@ -380,8 +367,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 				flags |= XMIT_SAME_RDEV_MAJOR;
 			else
 				rdev_major = major(rdev);
-			if ((uint32)minor(rdev) <= 0xFFu)
-				flags |= XMIT_RDEV_MINOR_IS_SMALL;
+			if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu)
+				flags |= XMIT_RDEV_MINOR_8_pre30;
 		}
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
@@ -392,7 +379,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			uid = F_UID(file);
 			if (preserve_uid && !numeric_ids) {
 				user_name = add_uid(uid);
-				if (incremental && user_name)
+				if (inc_recurse && user_name)
 					flags |= XMIT_USER_NAME_FOLLOWS;
 			}
 		}
@@ -404,7 +391,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 			gid = F_GID(file);
 			if (preserve_gid && !numeric_ids) {
 				group_name = add_gid(gid);
-				if (incremental && group_name)
+				if (inc_recurse && group_name)
 					flags |= XMIT_GROUP_NAME_FOLLOWS;
 			}
 		}
@@ -418,9 +405,9 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	if (tmp_dev != 0) {
 		if (protocol_version >= 30) {
 			struct idev_node *np = idev_node(tmp_dev, tmp_ino);
-			first_hlink_ndx = (int32)np->data - 1;
+			first_hlink_ndx = (int32)(long)np->data - 1;
 			if (first_hlink_ndx < 0) {
-				np->data = (void*)(ndx + 1);
+				np->data = (void*)(long)(ndx + 1);
 				flags |= XMIT_HLINK_FIRST;
 			}
 			flags |= XMIT_HLINKED;
@@ -465,35 +452,47 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	if (flags & XMIT_SAME_NAME)
 		write_byte(f, l1);
 	if (flags & XMIT_LONG_NAME)
-		write_int(f, l2);
+		write_varint30(f, l2);
 	else
 		write_byte(f, l2);
 	write_buf(f, fname + l1, l2);
 
 	if (first_hlink_ndx >= 0) {
-		write_int(f, first_hlink_ndx);
+		write_varint30(f, first_hlink_ndx);
 		goto the_end;
 	}
 
-	write_longint(f, F_LENGTH(file));
-	if (!(flags & XMIT_SAME_TIME))
-		write_int(f, modtime);
+	write_varlong30(f, F_LENGTH(file), 3);
+	if (!(flags & XMIT_SAME_TIME)) {
+		if (protocol_version >= 30)
+			write_varlong(f, modtime, 4);
+		else
+			write_int(f, modtime);
+	}
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		write_int(f, uid);
-		if (flags & XMIT_USER_NAME_FOLLOWS) {
-			int len = strlen(user_name);
-			write_byte(f, len);
-			write_buf(f, user_name, len);
+		if (protocol_version < 30)
+			write_int(f, uid);
+		else {
+			write_varint(f, uid);
+			if (flags & 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)) {
-		write_int(f, gid);
-		if (flags & XMIT_GROUP_NAME_FOLLOWS) {
-			int len = strlen(group_name);
-			write_byte(f, len);
-			write_buf(f, group_name, len);
+		if (protocol_version < 30)
+			write_int(f, gid);
+		else {
+			write_varint(f, gid);
+			if (flags & XMIT_GROUP_NAME_FOLLOWS) {
+				int len = strlen(group_name);
+				write_byte(f, len);
+				write_buf(f, group_name, len);
+			}
 		}
 	}
 	if ((preserve_devices && IS_DEVICE(mode))
@@ -503,8 +502,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 				write_int(f, (int)rdev);
 		} else {
 			if (!(flags & XMIT_SAME_RDEV_MAJOR))
-				write_int(f, major(rdev));
-			if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+				write_varint30(f, major(rdev));
+			if (protocol_version >= 30)
+				write_varint(f, minor(rdev));
+			else if (flags & XMIT_RDEV_MINOR_8_pre30)
 				write_byte(f, minor(rdev));
 			else
 				write_int(f, minor(rdev));
@@ -515,7 +516,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	if (preserve_links && S_ISLNK(mode)) {
 		const char *sl = F_SYMLINK(file);
 		int len = strlen(sl);
-		write_int(f, len);
+		write_varint30(f, len);
 		write_buf(f, sl, len);
 	}
 #endif
@@ -548,12 +549,15 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 
   the_end:
 	strlcpy(lastname, fname, MAXPATHLEN);
+
+	if (S_ISREG(mode) || S_ISLNK(mode))
+		stats.total_size += F_LENGTH(file);
 }
 
 static struct file_struct *recv_file_entry(struct file_list *flist,
 					   int flags, int f)
 {
-	static time_t modtime;
+	static int64 modtime;
 	static mode_t mode;
 	static int64 dev;
 	static dev_t rdev;
@@ -578,7 +582,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		l1 = read_byte(f);
 
 	if (flags & XMIT_LONG_NAME)
-		l2 = read_int(f);
+		l2 = read_varint30(f);
 	else
 		l2 = read_byte(f);
 
@@ -617,7 +621,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	if (protocol_version >= 30
 	 && BITS_SETnUNSET(flags, XMIT_HLINKED, XMIT_HLINK_FIRST)) {
 		struct file_struct *first;
-		first_hlink_ndx = read_int(f);
+		first_hlink_ndx = read_varint30(f);
 		if (first_hlink_ndx < 0 || first_hlink_ndx >= flist->count) {
 			rprintf(FERROR,
 				"hard-link reference out of range: %d (%d)\n",
@@ -636,6 +640,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		 || (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;
@@ -645,9 +650,20 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	}
 #endif
 
-	file_length = read_longint(f);
-	if (!(flags & XMIT_SAME_TIME))
-		modtime = (time_t)read_int(f);
+	file_length = read_varlong30(f, 3);
+	if (!(flags & XMIT_SAME_TIME)) {
+		if (protocol_version >= 30) {
+			modtime = read_varlong(f, 4);
+#if SIZEOF_TIME_T < SIZEOF_INT64
+			if ((modtime > INT_MAX || modtime < INT_MIN) && !am_generator) {
+				rprintf(FERROR,
+				    "Time value of %s truncated on receiver.\n",
+				    lastname);
+			}
+#endif
+		} else
+			modtime = read_int(f);
+	}
 	if (!(flags & XMIT_SAME_MODE))
 		mode = from_wire_mode(read_int(f));
 
@@ -655,18 +671,26 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		mode = tweak_mode(mode, chmod_modes);
 
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		uid = (uid_t)read_int(f);
-		if (flags & XMIT_USER_NAME_FOLLOWS)
-			uid = recv_user_name(f, uid);
-		else if (incremental && am_root && !numeric_ids)
-			uid = match_uid(uid);
+		if (protocol_version < 30)
+			uid = (uid_t)read_int(f);
+		else {
+			uid = (uid_t)read_varint(f);
+			if (flags & 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)) {
-		gid = (gid_t)read_int(f);
-		if (flags & XMIT_GROUP_NAME_FOLLOWS)
-			gid = recv_group_name(f, gid);
-		else if (incremental && (!am_root || !numeric_ids))
-			gid = match_gid(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);
+			else if (inc_recurse && (!am_root || !numeric_ids))
+				gid = match_gid(gid);
+		}
 	}
 
 	if ((preserve_devices && IS_DEVICE(mode))
@@ -677,8 +701,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		} else {
 			uint32 rdev_minor;
 			if (!(flags & XMIT_SAME_RDEV_MAJOR))
-				rdev_major = read_int(f);
-			if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+				rdev_major = read_varint30(f);
+			if (protocol_version >= 30)
+				rdev_minor = read_varint(f);
+			else if (flags & XMIT_RDEV_MINOR_8_pre30)
 				rdev_minor = read_byte(f);
 			else
 				rdev_minor = read_int(f);
@@ -691,7 +717,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 #ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
-		linkname_len = read_int(f) + 1; /* count the '\0' */
+		linkname_len = read_varint30(f) + 1; /* count the '\0' */
 		if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
 			rprintf(FERROR, "overflow: linkname_len=%d\n",
 				linkname_len - 1);
@@ -712,6 +738,12 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	}
 #endif
 
+#ifdef SUPPORT_ACLS
+	/* We need one or two index int32s when we're preserving ACLs. */
+	if (preserve_acls)
+		extra_len += (S_ISDIR(mode) ? 2 : 1) * EXTRA_LEN;
+#endif
+
 	if (always_checksum && S_ISREG(mode))
 		extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
 
@@ -723,7 +755,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		extra_len = (extra_len | (EXTRA_ROUNDING * EXTRA_LEN)) + EXTRA_LEN;
 #endif
 
-	if (incremental && S_ISDIR(mode)) {
+	if (inc_recurse && S_ISDIR(mode)) {
 		if (one_file_system) {
 			/* Room to save the dir's device for -x */
 			extra_len += 2 * EXTRA_LEN;
@@ -747,7 +779,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 	if (flags & XMIT_HLINKED)
 		file->flags |= FLAG_HLINKED;
 #endif
-	file->modtime = modtime;
+	file->modtime = (time_t)modtime;
 	file->len32 = (uint32)file_length;
 	if (file_length > 0xFFFFFFFFu && S_ISREG(mode)) {
 		file->flags |= FLAG_LENGTH64;
@@ -825,10 +857,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 				ino = read_longint(f);
 			}
 			np = idev_node(dev, ino);
-			ndx = (int32)np->data - 1;
+			ndx = (int32)(long)np->data - 1;
 			if (ndx < 0) {
 				ndx = cnt++;
-				np->data = (void*)cnt;
+				np->data = (void*)(long)cnt;
 			}
 			F_HL_GNUM(file) = ndx;
 		}
@@ -849,6 +881,18 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 			read_buf(f, bp, checksum_len);
 	}
 
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !S_ISLNK(mode))
+		receive_acl(file, f);
+#endif
+#ifdef SUPPORT_XATTRS
+	if (preserve_xattrs)
+		receive_xattr(file, f );
+#endif
+
+	if (S_ISREG(mode) || S_ISLNK(mode))
+		stats.total_size += file_length;
+
 	return file;
 }
 
@@ -906,7 +950,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",
@@ -1078,7 +1122,7 @@ 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;
@@ -1090,13 +1134,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			file->mode = save_mode;
 	}
 
-	if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
-		stats.total_size += st.st_size;
-
 	if (basename_len == 0+1)
 		return NULL;
 
-	if (incremental && flist == dir_flist) {
+	if (inc_recurse && flist == dir_flist) {
 		flist_expand(flist);
 		flist->files[flist->count++] = file;
 	}
@@ -1120,6 +1161,9 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 					  int flags, int filter_flags)
 {
 	struct file_struct *file;
+#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+	statx sx;
+#endif
 
 	file = make_file(fname, flist, stp, flags, filter_flags);
 	if (!file)
@@ -1128,12 +1172,41 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
 	if (chmod_modes && !S_ISLNK(file->mode))
 		file->mode = tweak_mode(file->mode, chmod_modes);
 
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !S_ISLNK(file->mode) && f >= 0) {
+		sx.st.st_mode = file->mode;
+		sx.acc_acl = sx.def_acl = NULL;
+		if (get_acl(fname, &sx) < 0)
+			return NULL;
+	}
+#endif
+#ifdef SUPPORT_XATTRS
+	if (preserve_xattrs && f >= 0) {
+		sx.xattr = NULL;
+		if (get_xattr(fname, &sx) < 0)
+			return NULL;
+	}
+#endif
+
 	maybe_emit_filelist_progress(flist->count + flist_count_offset);
 
 	flist_expand(flist);
 	flist->files[flist->count++] = file;
-	if (f >= 0)
+	if (f >= 0) {
 		send_file_entry(f, file, flist->count - 1);
+#ifdef SUPPORT_ACLS
+		if (preserve_acls && !S_ISLNK(file->mode)) {
+			send_acl(&sx, f);
+			free_acl(&sx);
+		}
+#endif
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs) {
+			F_XATTR(file) = send_xattr(&sx, f);
+			free_xattr(&sx);
+		}
+#endif
+	}
 	return file;
 }
 
@@ -1275,16 +1348,20 @@ void send_extra_file_list(int f, int at_least)
 	char fbuf[MAXPATHLEN];
 	struct file_list *flist;
 	int64 start_write;
-	int past_and_present, save_io_error = io_error;
+	int future_cnt, save_io_error = io_error;
 
-	if (send_dir_ndx < 0)
+	if (flist_eof)
 		return;
 
 	/* Keep sending data until we have the requested number of
 	 * files in the upcoming file-lists. */
-	past_and_present = cur_flist->ndx_start - first_flist->ndx_start
-			 + cur_flist->count;
-	while (file_total - past_and_present < at_least) {
+	if (cur_flist->next) {
+		flist = first_flist->prev; /* the newest flist */
+		future_cnt = flist->count
+			   + flist->ndx_start - cur_flist->next->ndx_start;
+	} else
+		future_cnt = 0;
+	while (future_cnt < at_least) {
 		struct file_struct *file = dir_flist->files[send_dir_ndx];
 		int32 *dp;
 		int dlen;
@@ -1300,13 +1377,14 @@ void send_extra_file_list(int f, int at_least)
 		flist = flist_new(0, "send_extra_file_list");
 		start_write = stats.total_written;
 
-		write_int(f, NDX_FLIST_OFFSET - send_dir_ndx);
+		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);
 		write_byte(f, 0);
 
 		clean_flist(flist, 0, 0);
 		file_total += flist->count;
+		future_cnt += flist->count;
 		stats.flist_size += stats.total_written - start_write;
 		stats.num_files += flist->count;
 		if (verbose > 3)
@@ -1319,7 +1397,7 @@ void send_extra_file_list(int f, int at_least)
 		} else {
 			while (DIR_NEXT_SIBLING(dp) < 0) {
 				if ((send_dir_ndx = DIR_PARENT(dp)) < 0) {
-					write_int(f, NDX_FLIST_EOF);
+					write_ndx(f, NDX_FLIST_EOF);
 					flist_eof = 1;
 					change_local_filter_dir(NULL, 0, 0);
 					goto finish;
@@ -1352,7 +1430,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	rprintf(FLOG, "building file list\n");
 	if (show_filelist_p())
 		start_filelist_progress("building file list");
-	else if (incremental && verbose && !am_server)
+	else if (inc_recurse && verbose && !am_server)
 		rprintf(FCLIENT, "sending incremental file list\n");
 
 	start_write = stats.total_written;
@@ -1364,7 +1442,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 #endif
 
 	flist = cur_flist = flist_new(0, "send_file_list");
-	if (incremental) {
+	if (inc_recurse) {
 		dir_flist = flist_new(FLIST_TEMP, "send_file_list");
 		flags = FLAG_DIVERT_DIRS;
 	} else {
@@ -1375,8 +1453,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	disable_buffering = io_start_buffering_out(f);
 	if (filesfrom_fd >= 0) {
 		if (argv[0] && !push_dir(argv[0], 0)) {
-			rsyserr(FERROR, errno, "push_dir %s failed",
-				full_fname(argv[0]));
+			rsyserr(FERROR, errno, "push_dir %s failed in %s",
+				full_fname(argv[0]), curr_dir);
 			exit_cleanup(RERR_FILESELECT);
 		}
 		use_ff_fd = 1;
@@ -1427,18 +1505,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 				   && (len == 1 || fbuf[len-2] == '/');
 		}
 
-		if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
-			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR, errno, "link_stat %s failed",
-				full_fname(fbuf));
-			continue;
-		}
-
-		if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-			rprintf(FINFO, "skipping directory %s\n", fbuf);
-			continue;
-		}
-
 		dir = NULL;
 
 		if (!relative_paths) {
@@ -1516,8 +1582,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			} else if (!push_flist_dir(lastdir, lastdir_len)) {
 			  push_error:
 				io_error |= IOERR_GENERAL;
-				rsyserr(FERROR, errno, "push_dir %s failed",
-					full_fname(dir));
+				rsyserr(FERROR, errno, "push_dir %s failed in %s",
+					full_fname(dir), curr_dir);
 				continue;
 			}
 		}
@@ -1525,6 +1591,18 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (fn != fbuf)
 			memmove(fbuf, fn, len + 1);
 
+		if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
+			io_error |= IOERR_GENERAL;
+			rsyserr(FERROR, errno, "link_stat %s failed",
+				full_fname(fbuf));
+			continue;
+		}
+
+		if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+			rprintf(FINFO, "skipping directory %s\n", fbuf);
+			continue;
+		}
+
 		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. */
@@ -1540,7 +1618,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 = incremental ? FLAG_DIVERT_DIRS : 0;
+				int dir_flags = inc_recurse ? FLAG_DIVERT_DIRS : 0;
 				copy_links |= copy_unsafe_links;
 				xfer_dirs = 1;
 				while ((slash = strchr(slash+1, '/')) != 0) {
@@ -1564,10 +1642,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			struct file_struct *file;
 			int top_flags = FLAG_TOP_DIR | FLAG_XFER_DIR
 				      | (is_dot_dir ? 0 : flags)
-				      | (incremental ? FLAG_DIVERT_DIRS : 0);
+				      | (inc_recurse ? FLAG_DIVERT_DIRS : 0);
 			file = send_file_name(f, flist, fbuf, &st,
 					      top_flags, ALL_FILTERS);
-			if (file && !incremental)
+			if (file && !inc_recurse)
 				send_if_directory(f, flist, file, fbuf, len, flags);
 		} else
 			send_file_name(f, flist, fbuf, &st, flags, ALL_FILTERS);
@@ -1583,7 +1661,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	write_byte(f, 0); /* Indicate end of file list */
 
 #ifdef SUPPORT_HARD_LINKS
-	if (preserve_hard_links && protocol_version >= 30 && !incremental)
+	if (preserve_hard_links && protocol_version >= 30 && !inc_recurse)
 		idev_destroy();
 #endif
 
@@ -1599,10 +1677,10 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	 * 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, incremental);
+	clean_flist(flist, 0, inc_recurse);
 	file_total += flist->count;
 
-	if (!numeric_ids && !incremental)
+	if (!numeric_ids && !inc_recurse)
 		send_uid_list(f);
 
 	/* send the io_error flag */
@@ -1623,16 +1701,17 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
 
-	if (incremental) {
+	if (inc_recurse) {
 		add_dirs_to_tree(-1, 0, dir_flist->count - 1);
-		if (file_total == 1) {
+		if (send_dir_ndx < 0) {
+			write_ndx(f, NDX_FLIST_EOF);
+			flist_eof = 1;
+		}
+		else if (file_total == 1) {
 			/* If we're creating incremental file-lists and there
 			 * was just 1 item in the first file-list, send 1 more
 			 * file-list to check if this is a 1-file xfer. */
-			if (send_dir_ndx < 0)
-				write_int(f, NDX_DONE);
-			else
-				send_extra_file_list(f, 1);
+			send_extra_file_list(f, 1);
 		}
 	}
 
@@ -1649,7 +1728,7 @@ struct file_list *recv_file_list(int f)
 		rprintf(FLOG, "receiving file list\n");
 	if (show_filelist_p())
 		start_filelist_progress("receiving file list");
-	else if (incremental && verbose && !am_server && !first_flist)
+	else if (inc_recurse && verbose && !am_server && !first_flist)
 		rprintf(FCLIENT, "receiving incremental file list\n");
 
 	start_read = stats.total_read;
@@ -1661,7 +1740,7 @@ struct file_list *recv_file_list(int f)
 		init_hard_links();
 #endif
 
-	if (incremental) {
+	if (inc_recurse) {
 		if (flist->ndx_start == 0)
 			dir_flist = flist_new(FLIST_TEMP, "recv_file_list");
 		dstart = dir_flist->count;
@@ -1679,10 +1758,7 @@ struct file_list *recv_file_list(int f)
 			flags |= read_byte(f) << 8;
 		file = recv_file_entry(flist, flags, f);
 
-		if (S_ISREG(file->mode) || S_ISLNK(file->mode))
-			stats.total_size += F_LENGTH(file);
-
-		if (incremental && S_ISDIR(file->mode)) {
+		if (inc_recurse && S_ISDIR(file->mode)) {
 			flist_expand(dir_flist);
 			dir_flist->files[dir_flist->count++] = file;
 		}
@@ -1706,7 +1782,7 @@ struct file_list *recv_file_list(int f)
 
 	clean_flist(flist, relative_paths, 1);
 
-	if (incremental) {
+	if (inc_recurse) {
 		qsort(dir_flist->files + dstart, dir_flist->count - dstart,
 		      sizeof dir_flist->files[0], (int (*)())file_compare);
 	} else if (f >= 0)
@@ -1743,8 +1819,8 @@ struct file_list *recv_file_list(int f)
 void recv_additional_file_list(int f)
 {
 	struct file_list *flist;
-	int ndx = read_int(f);
-	if (ndx == NDX_DONE) {
+	int ndx = read_ndx(f);
+	if (ndx == NDX_FLIST_EOF) {
 		flist_eof = 1;
 		change_local_filter_dir(NULL, 0, 0);
 	} else {
@@ -2035,7 +2111,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 				}
 			}
 		}
-		/* Dump empty all remaining empty dirs. */
+		/* Dump all remaining empty dirs. */
 		while (1) {
 			struct file_struct *fp = flist->files[prev_i];
 			if (F_DEPTH(fp) >= 0)