X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/57469f6c31cec390c014cde5851ec8b279d2c287..9935066b704bcf2e6e48dac85cb1b4047d8f439d:/flist.c

diff --git a/flist.c b/flist.c
index d8115b66..19931a5f 100644
--- a/flist.c
+++ b/flist.c
@@ -21,10 +21,6 @@
 /** @file flist.c
  * Generate and receive file lists
  *
- * @todo Get rid of the string_area optimization.  Efficiently
- * allocating blocks is the responsibility of the system's malloc
- * library, not of rsync.
- *
  * @sa http://lists.samba.org/pipermail/rsync/2000-June/002351.html
  *
  **/
@@ -35,14 +31,17 @@ extern struct stats stats;
 
 extern int verbose;
 extern int do_progress;
+extern int am_root;
 extern int am_server;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
+extern int numeric_ids;
 
 extern int cvs_exclude;
 
 extern int recurse;
+extern char curr_dir[MAXPATHLEN];
 extern char *files_from;
 extern int filesfrom_fd;
 
@@ -71,10 +70,19 @@ extern struct exclude_struct **local_exclude_list;
 
 int io_error;
 
-static struct file_struct null_file;
 static char empty_sum[MD4_SUM_LENGTH];
+static unsigned int file_struct_len;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
+
+void init_flist(void)
+{
+	struct file_struct f;
+
+	/* Figure out how big the file_struct is without trailing padding */
+	file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
+}
 
 
 static int show_filelist_p(void)
@@ -120,60 +128,6 @@ void show_flist_stats(void)
 }
 
 
-static struct string_area *string_area_new(int size)
-{
-	struct string_area *a;
-
-	if (size <= 0)
-		size = ARENA_SIZE;
-	a = new(struct string_area);
-	if (!a)
-		out_of_memory("string_area_new");
-	a->current = a->base = new_array(char, size);
-	if (!a->current)
-		out_of_memory("string_area_new buffer");
-	a->end = a->base + size;
-	a->next = NULL;
-
-	return a;
-}
-
-static void string_area_free(struct string_area *a)
-{
-	struct string_area *next;
-
-	for (; a; a = next) {
-		next = a->next;
-		free(a->base);
-	}
-}
-
-static char *string_area_malloc(struct string_area **ap, int size)
-{
-	char *p;
-	struct string_area *a;
-
-	/* does the request fit into the current space? */
-	a = *ap;
-	if (a->current + size >= a->end) {
-		/* no; get space, move new string_area to front of the list */
-		a = string_area_new(size > ARENA_SIZE ? size : ARENA_SIZE);
-		a->next = *ap;
-		*ap = a;
-	}
-
-	/* have space; do the "allocation." */
-	p = a->current;
-	a->current += size;
-	return p;
-}
-
-static char *string_area_strdup(struct string_area **ap, const char *src)
-{
-	char *dest = string_area_malloc(ap, strlen(src) + 1);
-	return strcpy(dest, src);
-}
-
 static void list_file_entry(struct file_struct *f)
 {
 	char perms[11];
@@ -184,17 +138,18 @@ static void list_file_entry(struct file_struct *f)
 
 	permstring(perms, f->mode);
 
+#if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(f->mode)) {
 		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 			perms,
 			(double) f->length, timestring(f->modtime),
 			f_name(f), f->u.link);
-	} else {
+	} else
+#endif
 		rprintf(FINFO, "%s %11.0f %s %s\n",
 			perms,
 			(double) f->length, timestring(f->modtime),
 			f_name(f));
-	}
 }
 
 
@@ -298,8 +253,10 @@ static void set_filesystem(char *fname)
 
 static int to_wire_mode(mode_t mode)
 {
+#if SUPPORT_LINKS
 	if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
 		return (mode & ~(_S_IFMT)) | 0120000;
+#endif
 	return (int) mode;
 }
 
@@ -314,43 +271,52 @@ 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;
 
 
 /**
  * Make sure @p flist is big enough to hold at least @p flist->count
  * entries.
  **/
-static void flist_expand(struct file_list *flist)
+void flist_expand(struct file_list *flist)
 {
-	if (flist->count >= flist->malloced) {
-		void *new_ptr;
+	void *new_ptr;
 
-		if (flist->malloced < 1000)
-			flist->malloced += 1000;
-		else
-			flist->malloced *= 2;
+	if (flist->count < flist->malloced)
+		return;
 
-		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 (flist->malloced < FLIST_START)
+		flist->malloced = FLIST_START;
+	else if (flist->malloced >= FLIST_LINEAR)
+		flist->malloced += FLIST_LINEAR;
+	else
+		flist->malloced *= 2;
+
+	/*
+	 * In case count jumped or we are starting the list
+	 * with a known size just set it.
+	 */
+	if (flist->malloced < flist->count)
+		flist->malloced = flist->count;
+
+	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)sizeof(flist->files[0])
-				* flist->malloced,
-				(new_ptr == flist->files) ? " not" : "");
-		}
+	if (verbose >= 2) {
+		rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
+		    who_am_i(),
+		    (double) sizeof flist->files[0] * flist->malloced,
+		    (new_ptr == flist->files) ? " not" : "");
+	}
 
