From: Wayne Davison <wayned@samba.org>
Date: Sat, 2 Aug 2008 20:45:50 +0000 (-0700)
Subject: Tweaked the symlink iconv buffer size and fixed a comment.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/87678cefd1f12a8fcb25d5dce32ca3d51ee19f9b

Tweaked the symlink iconv buffer size and fixed a comment.
---

diff --git a/flist.c b/flist.c
index d7f095d4..b228aab8 100644
--- a/flist.c
+++ b/flist.c
@@ -839,10 +839,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		}
 #ifdef ICONV_OPTION
 		/* We don't know how much extra room we need to convert
-		 * the as-yet-unread symlink data when converting it,
-		 * so let's hope that a double-size buffer is plenty. */
+		 * the as-yet-unread symlink data, so let's hope that a
+		 * double-size buffer is plenty. */
 		if (sender_symlink_iconv)
-			linkname_len = linkname_len * 2 + 1;
+			linkname_len *= 2;
 #endif
 		if (munge_symlinks)
 			linkname_len += SYMLINK_PREFIX_LEN;
@@ -989,7 +989,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 				xbuf outbuf, inbuf;
 
 				alloc_len = linkname_len;
-				linkname_len /= 2; /* (linkname_len-1) / 2 for odd values. */
+				linkname_len /= 2;
 
 				/* Read the symlink data into the end of our double-sized
 				 * buffer and then convert it into the right spot. */