X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/91c4da3fda9862fa95d4aaea0a328a827e93073b..a53426441b67e3715099faa0c0d0bbca19fb6369:/flist.c

diff --git a/flist.c b/flist.c
index cd5aa149..6de758cc 100644
--- a/flist.c
+++ b/flist.c
@@ -37,10 +37,13 @@ extern int verbose;
 extern int do_progress;
 extern int am_server;
 extern int always_checksum;
+extern int module_id;
+extern int ignore_errors;
 
 extern int cvs_exclude;
 
 extern int recurse;
+extern char curr_dir[MAXPATHLEN];
 extern char *files_from;
 extern int filesfrom_fd;
 
@@ -57,16 +60,20 @@ extern int relative_paths;
 extern int implied_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
-extern int remote_version;
-extern int io_error;
+extern int protocol_version;
 extern int sanitize_paths;
 
 extern int read_batch;
 extern int write_batch;
 
-static struct exclude_struct **local_exclude_list;
+extern struct exclude_struct **exclude_list;
+extern struct exclude_struct **server_exclude_list;
+extern struct exclude_struct **local_exclude_list;
+
+int io_error;
 
 static struct file_struct null_file;
+static char empty_sum[MD4_SUM_LENGTH];
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
 
@@ -104,9 +111,8 @@ static void finish_filelist_progress(const struct file_list *flist)
 		/* This overwrites the progress line */
 		rprintf(FINFO, "%d file%sto consider\n",
 			flist->count, flist->count == 1 ? " " : "s ");
-	} else {
+	} else
 		rprintf(FINFO, "done\n");
-	}
 }
 
 void show_flist_stats(void)
@@ -121,10 +127,10 @@ static struct string_area *string_area_new(int size)
 
 	if (size <= 0)
 		size = ARENA_SIZE;
-	a = malloc(sizeof(*a));
+	a = new(struct string_area);
 	if (!a)
 		out_of_memory("string_area_new");
-	a->current = a->base = malloc(size);
+	a->current = a->base = new_array(char, size);
 	if (!a->current)
 		out_of_memory("string_area_new buffer");
 	a->end = a->base + size;
@@ -183,7 +189,7 @@ static void list_file_entry(struct file_struct *f)
 		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 			perms,
 			(double) f->length, timestring(f->modtime),
-			f_name(f), f->link);
+			f_name(f), f->u.link);
 	} else {
 		rprintf(FINFO, "%s %11.0f %s %s\n",
 			perms,
@@ -207,18 +213,15 @@ static void list_file_entry(struct file_struct *f)
  * @post @p buffer contains information about the link or the
  * referrent as appropriate, if they exist.
  **/
-int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
+int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 {
 #if SUPPORT_LINKS
-	if (copy_links) {
+	if (copy_links)
 		return do_stat(path, buffer);
-	}
-	if (do_lstat(path, buffer) == -1) {
+	if (do_lstat(path, buffer) == -1)
 		return -1;
-	}
 	if (S_ISLNK(buffer->st_mode)) {
-		int l;
-		l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+		int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
 		if (l == -1)
 			return -1;
 		linkbuf[l] = 0;
@@ -239,31 +242,46 @@ int readlink_stat(const char *path, STRUCT_STAT * buffer, char *linkbuf)
 int link_stat(const char *path, STRUCT_STAT * buffer)
 {
 #if SUPPORT_LINKS
-	if (copy_links) {
+	if (copy_links)
 		return do_stat(path, buffer);
-	} else {
-		return do_lstat(path, buffer);
-	}
+	return do_lstat(path, buffer);
 #else
 	return do_stat(path, buffer);
 #endif
 }
 
 /*
-  This function is used to check if a file should be included/excluded
-  from the list of files based on its name and type etc
+ * This function is used to check if a file should be included/excluded
+ * from the list of files based on its name and type etc.  The value of
+ * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES.
  */
-static int check_exclude_file(int f, char *fname, STRUCT_STAT * st)
+static int check_exclude_file(char *fname, int is_dir, int exclude_level)
 {
-	extern int delete_excluded;
-
-	/* f is set to -1 when calculating deletion file list */
-	if ((f == -1) && delete_excluded) {
+#if 0 /* This currently never happens, so avoid a useless compare. */
+	if (exclude_level == NO_EXCLUDES)
 		return 0;
+#endif
+	if (fname) {
+		/* never exclude '.', even if somebody does --exclude '*' */
+		if (fname[0] == '.' && !fname[1])
+			return 0;
+		/* Handle the -R version of the '.' dir. */
+		if (fname[0] == '/') {
+			int len = strlen(fname);
+			if (fname[len-1] == '.' && fname[len-2] == '/')
+				return 0;
+		}
 	}
-	if (check_exclude(fname, local_exclude_list, st)) {
+	if (server_exclude_list
+	 && check_exclude(server_exclude_list, fname, is_dir))
+		return 1;
+	if (exclude_level != ALL_EXCLUDES)
+		return 0;
+	if (exclude_list && check_exclude(exclude_list, fname, is_dir))
+		return 1;
+	if (local_exclude_list
+	 && check_exclude(local_exclude_list, fname, is_dir))
 		return 1;
-	}
 	return 0;
 }
 
@@ -281,17 +299,15 @@ static void set_filesystem(char *fname)
 
 static int to_wire_mode(mode_t mode)
 {
-	if (S_ISLNK(mode) && (_S_IFLNK != 0120000)) {
+	if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | 0120000;
-	}
 	return (int) mode;
 }
 
 static mode_t from_wire_mode(int mode)
 {
-	if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000)) {
+	if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | _S_IFLNK;
-	}
 	return (mode_t) mode;
 }
 
@@ -299,6 +315,7 @@ static mode_t from_wire_mode(int mode)
 static void send_directory(int f, struct file_list *flist, char *dir);
 
 static char *flist_dir;
+static int flist_dir_len;
 
 
 /**
@@ -308,7 +325,6 @@ static char *flist_dir;
 static void flist_expand(struct file_list *flist)
 {
 	if (flist->count >= flist->malloced) {
-		size_t new_bytes;
 		void *new_ptr;
 
 		if (flist->malloced < 1000)
@@ -316,16 +332,19 @@ static void flist_expand(struct file_list *flist)
 		else
 			flist->malloced *= 2;
 
-		new_bytes = sizeof(flist->files[0]) * flist->malloced;
-
-		if (flist->files)
-			new_ptr = realloc(flist->files, new_bytes);
-		else
-			new_ptr = malloc(new_bytes);
+		if (flist->files) {
+			new_ptr = realloc_array(flist->files,
+						struct file_struct *,
+						flist->malloced);
+		} else {
+			new_ptr = new_array(struct file_struct *,
+					    flist->malloced);
+		}
 
 		if (verbose >= 2) {
 			rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",
-				(double) new_bytes,
+				(double)sizeof(flist->files[0])
+				* flist->malloced,
 				(new_ptr == flist->files) ? " not" : "");
 		}
 
@@ -336,18 +355,17 @@ static void flist_expand(struct file_list *flist)
 	}
 }
 
-
-static void send_file_entry(struct file_struct *file, int f,
-			    unsigned base_flags)
+void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 {
-	unsigned char flags;
-	static time_t last_time;
-	static mode_t last_mode;
-	static DEV64_T last_rdev;
-	static uid_t last_uid;
-	static gid_t last_gid;
+	unsigned short flags;
+	static time_t modtime;
+	static mode_t mode;
+	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T dev;
+	static uid_t uid;
+	static gid_t gid;
 	static char lastname[MAXPATHLEN];
-	char *fname;
+	char *fname, fbuf[MAXPATHLEN];
 	int l1, l2;
 
 	if (f == -1)
@@ -355,44 +373,88 @@ static void send_file_entry(struct file_struct *file, int f,
 
 	if (!file) {
 		write_byte(f, 0);
+		modtime = 0, mode = 0;
+		rdev = 0, dev = 0;
+		uid = 0, gid = 0;
+		*lastname = '\0';
 		return;
 	}
 
 	io_write_phase = "send_file_entry";
 
-	fname = f_name(file);
+	fname = f_name_to(file, fbuf);
 
 	flags = base_flags;
 
-	if (file->mode == last_mode)
+	if (file->mode == mode)
 		flags |= SAME_MODE;
-	if (file->rdev == last_rdev)
-		flags |= SAME_RDEV;
-	if (file->uid == last_uid)
+	else
+		mode = file->mode;
+	if (preserve_devices) {
+		if (protocol_version < 28) {
+			if (IS_DEVICE(mode)) {
+				if (file->u.rdev == rdev) {
+					/* Set both flags so that the test when
+					 * writing the data is simpler. */
+					flags |= SAME_RDEV_pre28|SAME_HIGH_RDEV;
+				} else
+					rdev = file->u.rdev;
+			} else
+				rdev = 0;
+		} else if (IS_DEVICE(mode)) {
+			if ((file->u.rdev & ~0xFF) == rdev)
+				flags |= SAME_HIGH_RDEV;
+			else
+				rdev = file->u.rdev & ~0xFF;
+		}
+	}
+	if (file->uid == uid)
 		flags |= SAME_UID;
