X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/90ba34e27c74c9fd8a8a00a360132caf20877fc2..26ef00bd3c6c66240a4640aa54db1106d8b901fc:/io.c diff --git a/io.c b/io.c index 649bd758..7aee3479 100644 --- a/io.c +++ b/io.c @@ -181,8 +181,8 @@ static int read_timeout(int fd, char *buf, int len) 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); } @@ -381,7 +381,6 @@ static void writefd_unbuffered(int fd,char *buf,int len) if (FD_ISSET(fd, &w_fds)) { int ret, n = len-total; - ret = write(fd,buf+total,n); if (ret == -1 && errno == EINTR) { @@ -490,18 +489,6 @@ void io_end_buffering(int fd) } } -/* 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) -{ - err_list_push(); - 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;