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;
}
#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;
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. */
}
} 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;