From: Andrew Tridgell Date: Sat, 29 Jan 2000 05:16:13 +0000 (+0000) Subject: use full buffer length, not strlen X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/4a81463880f9ba9d25b2e06ddc67628aa4768787 use full buffer length, not strlen --- diff --git a/log.c b/log.c index 427bdc30..61a8bd05 100644 --- a/log.c +++ b/log.c @@ -91,6 +91,7 @@ void rwrite(enum logcode code, char *buf, int len) { FILE *f=NULL; extern int am_daemon; + extern int am_server; extern int quiet; /* recursion can happen with certain fatal conditions */ @@ -105,11 +106,13 @@ void rwrite(enum logcode code, char *buf, int len) return; } - if (io_error_write(log_error_fd, code, buf, strlen(buf))) { + /* first try to pass it off the our sibling */ + if (am_server && io_error_write(log_error_fd, code, buf, len)) { return; } - if (io_multiplex_write(code, buf, strlen(buf))) { + /* then try to pass it to the other end */ + if (am_server && io_multiplex_write(code, buf, len)) { return; } @@ -134,7 +137,6 @@ void rwrite(enum logcode code, char *buf, int len) } if (code == FINFO) { - extern int am_server; if (am_server) f = stderr; else