X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4f092bee9fd818de4248f420388bf2d6eacea987..136ac7ecec03339837e4b70f3128fd3609d37374:/log.c diff --git a/log.c b/log.c index 532803f2..ab8644ed 100644 --- a/log.c +++ b/log.c @@ -30,6 +30,7 @@ static char *logfname; static FILE *logfile; static int log_error_fd = -1; +struct stats stats; int log_got_error=0; @@ -50,7 +51,7 @@ struct { { RERR_SIGNAL , "received SIGUSR1 or SIGINT" }, { RERR_WAITCHILD , "some error returned by waitpid()" }, { RERR_MALLOC , "error allocating core memory buffers" }, - { RERR_PARTIAL , "partial transfer" }, + { RERR_PARTIAL , "some files could not be transferred" }, { RERR_TIMEOUT , "timeout in data send/receive" }, { RERR_CMD_FAILED , "remote shell failed" }, { RERR_CMD_KILLED , "remote shell killed" }, @@ -237,7 +238,11 @@ void rwrite(enum logcode code, char *buf, int len) return; } - /* if that fails, try to pass it to the other end */ + /* If that fails, try to pass it to the other end. + * + * io_multiplex_write can fail if we do not have a multiplexed + * connection at the moment, in which case we fall through and + * log locally instead. */ if (am_server && io_multiplex_write(code, buf, len)) { return; }