{
extern int am_server, am_daemon;
time_t t;
+
+ err_list_push();
if (!io_timeout) return;
if (eof_error) {
rprintf(FERROR,
"%s: connection to server unexpectedly closed"
- " (%ld bytes read so far)\n",
- RSYNC_NAME, stats.total_read);
+ " (%.0f bytes read so far)\n",
+ RSYNC_NAME, (double)stats.total_read);
}
exit_cleanup(RERR_STREAMIO);
}
int fd_count, count;
struct timeval tv;
+ err_list_push();
+
no_flush++;
while (total < len) {
if (FD_ISSET(fd, &w_fds)) {
int ret, n = len-total;
-
ret = write(fd,buf+total,n);
if (ret == -1 && errno == EINTR) {
void io_flush(void)
{
int fd = multiplex_out_fd;
+
+ err_list_push();
+
if (!io_buffer_count || no_flush) return;
if (io_multiplexing_out) {
}
}
-/* some OSes have a bug where an exit causes the pending writes on
- a socket to be flushed. Do an explicit shutdown to try to prevent this */
-void io_shutdown(void)
-{
- if (multiplex_out_fd != -1) close(multiplex_out_fd);
- if (io_error_fd != -1) close(io_error_fd);
- multiplex_out_fd = -1;
- io_error_fd = -1;
-}
-
-
static void writefd(int fd,char *buf,int len)
{
stats.total_written += len;
+ err_list_push();
+
if (!io_buffer || fd != multiplex_out_fd) {
writefd_unbuffered(fd, buf, len);
return;
int len;
va_start(ap, format);
- len = vslprintf(buf, sizeof(buf), format, ap);
+ len = vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
if (len < 0) exit_cleanup(RERR_STREAMIO);
return 1;
}
-/* write a message to the special error fd */
-int io_error_write(int f, enum logcode code, char *buf, int len)
-{
- if (f == -1) return 0;
- mplex_write(f, code, buf, len);
- return 1;
-}
-
/* stop output multiplexing */
void io_multiplexing_close(void)
{