-		flist->files = (struct file_struct **) new_ptr;
+	flist->files = (struct file_struct **) new_ptr;
 
-		if (!flist->files)
-			out_of_memory("flist_expand");
-	}
+	if (!flist->files)
+		out_of_memory("flist_expand");
 }
 
 void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
@@ -358,7 +324,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	unsigned short flags;
 	static time_t modtime;
 	static mode_t mode;
-	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T rdev, rdev_high;
 	static DEV64_T dev;
 	static uid_t uid;
 	static gid_t gid;
@@ -372,7 +338,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	if (!file) {
 		write_byte(f, 0);
 		modtime = 0, mode = 0;
-		rdev = 0, dev = 0;
+		rdev = 0, rdev_high = 0, dev = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
 		return;
@@ -380,125 +346,138 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 	io_write_phase = "send_file_entry";
 
-	fname = f_name_to(file, fbuf, sizeof fbuf);
+	fname = f_name_to(file, fbuf);
 
 	flags = base_flags;
 
 	if (file->mode == mode)
-		flags |= SAME_MODE;
+		flags |= XMIT_SAME_MODE;
 	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;
+					/* Set both flags to simplify the test
+					 * when writing the data. */
+					flags |= XMIT_SAME_RDEV_pre28
+					       | XMIT_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->u.rdev & ~0xFF) == rdev_high)
+				flags |= XMIT_SAME_HIGH_RDEV;
+			else {
+				rdev = file->u.rdev;
+				rdev_high = rdev & ~0xFF;
+			}
 		}
 	}
 	if (file->uid == uid)
-		flags |= SAME_UID;
+		flags |= XMIT_SAME_UID;
 	else
 		uid = file->uid;
 	if (file->gid == gid)
-		flags |= SAME_GID;
+		flags |= XMIT_SAME_GID;
 	else
 		gid = file->gid;
 	if (file->modtime == modtime)
-		flags |= SAME_TIME;
+		flags |= XMIT_SAME_TIME;
 	else
 		modtime = file->modtime;
+
+#if SUPPORT_HARD_LINKS
 	if (file->link_u.idev) {
 		if (file->F_DEV == dev) {
 			if (protocol_version >= 28)
-				flags |= SAME_DEV;
+				flags |= XMIT_SAME_DEV;
 		} else
 			dev = file->F_DEV;
-		flags |= HAS_INODE_DATA;
+		flags |= XMIT_HAS_IDEV_DATA;
 	}
+#endif
 
 	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;
+		flags |= XMIT_SAME_NAME;
 	if (l2 > 255)
-		flags |= LONG_NAME;
+		flags |= XMIT_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(mode))
-		flags |= FLAG_DELETE; /* NOTE: no meaning for non-dir */
+	/* We must make sure we don't send a zero flag byte or the
+	 * other end will terminate the flist transfer.  Note that
+	 * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
+	 * it's harmless way to add a bit to the first flag byte. */
 	if (protocol_version >= 28) {
-		if ((flags & 0xFF00) || flags == 0) {
-			flags |= EXTENDED_FLAGS;
+		if (!flags && !S_ISDIR(mode))
+			flags |= XMIT_TOP_DIR;
+		if ((flags & 0xFF00) || !flags) {
+			flags |= XMIT_EXTENDED_FLAGS;
 			write_byte(f, flags);
 			write_byte(f, flags >> 8);
 		} else
 			write_byte(f, flags);
 	} else {
-		if (flags == 0)
-			flags |= LONG_NAME;
+		if (!(flags & 0xFF) && !S_ISDIR(mode))
+			flags |= XMIT_TOP_DIR;
+		if (!(flags & 0xFF))
+			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
 	}
-	if (flags & SAME_NAME)
+	if (flags & XMIT_SAME_NAME)
 		write_byte(f, l1);
-	if (flags & LONG_NAME)
+	if (flags & XMIT_LONG_NAME)
 		write_int(f, l2);
 	else
 		write_byte(f, l2);
 	write_buf(f, fname + l1, l2);
 
 	write_longint(f, file->length);
-	if (!(flags & SAME_TIME))
+	if (!(flags & XMIT_SAME_TIME))
 		write_int(f, modtime);
-	if (!(flags & SAME_MODE))
+	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
-	if (preserve_uid && !(flags & SAME_UID)) {
-		add_uid(uid);
+	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+		if (!numeric_ids)
+			add_uid(uid);
 		write_int(f, uid);
 	}
-	if (preserve_gid && !(flags & SAME_GID)) {
-		add_gid(gid);
+	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
+		if (!numeric_ids)
+			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);
+		/* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
+		 * also off. */
+		if (!(flags & XMIT_SAME_HIGH_RDEV))
+			write_int(f, rdev);
 		else if (protocol_version >= 28)
-			write_byte(f, file->u.rdev);
+			write_byte(f, rdev);
 	}
 
 #if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
