X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b8d4524b4f8c0080ed34b59d90d8345d5c84916b..45f133b9769fb45a329d3d41e121109d430e307d:/token.c diff --git a/token.c b/token.c index 38bedd61..318bdbc2 100644 --- a/token.c +++ b/token.c @@ -26,44 +26,46 @@ extern int do_compression; /* non-compressing recv token */ static int simple_recv_token(int f,char **data) { - static int residue = 0; - static char *buf = NULL; - int n; - - if (!buf) { - buf = (char *)malloc(CHUNK_SIZE); - if (!buf) out_of_memory("simple_recv_token"); - } + static int residue; + static char *buf; + int n; + if (!buf) { + buf = (char *)malloc(CHUNK_SIZE); + if (!buf) out_of_memory("simple_recv_token"); + } - if (residue == 0) { - int i = read_int(f); - if (i <= 0) return i; - residue = i; - } + if (residue == 0) { + int i = read_int(f); + if (i <= 0) return i; + residue = i; + } - *data = buf; - n = MIN(CHUNK_SIZE,residue); - residue -= n; - read_buf(f,buf,n); - return n; + *data = buf; + n = MIN(CHUNK_SIZE,residue); + residue -= n; + read_buf(f,buf,n); + return n; } /* non-compressing send token */ static void simple_send_token(int f,int token, - struct map_struct *buf,int offset,int n) + struct map_struct *buf,OFF_T offset,int n) { - if (n > 0) { - int l = 0; - while (l < n) { - int n1 = MIN(CHUNK_SIZE,n-l); - write_int(f,n1); - write_buf(f,map_ptr(buf,offset+l,n1),n1); - l += n1; - } - } - write_int(f,-(token+1)); + if (n > 0) { + int l = 0; + while (l < n) { + int n1 = MIN(CHUNK_SIZE,n-l); + write_int(f,n1); + write_buf(f,map_ptr(buf,offset+l,n1),n1); + l += n1; + } + } + /* a -2 token means to send data only and no token */ + if (token != -2) { + write_int(f,-(token+1)); + } } @@ -99,12 +101,12 @@ static int last_run_end; static z_stream tx_strm; /* Output buffer */ -static char *obuf = NULL; +static char *obuf; /* Send a deflated token */ static void send_deflated_token(int f, int token, - struct map_struct *buf, int offset, int nb, int toklen) + struct map_struct *buf, OFF_T offset, int nb, int toklen) { int n, r; static int init_done; @@ -117,7 +119,7 @@ send_deflated_token(int f, int token, tx_strm.zfree = z_free; if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8, -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) { - fprintf(FERROR, "compression init failed\n"); + rprintf(FERROR, "compression init failed\n"); exit_cleanup(1); } if ((obuf = malloc(MAX_DATA_COUNT+2)) == NULL) @@ -157,18 +159,18 @@ send_deflated_token(int f, int token, if (tx_strm.avail_in == 0 && nb != 0) { /* give it some more input */ n = MIN(nb, CHUNK_SIZE); - tx_strm.next_in = map_ptr(buf, offset, n); + tx_strm.next_in = (Bytef *)map_ptr(buf, offset, n); tx_strm.avail_in = n; nb -= n; offset += n; } if (tx_strm.avail_out == 0) { - tx_strm.next_out = obuf + 2; + tx_strm.next_out = (Bytef *)(obuf + 2); tx_strm.avail_out = MAX_DATA_COUNT; } r = deflate(&tx_strm, nb? Z_NO_FLUSH: Z_PACKET_FLUSH); if (r != Z_OK) { - fprintf(FERROR, "deflate returned %d\n", r); + rprintf(FERROR, "deflate returned %d\n", r); exit_cleanup(1); } if (nb == 0 || tx_strm.avail_out == 0) { @@ -185,13 +187,13 @@ send_deflated_token(int f, int token, if (token != -1) { /* add the data in the current block to the compressor's history and hash table */ - tx_strm.next_in = map_ptr(buf, offset, toklen); + tx_strm.next_in = (Bytef *)map_ptr(buf, offset, toklen); tx_strm.avail_in = toklen; tx_strm.next_out = NULL; tx_strm.avail_out = 2 * toklen; r = deflate(&tx_strm, Z_INSERT_ONLY); if (r != Z_OK || tx_strm.avail_in != 0) { - fprintf(FERROR, "deflate on token returned %d (%d bytes left)\n", + rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n", r, tx_strm.avail_in); exit_cleanup(1); } @@ -220,8 +222,8 @@ static int recv_deflated_token(int f, char **data) { int n, r, flag; - static int init_done = 0; - static int saved_flag = 0; + static int init_done; + static int saved_flag; for (;;) { switch (recv_state) { @@ -231,7 +233,7 @@ recv_deflated_token(int f, char **data) rx_strm.zalloc = z_alloc; rx_strm.zfree = z_free; if (inflateInit2(&rx_strm, -15) != Z_OK) { - fprintf(FERROR, "inflate init failed\n"); + rprintf(FERROR, "inflate init failed\n"); exit_cleanup(1); } if ((cbuf = malloc(MAX_DATA_COUNT)) == NULL @@ -255,7 +257,7 @@ recv_deflated_token(int f, char **data) if ((flag & 0xC0) == DEFLATED_DATA) { n = ((flag & 0x3f) << 8) + read_byte(f); read_buf(f, cbuf, n); - rx_strm.next_in = cbuf; + rx_strm.next_in = (Bytef *)cbuf; rx_strm.avail_in = n; recv_state = r_inflating; break; @@ -263,12 +265,12 @@ recv_deflated_token(int f, char **data) if (recv_state == r_inflated) { /* check previous inflated stuff ended correctly */ rx_strm.avail_in = 0; - rx_strm.next_out = dbuf; + rx_strm.next_out = (Bytef *)dbuf; rx_strm.avail_out = CHUNK_SIZE; r = inflate(&rx_strm, Z_PACKET_FLUSH); n = CHUNK_SIZE - rx_strm.avail_out; if (r != Z_OK) { - fprintf(FERROR, "inflate flush returned %d (%d bytes)\n", + rprintf(FERROR, "inflate flush returned %d (%d bytes)\n", r, n); exit_cleanup(1); } @@ -303,12 +305,12 @@ recv_deflated_token(int f, char **data) return -1 - rx_token; case r_inflating: - rx_strm.next_out = dbuf; + rx_strm.next_out = (Bytef *)dbuf; rx_strm.avail_out = CHUNK_SIZE; r = inflate(&rx_strm, Z_NO_FLUSH); n = CHUNK_SIZE - rx_strm.avail_out; if (r != Z_OK) { - fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n); + rprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n); exit_cleanup(1); } if (rx_strm.avail_in == 0) @@ -337,11 +339,11 @@ see_deflate_token(char *buf, int len) { int r; - rx_strm.next_in = buf; + rx_strm.next_in = (Bytef *)buf; rx_strm.avail_in = len; r = inflateIncomp(&rx_strm); if (r != Z_OK) { - fprintf(FERROR, "inflateIncomp returned %d\n", r); + rprintf(FERROR, "inflateIncomp returned %d\n", r); exit_cleanup(1); } } @@ -351,7 +353,7 @@ see_deflate_token(char *buf, int len) * If token == -1 then we have reached EOF * If n == 0 then don't send a buffer */ -void send_token(int f,int token,struct map_struct *buf,int offset, +void send_token(int f,int token,struct map_struct *buf,OFF_T offset, int n,int toklen) { if (!do_compression) {