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
Fixed a couple iconv loops to properly handle incomplete chars
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
a687375
..
61d01ce
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-31,7
+31,6
@@
extern int am_generator;
extern int local_server;
extern int quiet;
extern int module_id;
extern int local_server;
extern int quiet;
extern int module_id;
-extern int msg_fd_out;
extern int checksum_len;
extern int allow_8bit_chars;
extern int protocol_version;
extern int checksum_len;
extern int allow_8bit_chars;
extern int protocol_version;
@@
-69,6
+68,7
@@
struct stats stats;
int got_xfer_error = 0;
int output_needs_newline = 0;
int got_xfer_error = 0;
int output_needs_newline = 0;
+int send_msgs_to_gen = 0;
struct {
int code;
struct {
int code;
@@
-263,7
+263,7
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
if (msgs2stderr && code != FLOG)
goto output_msg;
if (msgs2stderr && code != FLOG)
goto output_msg;
- if (
am_server && msg_fd_out >= 0
) {
+ if (
send_msgs_to_gen
) {
assert(!is_utf8);
/* Pass the message to our sibling in native charset. */
send_msg((enum msgcode)code, buf, len, 0);
assert(!is_utf8);
/* Pass the message to our sibling in native charset. */
send_msg((enum msgcode)code, buf, len, 0);
@@
-359,7
+359,7
@@
output_msg:
INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
while (inbuf.len) {
INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
while (inbuf.len) {
- iconvbufs(ic, &inbuf, &outbuf,
0
);
+ iconvbufs(ic, &inbuf, &outbuf,
inbuf.pos ? 0 : ICB_INIT
);
ierrno = errno;
if (outbuf.len) {
filtered_fwrite(f, convbuf, outbuf.len, 0);
ierrno = errno;
if (outbuf.len) {
filtered_fwrite(f, convbuf, outbuf.len, 0);