From: Wayne Davison <wayned@samba.org>
Date: Sat, 7 Jul 2007 16:01:59 +0000 (+0000)
Subject: The length check in make_file() doesn't need to subtract pathname_len
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/b3b326016a4d29fea20d97e782f1af05542aca22

The length check in make_file() doesn't need to subtract pathname_len
anymore, as the sender code never concatenates the F_PATHNAME() value
with the dirname+basename string these days.
---

diff --git a/flist.c b/flist.c
index 87dbf411..a6c324ae 100644
--- a/flist.c
+++ b/flist.c
@@ -1002,8 +1002,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 	alloc_pool_t *pool;
 	char *bp;
 
-	if (strlcpy(thisname, fname, sizeof thisname)
-	    >= sizeof thisname - pathname_len) {
+	if (strlcpy(thisname, fname, sizeof thisname) >= sizeof thisname) {
 		rprintf(FINFO, "skipping overly long name: %s\n", fname);
 		return NULL;
 	}