-		write_int(f, strlen(file->u.link));
-		write_buf(f, file->u.link, strlen(file->u.link));
+		int len = strlen(file->u.link);
+		write_int(f, len);
+		write_buf(f, file->u.link, len);
 	}
 #endif
 
 #if SUPPORT_HARD_LINKS
-	if (flags & HAS_INODE_DATA) {
+	if (flags & XMIT_HAS_IDEV_DATA) {
 		if (protocol_version < 26) {
 			/* 32-bit dev_t and ino_t */
 			write_int(f, dev);
 			write_int(f, file->F_INODE);
 		} else {
 			/* 64-bit dev_t and ino_t */
-			if (!(flags & SAME_DEV))
+			if (!(flags & XMIT_SAME_DEV))
 				write_longint(f, dev);
 			write_longint(f, file->F_INODE);
 		}
@@ -521,49 +500,46 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 
 	strlcpy(lastname, fname, MAXPATHLEN);
-	lastname[MAXPATHLEN - 1] = 0;
 
 	io_write_phase = "unknown";
 }
 
 
 
-void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
+void receive_file_entry(struct file_struct **fptr, unsigned short flags,
+    struct file_list *flist, int f)
 {
 	static time_t modtime;
 	static mode_t mode;
-	static DEV64_T rdev;	/* just high bytes in p28 onward */
+	static DEV64_T rdev, rdev_high;
 	static DEV64_T dev;
 	static uid_t uid;
 	static gid_t gid;
-	static char lastname[MAXPATHLEN];
+	static char lastname[MAXPATHLEN], *lastdir;
+	static int lastdir_len = -1;
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
-	char *p;
+	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+	OFF_T file_length;
+	char *basename, *dirname, *bp;
 	struct file_struct *file;
 
 	if (!fptr) {
 		modtime = 0, mode = 0;
-		rdev = 0, dev = 0;
+		rdev = 0, rdev_high = 0, dev = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
 		return;
 	}
 
-	if (flags & SAME_NAME)
+	if (flags & XMIT_SAME_NAME)
 		l1 = read_byte(f);
 
-	if (flags & LONG_NAME)
+	if (flags & XMIT_LONG_NAME)
 		l2 = read_int(f);
 	else
 		l2 = read_byte(f);
 
-	file = new(struct file_struct);
-	if (!file)
-		out_of_memory("receive_file_entry");
-	memset((char *) file, 0, sizeof(*file));
-	(*fptr) = file;
-
 	if (l2 >= MAXPATHLEN - l1) {
 		rprintf(FERROR,
 			"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
@@ -576,104 +552,137 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 	thisname[l1 + l2] = 0;
 
 	strlcpy(lastname, thisname, MAXPATHLEN);
-	lastname[MAXPATHLEN - 1] = 0;
 
 	clean_fname(thisname);
 
-	if (sanitize_paths) {
+	if (sanitize_paths)
 		sanitize_path(thisname, NULL);
-	}
 
-	if ((p = strrchr(thisname, '/'))) {
-		static char *lastdir;
-		*p = 0;
-		if (lastdir && strcmp(thisname, lastdir) == 0)
-			file->dirname = lastdir;
-		else {
-			file->dirname = strdup(thisname);
-			lastdir = file->dirname;
-		}
-		file->basename = strdup(p + 1);
+	if ((basename = strrchr(thisname, '/')) != NULL) {
+		dirname_len = ++basename - thisname; /* counts future '\0' */
+		if (lastdir_len == dirname_len - 1
+		    && strncmp(thisname, lastdir, lastdir_len) == 0) {
+			dirname = lastdir;
+			dirname_len = 0; /* indicates no copy is needed */
+		} else
+			dirname = thisname;
 	} else {
-		file->dirname = NULL;
-		file->basename = strdup(thisname);
+		basename = thisname;
+		dirname = NULL;
+		dirname_len = 0;
 	}
+	basename_len = strlen(basename) + 1; /* count the '\0' */
 
-	if (!file->basename)
-		out_of_memory("receive_file_entry 1");
-
-	file->flags = flags;
-	file->length = read_longint(f);
-	if (!(flags & SAME_TIME))
+	file_length = read_longint(f);
+	if (!(flags & XMIT_SAME_TIME))
 		modtime = (time_t)read_int(f);
-	file->modtime = modtime;
-	if (!(flags & SAME_MODE))
+	if (!(flags & XMIT_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_uid && !(flags & XMIT_SAME_UID))
+		uid = (uid_t)read_int(f);
+	if (preserve_gid && !(flags & XMIT_SAME_GID))
+		gid = (gid_t)read_int(f);
+
 	if (preserve_devices) {
 		if (protocol_version < 28) {
 			if (IS_DEVICE(mode)) {
-				if (!(flags & SAME_RDEV_pre28))
+				if (!(flags & XMIT_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;
+			if (!(flags & XMIT_SAME_HIGH_RDEV)) {
+				rdev = (DEV64_T)read_int(f);
+				rdev_high = rdev & ~0xFF;
 			} else
-				file->u.rdev = rdev | (DEV64_T)read_byte(f);
+				rdev = rdev_high | (DEV64_T)read_byte(f);
 		}
 	}
 
+#if SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
-		int l = read_int(f);
-		if (l < 0) {
-			rprintf(FERROR, "overflow: l=%d\n", l);
+		linkname_len = read_int(f) + 1; /* count the '\0' */
+		if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
+			rprintf(FERROR, "overflow: linkname_len=%d\n",
+				linkname_len - 1);
 			overflow("receive_file_entry");
 		}
-		if (!(file->u.link = new_array(char, l + 1)))
-			out_of_memory("receive_file_entry 2");
-		read_sbuf(f, file->u.link, l);
+	}
+	else
+#endif
+		linkname_len = 0;
+
+	sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
+
+	alloc_len = file_struct_len + dirname_len + basename_len
+		  + linkname_len + sum_len;
+	bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
+
+	file = *fptr = (struct file_struct *)bp;
+	memset(bp, 0, file_struct_len);
+	bp += file_struct_len;
+
+	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+	file->modtime = modtime;
+	file->length = file_length;
+	file->mode = mode;
+	file->uid = uid;
+	file->gid = gid;
+
+	if (dirname_len) {
+		file->dirname = lastdir = bp;
+		lastdir_len = dirname_len - 1;
+		memcpy(bp, dirname, dirname_len - 1);
+		bp += dirname_len;
+		bp[-1] = '\0';
+	} else if (dirname)
+		file->dirname = dirname;
+
+	file->basename = bp;
+	memcpy(bp, basename, basename_len);
+	bp += basename_len;
+
+	if (preserve_devices && IS_DEVICE(mode))
+		file->u.rdev = rdev;
+
+#if SUPPORT_LINKS
+	if (linkname_len) {
+		file->u.link = bp;
+		read_sbuf(f, bp, linkname_len - 1);
 		if (sanitize_paths)
-			sanitize_path(file->u.link, file->dirname);
+			sanitize_path(bp, lastdir);
+		bp += linkname_len;
 	}
+#endif
+
 #if SUPPORT_HARD_LINKS
 	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");
+		flags |= XMIT_HAS_IDEV_DATA;
+	if (flags & XMIT_HAS_IDEV_DATA && flist->hlink_pool) {
+		INO64_T inode;
+		file->link_u.idev = pool_talloc(flist->hlink_pool,
+		    struct idev, 1, "inode_table");
 		if (protocol_version < 26) {
 			dev = read_int(f);
-			file->F_INODE = read_int(f);
+			inode = read_int(f);
 		} else {
-			if (!(flags & SAME_DEV))
+			if (!(flags & XMIT_SAME_DEV))
 				dev = read_longint(f);
-			file->F_INODE = read_longint(f);
+			inode = read_longint(f);
+		}
+		if (flist->hlink_pool) {
+			file->F_INODE = inode;
+			file->F_DEV = dev;
 		}
-		file->F_DEV = dev;
 	}
 #endif
 
 	if (always_checksum) {
 		char *sum;
-		if (S_ISREG(mode)) {
-			sum = file->u.sum = new_array(char, MD4_SUM_LENGTH);
-			if (!sum)
-				out_of_memory("md4 sum");
+		if (sum_len) {
+			file->u.sum = sum = bp;
+			/*bp += sum_len;*/
 		} else if (protocol_version < 28) {
 			/* Prior to 28, we get a useless set of nulls. */
 			sum = empty_sum;
@@ -694,36 +703,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, int f)
 }
 
 
-/* determine if a file in a different filesstem 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)
-{
-	STRUCT_STAT st2;
-	char *p = strrchr(fname, '/');
-
-	/* skip all but directories */
-	if (!S_ISDIR(st->st_mode))
-		return 1;
-
-	/* if its not a subdirectory then allow */
-	if (!p)
-		return 0;
-
-	*p = 0;
-	if (link_stat(fname, &st2)) {
-		*p = '/';
-		return 0;
-	}
-	*p = '/';
-
-	return (st2.st_dev != filesystem_dev);
-}
-
-#define STRDUP(ap, p)	(ap ? string_area_strdup(ap, p) : strdup(p))
-/* IRIX cc cares that the operands to the ternary have the same type. */
-#define MALLOC(ap, i)	(ap ? (void*) string_area_malloc(ap, i) : malloc(i))
-
 /**
  * Create a file_struct for a named file by reading its stat()
  * information and performing extensive checks against global
@@ -739,39 +718,46 @@ 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(char *fname, struct string_area **ap,
-			      int exclude_level)
+struct file_struct *make_file(char *fname,
+    struct file_list *flist, int exclude_level)
 {
+	static char *lastdir;
+	static int lastdir_len = -1;
 	struct file_struct *file;
 	STRUCT_STAT st;
 	char sum[SUM_LENGTH];
-	char *p;
-	char cleaned_name[MAXPATHLEN];
-	char linkbuf[MAXPATHLEN];
+	char thisname[MAXPATHLEN];
+	char linkname[MAXPATHLEN];
+	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+	char *basename, *dirname, *bp;
+	unsigned short flags = 0;
 
-	strlcpy(cleaned_name, fname, MAXPATHLEN);
-	cleaned_name[MAXPATHLEN - 1] = 0;
-	clean_fname(cleaned_name);
+
+	if (strlcpy(thisname, fname, sizeof thisname)
+	    >= sizeof thisname - flist_dir_len) {
+		rprintf(FINFO, "skipping overly long name: %s\n", fname);
+		return NULL;
+	}
+	clean_fname(thisname);
 	if (sanitize_paths)
-		sanitize_path(cleaned_name, NULL);
-	fname = cleaned_name;
+		sanitize_path(thisname, NULL);
 
 	memset(sum, 0, SUM_LENGTH);
 
-	if (readlink_stat(fname, &st, linkbuf) != 0) {
+	if (readlink_stat(thisname, &st, linkname) != 0) {
 		int save_errno = errno;
 		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 */
-			if (check_exclude_file(fname, 0, exclude_level)) {
+			if (check_exclude_file(thisname, 0, exclude_level)) {
 				/* file is excluded anyway, ignore silently */
 				return NULL;
 			}
 		}
 		io_error |= IOERR_GENERAL;
 		rprintf(FERROR, "readlink %s failed: %s\n",
-			full_fname(fname), strerror(save_errno));
+			full_fname(thisname), strerror(save_errno));
 		return NULL;
 	}
 
@@ -780,87 +766,127 @@ struct file_struct *make_file(char *fname, struct string_area **ap,
 		goto skip_excludes;
 
 	if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
-		rprintf(FINFO, "skipping directory %s\n", fname);
+		rprintf(FINFO, "skipping directory %s\n", thisname);
 		return NULL;
 	}
 
-	if (one_file_system && st.st_dev != filesystem_dev) {
-		if (skip_filesystem(fname, &st))
-			return NULL;
-	}
+	/* We only care about 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))
+		flags |= FLAG_MOUNT_POINT;
 
-	if (check_exclude_file(fname, S_ISDIR(st.st_mode) != 0, exclude_level))
+	if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
 		return NULL;
 
-	if (lp_ignore_nonreadable(module_id) && access(fname, R_OK) != 0)
+	if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
 		return NULL;
 
       skip_excludes:
 
-	if (verbose > 2)
-		rprintf(FINFO, "make_file(%s,*,%d)\n", fname, exclude_level);
+	if (verbose > 2) {
+		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
+			who_am_i(), thisname, exclude_level);
+	}
 
-	file = new(struct file_struct);
-	if (!file)
-		out_of_memory("make_file");
-	memset((char *) file, 0, sizeof(*file));
-
-	if ((p = strrchr(fname, '/'))) {
-		static char *lastdir;
-		*p = 0;
-		if (lastdir && strcmp(fname, lastdir) == 0)
-			file->dirname = lastdir;
-		else {
-			file->dirname = strdup(fname);
-			lastdir = file->dirname;
-		}
-		file->basename = STRDUP(ap, p + 1);
-		*p = '/';
+	if ((basename = strrchr(thisname, '/')) != NULL) {
+		dirname_len = ++basename - thisname; /* counts future '\0' */
+		if (lastdir_len == dirname_len - 1
+		    && strncmp(thisname, lastdir, lastdir_len) == 0) {
+			dirname = lastdir;
+			dirname_len = 0; /* indicates no copy is needed */
+		} else
+			dirname = thisname;
 	} else {
-		file->dirname = NULL;
-		file->basename = STRDUP(ap, fname);
+		basename = thisname;
+		dirname = NULL;
+		dirname_len = 0;
 	}
+	basename_len = strlen(basename) + 1; /* count the '\0' */
 
+#if SUPPORT_LINKS
+	linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
+#else
+	linkname_len = 0;
+#endif
+
+	sum_len = always_checksum && S_ISREG(st.st_mode) ? MD4_SUM_LENGTH : 0;
+
+	alloc_len = file_struct_len + dirname_len + basename_len
+	    + linkname_len + sum_len;
+	if (flist) {
+		bp = pool_alloc(flist->file_pool, alloc_len,
+		    "receive_file_entry");
+	} else {
+		if (!(bp = new_array(char, alloc_len)))
+			out_of_memory("receive_file_entry");
+	}
+
+	file = (struct file_struct *)bp;
+	memset(bp, 0, file_struct_len);
+	bp += file_struct_len;
+
+	file->flags = flags;
 	file->modtime = st.st_mtime;
 	file->length = st.st_size;
 	file->mode = st.st_mode;
 	file->uid = st.st_uid;
 	file->gid = st.st_gid;
-	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;
+
+#if SUPPORT_HARD_LINKS
+	if (flist && flist->hlink_pool) {
+		if (protocol_version < 28) {
+			if (S_ISREG(st.st_mode))
+				file->link_u.idev = pool_talloc(
+				    flist->hlink_pool, struct idev, 1,
+				    "inode_table");
+		} else {
+			if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+				file->link_u.idev = pool_talloc(
+				    flist->hlink_pool, struct idev, 1,
+				    "inode_table");
 		}
 	}
+	if (file->link_u.idev) {
+		file->F_DEV = st.st_dev;
+		file->F_INODE = st.st_ino;
+	}
+#endif
+
+	if (dirname_len) {
+		file->dirname = lastdir = bp;
+		lastdir_len = dirname_len - 1;
+		memcpy(bp, dirname, dirname_len - 1);
+		bp += dirname_len;
+		bp[-1] = '\0';
+	} else if (dirname)
+		file->dirname = dirname;
+
+	file->basename = bp;
+	memcpy(bp, basename, basename_len);
+	bp += basename_len;
+
 #ifdef HAVE_STRUCT_STAT_ST_RDEV
-	if (IS_DEVICE(st.st_mode))
+	if (preserve_devices && IS_DEVICE(st.st_mode))
 		file->u.rdev = st.st_rdev;
 #endif
 
 #if SUPPORT_LINKS
-	if (S_ISLNK(st.st_mode))
-		file->u.link = STRDUP(ap, linkbuf);
+	if (linkname_len) {
+		file->u.link = bp;
+		memcpy(bp, linkname, linkname_len);
+		bp += linkname_len;
+	}
 #endif
 
-	if (always_checksum && S_ISREG(st.st_mode)) {
-		if (!(file->u.sum = (char*)MALLOC(ap, MD4_SUM_LENGTH)))
-			out_of_memory("md4 sum");
-		file_checksum(fname, file->u.sum, st.st_size);
+	if (sum_len) {
+		file->u.sum = bp;
+		file_checksum(thisname, bp, st.st_size);
+		/*bp += sum_len;*/
 	}
 
-	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;
@@ -877,9 +903,8 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	extern int delete_excluded;
 
 	/* 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);
+	file = make_file(fname, flist,
+	    f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES);
 
 	if (!file)
 		return;
@@ -889,17 +914,17 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	flist_expand(flist);
 
 	if (write_batch)
-		file->flags |= FLAG_DELETE;
+		file->flags |= FLAG_TOP_DIR;
 
 	if (file->basename[0]) {
 		flist->files[flist->count++] = file;
 		send_file_entry(file, f, base_flags);
 	}
 
-	if (S_ISDIR(file->mode) && recursive) {
-		struct exclude_struct **last_exclude_list =
-		    local_exclude_list;
-		send_directory(f, flist, f_name_to(file, fbuf, sizeof fbuf));
+	if (recursive && S_ISDIR(file->mode)
+	    && !(file->flags & FLAG_MOUNT_POINT)) {
+		struct exclude_struct **last_exclude_list = local_exclude_list;
+		send_directory(f, flist, f_name_to(file, fbuf));
 		local_exclude_list = last_exclude_list;
 		return;
 	}
@@ -911,7 +936,7 @@ 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);
@@ -922,28 +947,27 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		return;
 	}
 
-	strlcpy(fname, dir, MAXPATHLEN);
-	l = strlen(fname);
-	if (fname[l - 1] != '/') {
-		if (l == MAXPATHLEN - 1) {
+	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");
+		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
+		    < MAXPATHLEN - offset)
 			add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-		} else {
+		else {
 			io_error |= IOERR_GENERAL;
 			rprintf(FINFO,
 				"cannot cvs-exclude in long-named directory %s\n",
@@ -956,13 +980,19 @@ static void send_directory(int f, struct file_list *flist, char *dir)
 		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 (errno) {
 		io_error |= IOERR_GENERAL;
 		rprintf(FERROR, "readdir(%s): (%d) %s\n",
-		    dir, errno, strerror(errno));
+			dir, errno, strerror(errno));
 	}
 
 	if (local_exclude_list)
@@ -982,7 +1012,7 @@ 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;
@@ -993,12 +1023,13 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 	start_write = stats.total_written;
 
-	flist = flist_new();
+	flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
+	    "send_file_list");
 
 	if (f != -1) {
 		io_start_buffering_out(f);
 		if (filesfrom_fd >= 0) {
-			if (argv[0] && !push_dir(argv[0], 0)) {
+			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);
@@ -1028,8 +1059,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			if (l == 2 && fname[0] == '.') {
 				/* Turn "./" into just "." rather than "./." */
 				fname[1] = '\0';
-			} else {
-				strlcat(fname, ".", MAXPATHLEN);
+			} else if (l < MAXPATHLEN) {
+				fname[l++] = '.';
+				fname[l] = '\0';
 			}
 		}
 
@@ -1048,7 +1080,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, '/');
@@ -1099,26 +1131,36 @@ 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;
+
+			strcpy(olddir, curr_dir); /* can't overflow */
 
-			if (!olddir) {
+			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 {
+				flist_dir = lastdir = strdup(dir);
+				flist_dir_len = lastdir_len = strlen(dir);
+			}
 		}
 
 		if (one_file_system)
 			set_filesystem(fname);
 
-		send_file_name(f, flist, fname, recurse, FLAG_DELETE);
+		send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
 
-		if (olddir != NULL) {
+		if (olddir[0]) {
 			flist_dir = NULL;
-			if (pop_dir(olddir) != 0) {
+			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);
@@ -1133,6 +1175,12 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			finish_filelist_progress(flist);
 	}
 
+	if (flist->hlink_pool)
+	{
+		pool_destroy(flist->hlink_pool);
+		flist->hlink_pool = NULL;
+	}
+
 	clean_flist(flist, 0, 0);
 
 	if (f != -1) {
@@ -1150,6 +1198,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			write_batch_flist_info(flist->count, flist->files);
 	}
 
+	if (verbose > 3)
+		output_flist(flist);
+
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
 
@@ -1169,9 +1220,7 @@ struct file_list *recv_file_list(int f)
 
 	start_read = stats.total_read;
 
-	flist = new(struct file_list);
-	if (!flist)
-		goto oom;
+	flist = flist_new(WITH_HLINK, "recv_file_list");
 
 	flist->count = 0;
 	flist->malloced = 1000;
@@ -1185,9 +1234,9 @@ struct file_list *recv_file_list(int f)
 
 		flist_expand(flist);
 
-		if (protocol_version >= 28 && (flags & EXTENDED_FLAGS))
+		if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
 			flags |= read_byte(f) << 8;
-		receive_file_entry(&flist->files[i], flags, f);
+		receive_file_entry(&flist->files[i], flags, flist, f);
 
 		if (S_ISREG(flist->files[i]->mode))
 			stats.total_size += flist->files[i]->length;
@@ -1201,7 +1250,7 @@ struct file_list *recv_file_list(int f)
 				f_name(flist->files[i]));
 		}
 	}
-	receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
+	receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
 
 	if (verbose > 2)
 		rprintf(FINFO, "received %d names\n", flist->count);
@@ -1225,6 +1274,9 @@ struct file_list *recv_file_list(int f)
 		}
 	}
 
