search for: io_buffer_count

...Hat, Inc. -------------- next part -------------- diff -ur rsync-2.5.6/io.c rsync-2.5.6-sign/io.c --- rsync-2.5.6/io.c 2002-04-10 22:11:50.000000000 -0400 +++ rsync-2.5.6-sign/io.c 2003-06-05 14:05:54.000000000 -0400 @@ -605,7 +605,7 @@ } while (len) { - int n = MIN((int) len, IO_BUFFER_SIZE-io_buffer_count); + ssize_t n = MIN((ssize_t) len, IO_BUFFER_SIZE-io_buffer_count); if (n > 0) { memcpy(io_buffer+io_buffer_count, buf, n); buf += n; Only in rsync-2.5.6-sign/: io.c.orig diff -ur rsync-2.5.6/match.c rsync-2.5.6-sign/match.c --- rsync-2.5.6/match.c 2002-04-09 02:11:06.000000000 -0400...

...if (ret <= 0) { - rprintf(FERROR,"erroring writing %d bytes - exiting\n", len); + rprintf(FERROR,"erroring writing %lu bytes - exiting\n", len); exit_cleanup(RERR_STREAMIO); } @@ -561,7 +561,7 @@ } while (len) { - int n = MIN(len, IO_BUFFER_SIZE-io_buffer_count); + int n = MIN((ssize_t)len, IO_BUFFER_SIZE-io_buffer_count); if (n > 0) { memcpy(io_buffer+io_buffer_count, buf, n); buf += n; diff -ru rsync-2.4.6/match.c rsync-2.4.6-fixed/match.c --- rsync-2.4.6/match.c Sat Jan 29 06:35:03 2000 +++ rsync-2.4.6-fixed/match.c Mon Jan 28 19:07:54 2...

Hi, I'm having a problem rsyncing one file (since I signed it). It seems that the content of a file is able to cause problems in the protocol. building file list ... 28820 files to consider apt/packages/avifile/ apt/packages/avifile/avifile-0.7.34-1.dag.rh90.i386.rpm rsync: error writing 4 unbuffered bytes - exiting: Broken pipe rsync error: error in rsync protocol data stream (code

...int total = 0; fd_set w_fds, r_fds; int fd_count, count; struct timeval tv; +unsigned char * buf; + buf = (unsigned char *)buf1; err_list_push(); @@ -469,24 +480,26 @@ } -static char *io_buffer; +static unsigned char *io_buffer; static int io_buffer_count; void io_start_buffering(int fd) { if (io_buffer) return; multiplex_out_fd = fd; - io_buffer = (char *)malloc(IO_BUFFER_SIZE); + io_buffer = malloc(IO_BUFFER_SIZE); if (!io_buffer) out_of_memory("writefd"); io_buffer_count = 0; } /...

...= 0; } - + if (remaining == 0) { + io_flush(); + } return ret; } @@ -344,8 +368,6 @@ size_t total=0; while (total < N) { - io_flush(); - ret = read_unbuffered (fd, buffer + total, N-total); total += ret; } @@ -531,7 +553,7 @@ static char *io_buffer; static int io_buffer_count; -void io_start_buffering(int fd) +void io_start_buffering_out(int fd) { if (io_buffer) return; multiplex_out_fd = fd; @@ -540,6 +562,11 @@ io_buffer_count = 0; } +void io_start_buffering_in(int fd) +{ + multiplex_in_fd = fd; +} + /** * Write an message to a multiplexed stream. If th...