-	if (file->gid == last_gid)
+	else
+		uid = file->uid;
+	if (file->gid == gid)
 		flags |= SAME_GID;
-	if (file->modtime == last_time)
+	else
+		gid = file->gid;
+	if (file->modtime == modtime)
 		flags |= SAME_TIME;
+	else
+		modtime = file->modtime;
+	if (file->link_u.idev) {
+		if (file->F_DEV == dev) {
+			if (protocol_version >= 28)
+				flags |= SAME_DEV;
+		} else
+			dev = file->F_DEV;
+		flags |= HAS_INODE_DATA;
+	}
 
 	for (l1 = 0;
 	     lastname[l1] && (fname[l1] == lastname[l1]) && (l1 < 255);
 	     l1++) {}
-	l2 = strlen(fname) - l1;
+	l2 = strlen(fname+l1);
 
 	if (l1 > 0)
 		flags |= SAME_NAME;
 	if (l2 > 255)
 		flags |= LONG_NAME;
 
-	/* we must make sure we don't send a zero flags byte or the other
-	   end will terminate the flist transfer */
-	if (flags == 0 && !S_ISDIR(file->mode))
-		flags |= FLAG_DELETE;
-	if (flags == 0)
-		flags |= LONG_NAME;
-
-	write_byte(f, flags);
+	/* We must make sure we don't send a zero flags byte or
+	 * the other end will terminate the flist transfer. */
+	if (flags == 0 && !S_ISDIR(mode))
+		flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+	if (protocol_version >= 28) {
+		if ((flags & 0xFF00) || flags == 0) {
+			flags |= EXTENDED_FLAGS;
+			write_byte(f, flags);
+			write_byte(f, flags >> 8);
+		} else
+			write_byte(f, flags);
+	} else {
+		if (flags == 0)
+			flags |= LONG_NAME;
+		write_byte(f, flags);
+	}
 	if (flags & SAME_NAME)
 		write_byte(f, l1);
 	if (flags & LONG_NAME)
@@ -403,78 +465,92 @@ static void send_file_entry(struct file_struct *file, int f,
 
 	write_longint(f, file->length);
 	if (!(flags & SAME_TIME))
-		write_int(f, (int) file->modtime);
+		write_int(f, modtime);
 	if (!(flags & SAME_MODE))
-		write_int(f, to_wire_mode(file->mode));
+		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & SAME_UID)) {
-		add_uid(file->uid);
-		write_int(f, (int) file->uid);
+		add_uid(uid);
+		write_int(f, uid);
 	}
 	if (preserve_gid && !(flags & SAME_GID)) {
-		add_gid(file->gid);
-		write_int(f, (int) file->gid);
+		add_gid(gid);
+		write_int(f, gid);
+	}
+	if (preserve_devices && IS_DEVICE(mode)) {
+		/* If SAME_HIGH_RDEV is off, SAME_RDEV_pre28 is also off.
+		 * Also, avoid using "rdev" because it may be incomplete. */
+		if (!(flags & SAME_HIGH_RDEV))
+			write_int(f, file->u.rdev);
+		else if (protocol_version >= 28)
+			write_byte(f, file->u.rdev);
 	}