+	if (verbose > 3)
+		output_flist(flist);
+
 	if (list_only) {
 		int i;
 		for (i = 0; i < flist->count; i++)
@@ -1287,44 +1339,43 @@ int flist_find(struct file_list *flist, struct file_struct *f)
 	return -1;
 }
 
-
 /*
- * free up one file
+ * Free up any resources a file_struct has allocated
+ * and clear the file.
  */
-void free_file(struct file_struct *file)
+void clear_file(int i, struct file_list *flist)
 {
-	if (!file)
-		return;
-	if (file->basename)
-		free(file->basename);
-	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;
+	if (flist->hlink_pool && flist->files[i]->link_u.idev)
+		pool_free(flist->hlink_pool, 0, flist->files[i]->link_u.idev);
+	memset(flist->files[i], 0, file_struct_len);
 }
 
 
 /*
  * allocate a new file list
  */
-struct file_list *flist_new(void)
+struct file_list *flist_new(int with_hlink, char *msg)
 {
 	struct file_list *flist;
 
 	flist = new(struct file_list);
 	if (!flist)
-		out_of_memory("send_file_list");
+		out_of_memory(msg);
 
-	flist->count = 0;
-	flist->malloced = 0;
-	flist->files = NULL;
+	memset(flist, 0, sizeof (struct file_list));
 
-#if ARENA_SIZE > 0
-	flist->string_area = string_area_new(0);
-#else
-	flist->string_area = NULL;
+	if (!(flist->file_pool = pool_create(FILE_EXTENT, 0,
+	    out_of_memory, POOL_INTERN)))
+		out_of_memory(msg);
+
+#if SUPPORT_HARD_LINKS
+	if (with_hlink && preserve_hard_links) {
+		if (!(flist->hlink_pool = pool_create(HLINK_EXTENT, 
+		    sizeof (struct idev), out_of_memory, POOL_INTERN)))
+			out_of_memory(msg);
+	}
 #endif
+
 	return flist;
 }
 
