X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7c7462cd3079c27062569dce90f6ae3fa79040b3..c78e4ea905bb31d965c9a2b2336bb0f9695ff0f2:/flist.c

diff --git a/flist.c b/flist.c
index d7f095d4..d11437fb 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. */
@@ -1149,7 +1149,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
 			}
 		} else {
 			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR_XFER, save_errno, "readlink %s failed",
+			rsyserr(FERROR_XFER, save_errno, "readlink_stat(%s) failed",
 				full_fname(thisname));
 		}
 		return NULL;