-	if (preserve_devices && IS_DEVICE(file->mode)
-	    && !(flags & SAME_RDEV))
-		write_int(f, (int) file->rdev);
 
 #if SUPPORT_LINKS
-	if (preserve_links && S_ISLNK(file->mode)) {
-		write_int(f, strlen(file->link));
-		write_buf(f, file->link, strlen(file->link));
+	if (preserve_links && S_ISLNK(mode)) {
+		write_int(f, strlen(file->u.link));
+		write_buf(f, file->u.link, strlen(file->u.link));
 	}
 #endif
 
 #if SUPPORT_HARD_LINKS
-	if (preserve_hard_links && S_ISREG(file->mode)) {
-		if (remote_version < 26) {
+	if (flags & HAS_INODE_DATA) {
+		if (protocol_version < 26) {
 			/* 32-bit dev_t and ino_t */
-			write_int(f, (int) file->dev);
-			write_int(f, (int) file->inode);
+			write_int(f, dev);
+			write_int(f, file->F_INODE);
 		} else {
 			/* 64-bit dev_t and ino_t */
-			write_longint(f, file->dev);
-			write_longint(f, file->inode);
+			if (!(flags & SAME_DEV))
+				write_longint(f, dev);
+			write_longint(f, file->F_INODE);
 		}
 	}
 #endif
 
 	if (always_checksum) {
-		if (remote_version < 21) {
-			write_buf(f, file->sum, 2);
-		} else {
-			write_buf(f, file->sum, MD4_SUM_LENGTH);
+		char *sum;
+		if (S_ISREG(mode))
+			sum = file->u.sum;
+		else if (protocol_version < 28) {
+			/* Prior to 28, we sent a useless set of nulls. */
+			sum = empty_sum;
+		} else
+			sum = NULL;
+		if (sum) {
+			write_buf(f, sum, protocol_version < 21? 2
+							: MD4_SUM_LENGTH);
 		}
 	}
 
-	last_mode = file->mode;
-	last_rdev = file->rdev;
-	last_uid = file->uid;
-	last_gid = file->gid;
-	last_time = file->modtime;
-
 	strlcpy(lastname, fname, MAXPATHLEN);
-	lastname[MAXPATHLEN - 1] = 0;
 
 	io_write_phase = "unknown";
 }
 
 
 
-static void receive_file_entry(struct file_struct **fptr,
-			       unsigned flags, int f)
+void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 {
-	static time_t last_time;
-	static mode_t last_mode;
-	static DEV64_T last_rdev;
-	static uid_t last_uid;
-	static gid_t last_gid;
+	static time_t modtime;
+	static mode_t mode;
+	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T dev;
+	static uid_t uid;
+	static gid_t gid;
 	static char lastname[MAXPATHLEN];
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
 	char *p;
 	struct file_struct *file;
 
+	if (!fptr) {
+		modtime = 0, mode = 0;
+		rdev = 0, dev = 0;
+		uid = 0, gid = 0;
+		*lastname = '\0';
+		return;
+	}
+
 	if (flags & SAME_NAME)
 		l1 = read_byte(f);
 
@@ -483,7 +559,7 @@ static void receive_file_entry(struct file_struct **fptr,
 	else
 		l2 = read_byte(f);
 
-	file = (struct file_struct *) malloc(sizeof(*file));
+	file = new(struct file_struct);
 	if (!file)
 		out_of_memory("receive_file_entry");
 	memset((char *) file, 0, sizeof(*file));
@@ -512,9 +588,9 @@ static void receive_file_entry(struct file_struct **fptr,
 	if ((p = strrchr(thisname, '/'))) {
 		static char *lastdir;
 		*p = 0;
-		if (lastdir && strcmp(thisname, lastdir) == 0) {
+		if (lastdir && strcmp(thisname, lastdir) == 0)
 			file->dirname = lastdir;
-		} else {
+		else {
 			file->dirname = strdup(thisname);
 			lastdir = file->dirname;
 		}
@@ -527,76 +603,99 @@ static void receive_file_entry(struct file_struct **fptr,
 	if (!file->basename)
 		out_of_memory("receive_file_entry 1");
 
-
-	file->flags = flags;
+	file->flags = flags & LIVE_FLAGS;
 	file->length = read_longint(f);
-	file->modtime =
-	    (flags & SAME_TIME) ? last_time : (time_t) read_int(f);
-	file->mode =
-	    (flags & SAME_MODE) ? last_mode : from_wire_mode(read_int(f));
-	if (preserve_uid)
-		file->uid =
-		    (flags & SAME_UID) ? last_uid : (uid_t) read_int(f);
-	if (preserve_gid)
-		file->gid =
-		    (flags & SAME_GID) ? last_gid : (gid_t) read_int(f);
-	if (preserve_devices && IS_DEVICE(file->mode))
-		file->rdev =
-		    (flags & SAME_RDEV) ? last_rdev : (DEV64_T) read_int(f);
-
-	if (preserve_links && S_ISLNK(file->mode)) {
+	if (!(flags & SAME_TIME))
+		modtime = (time_t)read_int(f);
+	file->modtime = modtime;
+	if (!(flags & SAME_MODE))
+		mode = from_wire_mode(read_int(f));
+	file->mode = mode;
+
+	if (preserve_uid) {
+		if (!(flags & SAME_UID))
+			uid = (uid_t)read_int(f);
+		file->uid = uid;
+	}
+	if (preserve_gid) {
+		if (!(flags & SAME_GID))
+			gid = (gid_t)read_int(f);
+		file->gid = gid;
+	}
+	if (preserve_devices) {
+		if (protocol_version < 28) {
+			if (IS_DEVICE(mode)) {
+				if (!(flags & SAME_RDEV_pre28))
+					rdev = (DEV64_T)read_int(f);
+				file->u.rdev = rdev;
+			} else
+				rdev = 0;
+		} else if (IS_DEVICE(mode)) {
+			if (!(flags & SAME_HIGH_RDEV)) {
+				file->u.rdev = (DEV64_T)read_int(f);
+				rdev = file->u.rdev & ~0xFF;
+			} else
+				file->u.rdev = rdev | (DEV64_T)read_byte(f);
+		}
+	}
+
+	if (preserve_links && S_ISLNK(mode)) {
 		int l = read_int(f);
 		if (l < 0) {
 			rprintf(FERROR, "overflow: l=%d\n", l);
 			overflow("receive_file_entry");
 		}
-		file->link = (char *) malloc(l + 1);
-		if (!file->link)
+		if (!(file->u.link = new_array(char, l + 1)))
 			out_of_memory("receive_file_entry 2");
-		read_sbuf(f, file->link, l);
-		if (sanitize_paths) {
-			sanitize_path(file->link, file->dirname);
-		}
+		read_sbuf(f, file->u.link, l);
+		if (sanitize_paths)
+			sanitize_path(file->u.link, file->dirname);
 	}
 #if SUPPORT_HARD_LINKS
-	if (preserve_hard_links && S_ISREG(file->mode)) {
-		if (remote_version < 26) {
-			file->dev = read_int(f);
-			file->inode = read_int(f);
+	if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
+		flags |= HAS_INODE_DATA;
+	if (flags & HAS_INODE_DATA) {
+		if (!(file->link_u.idev = new(struct idev)))
+			out_of_memory("file inode data");
+		if (protocol_version < 26) {
+			dev = read_int(f);
+			file->F_INODE = read_int(f);
 		} else {
-			file->dev = read_longint(f);
-			file->inode = read_longint(f);
+			if (!(flags & SAME_DEV))
+				dev = read_longint(f);
+			file->F_INODE = read_longint(f);
 		}
+		file->F_DEV = dev;
 	}
 #endif
 
 	if (always_checksum) {
-		file->sum = (char *) malloc(MD4_SUM_LENGTH);
-		if (!file->sum)
-			out_of_memory("md4 sum");
-		if (remote_version < 21) {
-			read_buf(f, file->sum, 2);
-		} else {
-			read_buf(f, file->sum, MD4_SUM_LENGTH);
+		char *sum;
+		if (S_ISREG(mode)) {
+			sum = file->u.sum = new_array(char, MD4_SUM_LENGTH);
+			if (!sum)
+				out_of_memory("md4 sum");
+		} else if (protocol_version < 28) {
+			/* Prior to 28, we get a useless set of nulls. */
+			sum = empty_sum;
+		} else
+			sum = NULL;
+		if (sum) {
+			read_buf(f, sum, protocol_version < 21? 2
+						: MD4_SUM_LENGTH);
 		}
 	}
 
-	last_mode = file->mode;
-	last_rdev = file->rdev;
-	last_uid = file->uid;
-	last_gid = file->gid;
-	last_time = file->modtime;
-
 	if (!preserve_perms) {
 		extern int orig_umask;
 		/* set an appropriate set of permissions based on original
-		   permissions and umask. This emulates what GNU cp does */
+		 * permissions and umask. This emulates what GNU cp does */
 		file->mode &= ~orig_umask;
 	}
 }
 
 
-/* determine if a file in a different filesstem should be skipped
+/* determine if a file in a different filesystem should be skipped
    when one_file_system is set. We bascally only want to include
    the mount points - but they can be hard to find! */
 static int skip_filesystem(char *fname, STRUCT_STAT * st)
@@ -641,8 +740,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT * st)
  * statting directories if we're not recursing, but this is not a very
  * important case.  Some systems may not have d_type.
  **/
-struct file_struct *make_file(int f, char *fname, struct string_area **ap,
-			      int noexcludes)
+struct file_struct *make_file(char *fname, struct string_area **ap,
+			      int exclude_level)
 {
 	struct file_struct *file;
 	STRUCT_STAT st;
@@ -650,38 +749,38 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 	char *p;
 	char cleaned_name[MAXPATHLEN];
 	char linkbuf[MAXPATHLEN];
-	extern int module_id;
 
-	strlcpy(cleaned_name, fname, MAXPATHLEN);
-	cleaned_name[MAXPATHLEN - 1] = 0;
+	if (strlcpy(cleaned_name, fname, sizeof cleaned_name)
+	    >= sizeof cleaned_name - flist_dir_len) {
+		rprintf(FINFO, "skipping overly long name: %s\n", fname);
+		return NULL;
+	}
 	clean_fname(cleaned_name);
-	if (sanitize_paths) {
+	if (sanitize_paths)
 		sanitize_path(cleaned_name, NULL);
-	}
 	fname = cleaned_name;
 
 	memset(sum, 0, SUM_LENGTH);
 
 	if (readlink_stat(fname, &st, linkbuf) != 0) {
 		int save_errno = errno;
-		if ((errno == ENOENT) && !noexcludes) {
+		if (errno == ENOENT && exclude_level != NO_EXCLUDES) {
 			/* either symlink pointing nowhere or file that
 			 * was removed during rsync run; see if excluded
 			 * before reporting an error */
-			memset((char *) &st, 0, sizeof(st));
-			if (check_exclude_file(f, fname, &st)) {
+			if (check_exclude_file(fname, 0, exclude_level)) {
 				/* file is excluded anyway, ignore silently */
 				return NULL;
 			}
 		}
-		io_error = 1;
-		rprintf(FERROR, "readlink %s: %s\n",
-			fname, strerror(save_errno));
+		io_error |= IOERR_GENERAL;
+		rprintf(FERROR, "readlink %s failed: %s\n",
+			full_fname(fname), strerror(save_errno));
 		return NULL;
 	}
 
-	/* we use noexcludes from backup.c */
-	if (noexcludes)
+	/* backup.c calls us with exclude_level set to NO_EXCLUDES. */
+	if (exclude_level == NO_EXCLUDES)
 		goto skip_excludes;
 
 	if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
@@ -694,19 +793,18 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 			return NULL;
 	}
 
-	if (check_exclude_file(f, fname, &st))
+	if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
 		return NULL;
 
-
 	if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
 		return NULL;
 
       skip_excludes:
 
 	if (verbose > 2)
-		rprintf(FINFO, "make_file(%d,%s)\n", f, fname);
+		rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
 
-	file = (struct file_struct *) malloc(sizeof(*file));
+	file = new(struct file_struct);
 	if (!file)
 		out_of_memory("make_file");
 	memset((char *) file, 0, sizeof(*file));
@@ -714,9 +812,9 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 	if ((p = strrchr(fname, '/'))) {
 		static char *lastdir;
 		*p = 0;
-		if (lastdir && strcmp(fname, lastdir) == 0) {
+		if (lastdir && strcmp(fname, lastdir) == 0)
 			file->dirname = lastdir;
-		} else {
+		else {
 			file->dirname = strdup(fname);
 			lastdir = file->dirname;
 		}
@@ -732,43 +830,32 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 	file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
-	file->dev = st.st_dev;
-	file->inode = st.st_ino;
+	if (preserve_hard_links) {
+		if (protocol_version < 28 ? S_ISREG(st.st_mode)
+		    : !S_ISDIR(st.st_mode) && st.st_nlink > 1) {
+			if (!(file->link_u.idev = new(struct idev)))
+				out_of_memory("file inode data");
+			file->F_DEV = st.st_dev;
+			file->F_INODE = st.st_ino;
+		}
+	}
 #ifdef HAVE_STRUCT_STAT_ST_RDEV
-	file->rdev = st.st_rdev;
+	if (IS_DEVICE(st.st_mode))
+		file->u.rdev = st.st_rdev;
 #endif
 
 #if SUPPORT_LINKS
-	if (S_ISLNK(st.st_mode)) {
-		file->link = STRDUP(ap, linkbuf);
-	}
+	if (S_ISLNK(st.st_mode))
+		file->u.link = STRDUP(ap, linkbuf);
 #endif
 
-	if (always_checksum) {
-		file->sum = (char *) MALLOC(ap, MD4_SUM_LENGTH);
-		if (!file->sum)
+	if (always_checksum && S_ISREG(st.st_mode)) {
+		if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
 			out_of_memory("md4 sum");
-		/* drat. we have to provide a null checksum for non-regular
-		   files in order to be compatible with earlier versions
-		   of rsync */
-		if (S_ISREG(st.st_mode)) {
-			file_checksum(fname, file->sum, st.st_size);
-		} else {
-			memset(file->sum, 0, MD4_SUM_LENGTH);
-		}
+		file_checksum(fname, file->u.sum, st.st_size);
 	}
 
-	if (flist_dir) {
-		static char *lastdir;
-		if (lastdir && strcmp(lastdir, flist_dir) == 0) {
-			file->basedir = lastdir;
-		} else {
-			file->basedir = strdup(flist_dir);
-			lastdir = file->basedir;
-		}
-	} else {
-		file->basedir = NULL;
-	}
+	file->basedir = flist_dir;
 
 	if (!S_ISDIR(st.st_mode))
 		stats.total_size += st.st_size;
@@ -777,13 +864,17 @@ struct file_struct *make_file(int f, char *fname, struct string_area **ap,
 }
 
 
-
 void send_file_name(int f, struct file_list *flist, char *fname,
-		    int recursive, unsigned base_flags)
+		    int recursive, unsigned short base_flags)
 {
 	struct file_struct *file;
+	char fbuf[MAXPATHLEN];
+	extern int delete_excluded;
 
-	file = make_file(f, fname, &flist->string_area, 0);
+	/* f is set to -1 when calculating deletion file list */
+	file = make_file(fname, &flist->string_area,
+			 f == -1 && delete_excluded? SERVER_EXCLUDES
+						   : ALL_EXCLUDES);
 
 	if (!file)
 		return;
@@ -792,10 +883,10 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 
 	flist_expand(flist);
 
-	if (write_batch)	/*  dw  */
-		file->flags = FLAG_DELETE;
+	if (write_batch)
+		file->flags |= FLAG_DELETE;
 
-	if (strcmp(file->basename, "")) {
+	if (file->basename[0]) {
 		flist->files[flist->count++] = file;
 		send_file_entry(file, f, base_flags);
 	}
@@ -803,86 +894,95 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	if (S_ISDIR(file->mode) && recursive) {
 		struct exclude_struct **last_exclude_list =
 		    local_exclude_list;
-		send_directory(f, flist, f_name(file));
+		send_directory(f, flist, f_name_to(file, fbuf));
 		local_exclude_list = last_exclude_list;
 		return;
 	}
 }
 
 
-
 static void send_directory(int f, struct file_list *flist, char *dir)
 {
 	DIR *d;
 	struct dirent *di;
 	char fname[MAXPATHLEN];
-	int l;
+	unsigned int offset;
 	char *p;
 
 	d = opendir(dir);
 	if (!d) {
-		io_error = 1;
-		rprintf(FERROR, "opendir(%s): %s\n", dir, strerror(errno));
+		io_error |= IOERR_GENERAL;
+		rprintf(FERROR, "opendir %s failed: %s\n",
+			full_fname(dir), strerror(errno));
 		return;
 	}
 
-	strlcpy(fname, dir, MAXPATHLEN);
-	l = strlen(fname);
-	if (fname[l - 1] != '/') {
-		if (l == MAXPATHLEN - 1) {
-			io_error = 1;
-			rprintf(FERROR,
-				"skipping long-named directory %s\n",
-				fname);
+	offset = strlcpy(fname, dir, MAXPATHLEN);
+	p = fname + offset;
+	if (offset >= MAXPATHLEN || p[-1] != '/') {
+		if (offset >= MAXPATHLEN - 1) {
+			io_error |= IOERR_GENERAL;
+			rprintf(FERROR, "skipping long-named directory: %s\n",
+				full_fname(fname));
 			closedir(d);
 			return;
 		}
-		strlcat(fname, "/", MAXPATHLEN);
-		l++;
+		*p++ = '/';
+		offset++;
 	}
-	p = fname + strlen(fname);
 
 	local_exclude_list = NULL;
 
 	if (cvs_exclude) {
-		if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN - 1) {
-			strcpy(p, ".cvsignore");
-			local_exclude_list =
-			    make_exclude_list(fname, NULL, 0, 0);
-		} else {
-			io_error = 1;
+		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+		    < MAXPATHLEN - offset)
+			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
+		else {
+			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot cvs-exclude in long-named directory %s\n",
-				fname);
+				full_fname(fname));
 		}
 	}
 
-	for (di = readdir(d); di; di = readdir(d)) {
+	for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
 		char *dname = d_name(di);
-		if (strcmp(dname, ".") == 0 || strcmp(dname, "..") == 0)
+		if (dname[0] == '.' && (dname[1] == '\0'
+		    || (dname[1] == '.' && dname[2] == '\0')))
 			continue;
-		strlcpy(p, dname, MAXPATHLEN - l);
-		send_file_name(f, flist, fname, recurse, 0);
+		if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
+			send_file_name(f, flist, fname, recurse, 0);
+		else {
+			io_error |= IOERR_GENERAL;
+			rprintf(FINFO,
+				"cannot send long-named file %s\n",
+				full_fname(fname));
+		}
 	}
-
-	if (local_exclude_list) {
-		add_exclude_list("!", &local_exclude_list, 0);
+	if (errno) {
+		io_error |= IOERR_GENERAL;
+		rprintf(FERROR, "readdir(%s): (%d) %s\n",
+			dir, errno, strerror(errno));
 	}
 
+	if (local_exclude_list)
+		free_exclude_list(&local_exclude_list); /* Zeros pointer too */
+
 	closedir(d);
 }
 
 
 /**
- *
- * I <b>think</b> f==-1 means that the list should just be built in
- * memory and not transmitted.  But who can tell? -- mbp
+ * The delete_files() function in receiver.c sets f to -1 so that we just
+ * construct the file list in memory without sending it over the wire.  It
+ * also has the side-effect of ignoring user-excludes if delete_excluded
+ * is set (so that the delete list includes user-excluded files).
  **/
 struct file_list *send_file_list(int f, int argc, char *argv[])
 {
 	int l;
 	STRUCT_STAT st;
-	char *p, *dir, *olddir;
+	char *p, *dir, olddir[sizeof curr_dir];
 	char lastpath[MAXPATHLEN] = "";
 	struct file_list *flist;
 	int64 start_write;
@@ -896,11 +996,11 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	flist = flist_new();
 
 	if (f != -1) {
-		io_start_buffering(f);
+		io_start_buffering_out(f);
 		if (filesfrom_fd >= 0) {
-			if (argv[0] && !push_dir(argv[0], 0)) {
-				rprintf(FERROR, "push_dir %s : %s\n",
-					argv[0], strerror(errno));
+			if (argv[0] && !push_dir(argv[0])) {
+				rprintf(FERROR, "push_dir %s failed: %s\n",
+					full_fname(argv[0]), strerror(errno));
 				exit_cleanup(RERR_FILESELECT);
 			}
 			use_ff_fd = 1;
@@ -924,24 +1024,21 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 
 		l = strlen(fname);
-		if (l != 1 && fname[l - 1] == '/') {
-			if ((l == 2) && (fname[0] == '.')) {
-				/*  Turn ./ into just . rather than ./.
-				   This was put in to avoid a problem with
-				   rsync -aR --delete from ./
-				   The send_file_name() below of ./ was
-				   mysteriously preventing deletes */
-				fname[1] = 0;
-			} else {
-				strlcat(fname, ".", MAXPATHLEN);
+		if (fname[l - 1] == '/') {
+			if (l == 2 && fname[0] == '.') {
+				/* Turn "./" into just "." rather than "./." */
+				fname[1] = '\0';
+			} else if (l < MAXPATHLEN) {
+				fname[l++] = '.';
+				fname[l] = '\0';
 			}
 		}
 
 		if (link_stat(fname, &st) != 0) {
 			if (f != -1) {
-				io_error = 1;
-				rprintf(FERROR, "link_stat %s : %s\n",
-					fname, strerror(errno));
+				io_error |= IOERR_GENERAL;
+				rprintf(FERROR, "link_stat %s failed: %s\n",
+					full_fname(fname), strerror(errno));
 			}
 			continue;
 		}
@@ -952,7 +1049,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 
 		dir = NULL;
-		olddir = NULL;
+		olddir[0] = '\0';
 
 		if (!relative_paths) {
 			p = strrchr(fname, '/');
@@ -1003,16 +1100,27 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			fname = ".";
 
 		if (dir && *dir) {
-			olddir = push_dir(dir, 1);
+			static char *lastdir;
+			static int lastdir_len;
 
-			if (!olddir) {
-				io_error = 1;
-				rprintf(FERROR, "push_dir %s : %s\n",
-					dir, strerror(errno));
+			strcpy(olddir, curr_dir); /* can't overflow */
+
+			if (!push_dir(dir)) {
+				io_error |= IOERR_GENERAL;
+				rprintf(FERROR, "push_dir %s failed: %s\n",
+					full_fname(dir), strerror(errno));
 				continue;
 			}
 
-			flist_dir = dir;
+			if (lastdir && strcmp(lastdir, dir) == 0) {
+				flist_dir = lastdir;
+				flist_dir_len = lastdir_len;
+			} else {
+				if (lastdir)
+					free(lastdir);
+				flist_dir = lastdir = strdup(dir);
+				flist_dir_len = lastdir_len = strlen(dir);
+			}
 		}
 
 		if (one_file_system)
@@ -1020,11 +1128,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 		send_file_name(f, flist, fname, recurse, FLAG_DELETE);
 
-		if (olddir != NULL) {
+		if (olddir[0]) {
 			flist_dir = NULL;
-			if (pop_dir(olddir) != 0) {
-				rprintf(FERROR, "pop_dir %s : %s\n",
-					dir, strerror(errno));
+			flist_dir_len = 0;
+			if (!pop_dir(olddir)) {
+				rprintf(FERROR, "pop_dir %s failed: %s\n",
+					full_fname(dir), strerror(errno));
 				exit_cleanup(RERR_FILESELECT);
 			}
 		}
@@ -1032,31 +1141,25 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 	if (f != -1) {
 		send_file_entry(NULL, f, 0);
-	}
 
-	if (show_filelist_p() && f != -1) {
-		finish_filelist_progress(flist);
+		if (show_filelist_p())
+			finish_filelist_progress(flist);
 	}
 
 	clean_flist(flist, 0, 0);
 
-	/* now send the uid/gid list. This was introduced in protocol
-	   version 15 */
 	if (f != -1) {
+		/* Now send the uid/gid list. This was introduced in
+		 * protocol version 15 */
 		send_uid_list(f);
-	}
 
-	/* send the io_error flag */
-	if (f != -1) {
-		extern int module_id;
+		/* send the io_error flag */
 		write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
-	}
 
-	if (f != -1) {
 		io_end_buffering();
 		stats.flist_size = stats.total_written - start_write;
 		stats.num_files = flist->count;
-		if (write_batch)	/*  dw  */
+		if (write_batch)
 			write_batch_flist_info(flist->count, flist->files);
 	}
 
@@ -1070,7 +1173,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 struct file_list *recv_file_list(int f)
 {
 	struct file_list *flist;
-	unsigned char flags;
+	unsigned short flags;
 	int64 start_read;
 	extern int list_only;
 
@@ -1079,24 +1182,24 @@ struct file_list *recv_file_list(int f)
 
 	start_read = stats.total_read;
 
-	flist = (struct file_list *) malloc(sizeof(flist[0]));
+	flist = new(struct file_list);
 	if (!flist)
 		goto oom;
 
 	flist->count = 0;
 	flist->malloced = 1000;
-	flist->files =
-	    (struct file_struct **) malloc(sizeof(flist->files[0]) *
-					   flist->malloced);
+	flist->files = new_array(struct file_struct *, flist->malloced);
 	if (!flist->files)
 		goto oom;
 
 
-	for (flags = read_byte(f); flags; flags = read_byte(f)) {
+	while ((flags = read_byte(f)) != 0) {
 		int i = flist->count;
 
 		flist_expand(flist);
 
+		if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+			flags |= read_byte(f) << 8;
 		receive_file_entry(&flist->files[i], flags, f);
 
 		if (S_ISREG(flist->files[i]->mode))
@@ -1106,45 +1209,41 @@ struct file_list *recv_file_list(int f)
 
 		maybe_emit_filelist_progress(flist);
 
-		if (verbose > 2)
+		if (verbose > 2) {
 			rprintf(FINFO, "recv_file_name(%s)\n",
 				f_name(flist->files[i]));
+		}
 	}
-
+	receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
 
 	if (verbose > 2)
 		rprintf(FINFO, "received %d names\n", flist->count);
 
-	clean_flist(flist, relative_paths, 1);
-
-	if (show_filelist_p()) {
+	if (show_filelist_p())
 		finish_filelist_progress(flist);
-	}
 
-	/* now recv the uid/gid list. This was introduced in protocol version 15 */
+	clean_flist(flist, relative_paths, 1);
+
 	if (f != -1) {
+		/* Now send the uid/gid list. This was introduced in
+		 * protocol version 15 */
 		recv_uid_list(f, flist);
-	}
 
-	/* recv the io_error flag */
-	if (f != -1 && !read_batch) {	/* dw-added readbatch */
-		extern int module_id;
-		extern int ignore_errors;
-		if (lp_ignore_errors(module_id) || ignore_errors) {
-			read_int(f);
-		} else {
-			io_error |= read_int(f);
+		if (!read_batch) {
+			/* Recv the io_error flag */
+			if (lp_ignore_errors(module_id) || ignore_errors)
+				read_int(f);
+			else
+				io_error |= read_int(f);
 		}
 	}
 
 	if (list_only) {
 		int i;
-		for (i = 0; i < flist->count; i++) {
+		for (i = 0; i < flist->count; i++)
 			list_file_entry(flist->files[i]);
-		}
 	}
 
-
 	if (verbose > 2)
 		rprintf(FINFO, "recv_file_list done\n");
 
@@ -1159,21 +1258,20 @@ struct file_list *recv_file_list(int f)
 }
 
 
-/*
- * XXX: This is currently the hottest function while building the file
- * list, because building f_name()s every time is expensive.
- **/
-int file_compare(struct file_struct **f1, struct file_struct **f2)
+int file_compare(struct file_struct **file1, struct file_struct **file2)
 {
-	if (!(*f1)->basename && !(*f2)->basename)
+	struct file_struct *f1 = *file1;
+	struct file_struct *f2 = *file2;
+
+	if (!f1->basename && !f2->basename)
 		return 0;
-	if (!(*f1)->basename)
+	if (!f1->basename)
 		return -1;
-	if (!(*f2)->basename)
+	if (!f2->basename)
 		return 1;
-	if ((*f1)->dirname == (*f2)->dirname)
-		return u_strcmp((*f1)->basename, (*f2)->basename);
-	return u_strcmp(f_name(*f1), f_name(*f2));
+	if (f1->dirname == f2->dirname)
+		return u_strcmp(f1->basename, f2->basename);
+	return f_name_cmp(f1, f2);
 }
 
 
@@ -1188,15 +1286,13 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 
 	while (low != high) {
 		int mid = (low + high) / 2;
-		int ret =
-		    file_compare(&flist->files[flist_up(flist, mid)], &f);
+		int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
 		if (ret == 0)
 			return flist_up(flist, mid);
-		if (ret > 0) {
+		if (ret > 0)
 			high = mid;
-		} else {
+		else
 			low = mid + 1;
-		}
 	}
 
 	if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
@@ -1214,10 +1310,10 @@ void free_file(struct file_struct *file)
 		return;
 	if (file->basename)
 		free(file->basename);
-	if (file->link)
-		free(file->link);
-	if (file->sum)
-		free(file->sum);
+	if (!IS_DEVICE(file->mode) && file->u.link)
+		free(file->u.link); /* Handles u.sum too. */
+	if (file->link_u.idev)
+		free((char*)file->link_u.idev); /* Handles link_u.links too. */
 	*file = null_file;
 }
 
@@ -1229,7 +1325,7 @@ struct file_list *flist_new(void)
 {
 	struct file_list *flist;
 
-	flist = (struct file_list *) malloc(sizeof(flist[0]));
+	flist = new(struct file_list);
 	if (!flist)
 		out_of_memory("send_file_list");
 
@@ -1276,8 +1372,7 @@ void flist_free(struct file_list *flist)
  */
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 {
-	int i;
-	char *name, *prev_name = NULL;
+	int i, prev_i = 0;
 
 	if (!flist || flist->count == 0)
 		return;
@@ -1287,20 +1382,24 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 
 	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
 		if (flist->files[i]->basename) {
-			prev_name = f_name(flist->files[i]);
+			prev_i = i;
 			break;
 		}
 	}
 	while (++i < flist->count) {
 		if (!flist->files[i]->basename)
 			continue;
-		name = f_name(flist->files[i]);
-		if (strcmp(name, prev_name) == 0) {
+		if (f_name_cmp(flist->files[i], flist->files[prev_i]) == 0) {
 			if (verbose > 1 && !am_server) {
 				rprintf(FINFO,
 					"removing duplicate name %s from file list %d\n",
-					name, i);
+					f_name(flist->files[i]), i);
 			}
+			/* Make sure that if we unduplicate '.', that we don't
+			 * lose track of a user-specified starting point (or
+			 * else deletions will mysteriously fail with -R). */
+			if (flist->files[i]->flags & FLAG_DELETE)
+				flist->files[prev_i]->flags |= FLAG_DELETE;
 			/* it's not great that the flist knows the semantics of
 			 * the file memory usage, but i'd rather not add a flag
 			 * byte to that struct.
@@ -1309,8 +1408,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 				flist->files[i][0] = null_file;
 			else
 				free_file(flist->files[i]);
-		}
-		prev_name = name;
+		} else
+			prev_i = i;
 	}
 
 	if (strip_root) {
@@ -1336,8 +1435,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	for (i = 0; i < flist->count; i++) {
-		rprintf(FINFO, "[%d] i=%d %s %s mode=0%o len=%.0f\n",
-			(int) getpid(), i,
+		rprintf(FINFO, "[%ld] i=%d %s %s mode=0%o len=%.0f\n",
+			(long) getpid(), i,
 			NS(flist->files[i]->dirname),
 			NS(flist->files[i]->basename),
 			(int) flist->files[i]->mode,
@@ -1346,33 +1445,104 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 }
 
 
-/*
- * return the full filename of a flist entry
- *
- * This function is too expensive at the moment, because it copies
- * strings when often we only want to compare them.  In any case,
- * using strlcat is silly because it will walk the string repeatedly.
+enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
+
+/* Compare the names of two file_struct entities, just like strcmp()
+ * would do if it were operating on the joined strings.  We assume
+ * that there are no 0-length strings.
  */
-char *f_name(struct file_struct *f)
+int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 {
-	static char names[10][MAXPATHLEN];
-	static int n;
-	char *p = names[n];
+	int dif;
+	const uchar *c1, *c2;
+	enum fnc_state state1, state2;
+
+	if (!f1 || !f1->basename) {
+		if (!f2 || !f2->basename)
+			return 0;
+		return -1;
+	}
+	if (!f2 || !f2->basename)
+		return 1;
+
+	if (!(c1 = (uchar*)f1->dirname)) {
+		state1 = fnc_BASE;
+		c1 = (uchar*)f1->basename;
+	} else
+		state1 = fnc_DIR;
+	if (!(c2 = (uchar*)f2->dirname)) {
+		state2 = fnc_BASE;
+		c2 = (uchar*)f2->basename;
+	} else
+		state2 = fnc_DIR;
+
+	while (1) {
+		if ((dif = (int)*c1 - (int)*c2) != 0)
+			break;
+		if (!*++c1) {
+			switch (state1) {
+			case fnc_DIR:
+				state1 = fnc_SLASH;
+				c1 = (uchar*)"/";
+				break;
+			case fnc_SLASH:
+				state1 = fnc_BASE;
+				c1 = (uchar*)f1->basename;
+				break;
+			case fnc_BASE:
+				break;
+			}
+		}
+		if (!*++c2) {
+			switch (state2) {
+			case fnc_DIR:
+				state2 = fnc_SLASH;
+				c2 = (uchar*)"/";
+				break;
+			case fnc_SLASH:
+				state2 = fnc_BASE;
+				c2 = (uchar*)f2->basename;
+				break;
+			case fnc_BASE:
+				if (!*c1)
+					return 0;
+				break;
+			}
+		}
+	}
+
+	return dif;
+}
+
 
+/* Return a copy of the full filename of a flist entry, using the indicated
+ * buffer.  No size-checking is done because we checked the size when creating
+ * the file_struct entry.
+ */
+char *f_name_to(struct file_struct *f, char *fbuf)
+{
 	if (!f || !f->basename)
 		return NULL;
 
-	n = (n + 1) % 10;
-
 	if (f->dirname) {
-		int off;
+		int len = strlen(f->dirname);
+		memcpy(fbuf, f->dirname, len);
+		fbuf[len] = '/';
+		strcpy(fbuf + len + 1, f->basename);
+	} else
+		strcpy(fbuf, f->basename);
+	return fbuf;
+}
 
-		off = strlcpy(p, f->dirname, MAXPATHLEN);
-		off += strlcpy(p + off, "/", MAXPATHLEN - off);
-		off += strlcpy(p + off, f->basename, MAXPATHLEN - off);
-	} else {
-		strlcpy(p, f->basename, MAXPATHLEN);
-	}
 
-	return p;
+/* Like f_name_to(), but we rotate through 5 static buffers of our own.
+ */
+char *f_name(struct file_struct *f)
+{
+	static char names[5][MAXPATHLEN];
+	static unsigned int n;
+
+	n = (n + 1) % (sizeof names / sizeof names[0]);
+
+	return f_name_to(f, names[n]);
 }