Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that the hlink node->data allocation doesn't fail.
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
061d1be
..
b228aab
100644
(file)
--- 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;
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;
"[%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
}
#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)
if (sender_symlink_iconv)
- linkname_len
= linkname_len * 2 + 1
;
+ linkname_len
*= 2
;
#endif
if (munge_symlinks)
linkname_len += SYMLINK_PREFIX_LEN;
#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;
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. */
/* Read the symlink data into the end of our double-sized
* buffer and then convert it into the right spot. */