@@ -1333,22 +1384,9 @@ struct file_list *flist_new(void)
  */
 void flist_free(struct file_list *flist)
 {
-	int i;
-	for (i = 1; i < flist->count; i++) {
-		if (!flist->string_area)
-			free_file(flist->files[i]);
-		free(flist->files[i]);
-	}
-	/* FIXME: I don't think we generally need to blank the flist
-	 * since it's about to be freed.  This will just cause more
-	 * memory traffic.  If you want a freed-memory debugger, you
-	 * know where to get it. */
-	memset((char *) flist->files, 0,
-	       sizeof(flist->files[0]) * flist->count);
+	pool_destroy(flist->file_pool);
+	pool_destroy(flist->hlink_pool);
 	free(flist->files);
-	if (flist->string_area)
-		string_area_free(flist->string_area);
-	memset((char *) flist, 0, sizeof(*flist));
 	free(flist);
 }
 
@@ -1365,7 +1403,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 		return;
 
 	qsort(flist->files, flist->count,
-	      sizeof(flist->files[0]), (int (*)()) file_compare);
+	      sizeof flist->files[0], (int (*)()) file_compare);
 
 	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
 		if (flist->files[i]->basename) {
@@ -1385,16 +1423,10 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			/* 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.
-			 * XXX can i use a bit in the flags field? */
-			if (flist->string_area)
-				flist->files[i][0] = null_file;
-			else
-				free_file(flist->files[i]);
+			if (flist->files[i]->flags & FLAG_TOP_DIR)
+				flist->files[prev_i]->flags |= FLAG_TOP_DIR;
+
+			clear_file(i, flist);
 		} else
 			prev_i = i;
 	}
