X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e34ad4e925293ff222bb4fe47b010153fa9f30ab..87678cefd1f12a8fcb25d5dce32ca3d51ee19f9b:/flist.c

diff --git a/flist.c b/flist.c
index 061d1be6..b228aab8 100644
--- a/flist.c
+++ b/flist.c
@@ -696,7 +696,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 
 		if (iconvbufs(ic_recv, &inbuf, &outbuf, 0) < 0) {
 			io_error |= IOERR_GENERAL;
-			rprintf(FERROR_XFER,
+			rprintf(FERROR_UTF8,
 			    "[%s] cannot convert filename: %s (%s)\n",
 			    who_am_i(), lastname, strerror(errno));
 			outbuf.len = 0;
@@ -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. */