Blame rsync-3.0.6-iconv-logging.patch
|
 |
a97877a |
diff --git a/log.c b/log.c
|
|
|
a97877a |
index 34a013b..1aca728 100644
|
|
|
a97877a |
--- a/log.c
|
|
|
a97877a |
+++ b/log.c
|
|
|
a97877a |
@@ -377,10 +377,13 @@ output_msg:
|
|
|
a97877a |
filtered_fwrite(f, convbuf, outbuf.len, 0);
|
|
|
a97877a |
outbuf.len = 0;
|
|
|
a97877a |
}
|
|
|
a97877a |
- if (!ierrno || ierrno == E2BIG)
|
|
|
a97877a |
- continue;
|
|
|
a97877a |
- fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
|
|
|
a97877a |
- inbuf.len--;
|
|
|
a97877a |
+ /* Log one byte of illegal/incomplete sequence and continue with
|
|
|
a97877a |
+ * the next character. Check that the buffer is non-empty for the
|
|
|
a97877a |
+ * sake of robustness. */
|
|
|
a97877a |
+ if ((ierrno == EILSEQ || ierrno == EINVAL) && inbuf.len) {
|
|
|
a97877a |
+ fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
|
|
|
a97877a |
+ inbuf.len--;
|
|
|
a97877a |
+ }
|
|
|
a97877a |
}
|
|
|
a97877a |
} else
|
|
|
a97877a |
#endif
|