@@ -1417,17 +1449,28 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			}
 		}
 	}
+}
 
-	if (verbose <= 3)
-		return;
+static void output_flist(struct file_list *flist)
+{
+	char uidbuf[16], gidbuf[16];
+	struct file_struct *file;
+	int i;
 
 	for (i = 0; i < flist->count; 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,
-			(double) flist->files[i]->length);
+		file = flist->files[i];
+		if (am_root && preserve_uid)
+			sprintf(uidbuf, " uid=%ld", (long)file->uid);
+		else
+			*uidbuf = '\0';
+		if (preserve_gid && file->gid != GID_NONE)
+			sprintf(gidbuf, " gid=%ld", (long)file->gid);
+		else
+			*gidbuf = '\0';
+		rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
+			who_am_i(), i, NS(file->basedir), NS(file->dirname),
+			NS(file->basename), (int) file->mode,
+			(double) file->length, uidbuf, gidbuf);
 	}
 }
 
@@ -1503,19 +1546,21 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 
 
 /* Return a copy of the full filename of a flist entry, using the indicated
- * buffer.
+ * 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, int bsize)
+char *f_name_to(struct file_struct *f, char *fbuf)
 {
 	if (!f || !f->basename)
 		return NULL;
 
 	if (f->dirname) {
-		int off = strlcpy(fbuf, f->dirname, bsize);
-		off += strlcpy(fbuf + off, "/", bsize - off);
-		strlcpy(fbuf + off, f->basename, bsize - off);
+		int len = strlen(f->dirname);
+		memcpy(fbuf, f->dirname, len);
+		fbuf[len] = '/';
+		strcpy(fbuf + len + 1, f->basename);
 	} else
-		strlcpy(fbuf, f->basename, bsize);
+		strcpy(fbuf, f->basename);
 	return fbuf;
 }
 
@@ -1529,5 +1574,5 @@ char *f_name(struct file_struct *f)
 
 	n = (n + 1) % (sizeof names / sizeof names[0]);
 
-	return f_name_to(f, names[n], sizeof names[0]);
+	return f_name_to(f, names[n]);
 }