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
Quick list of things to do.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
427bdc3
..
61a8bd0
100644
(file)
--- 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;
{
FILE *f=NULL;
extern int am_daemon;
+ extern int am_server;
extern int quiet;
/* recursion can happen with certain fatal conditions */
extern int quiet;
/* recursion can happen with certain fatal conditions */
@@
-105,11
+106,13
@@
void rwrite(enum logcode code, char *buf, int len)
return;
}
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;
}
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;
}
return;
}
@@
-134,7
+137,6
@@
void rwrite(enum logcode code, char *buf, int len)
}
if (code == FINFO) {
}
if (code == FINFO) {
- extern int am_server;
if (am_server)
f = stderr;
else
if (am_server)
f = stderr;
else