Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This should fix the bug where file transfer with compression failed with
[rsync/rsync.git]
/
token.c
diff --git
a/token.c
b/token.c
index
4e36cc6
..
5056569
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-241,6
+241,7
@@
recv_deflated_token(int f, char **data)
inflateReset(&rx_strm);
}
recv_state = r_idle;
inflateReset(&rx_strm);
}
recv_state = r_idle;
+ rx_token = 0;
break;
case r_idle:
break;
case r_idle:
@@
-292,14
+293,17
@@
recv_deflated_token(int f, char **data)
rx_strm.avail_out = CHUNK_SIZE;
r = inflate(&rx_strm, Z_NO_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
rx_strm.avail_out = CHUNK_SIZE;
r = inflate(&rx_strm, Z_NO_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
- if (r != Z_OK
|| n == 0
) {
+ if (r != Z_OK) {
fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
exit_cleanup(1);
}
if (rx_strm.avail_out != 0)
recv_state = r_inflated;
fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
exit_cleanup(1);
}
if (rx_strm.avail_out != 0)
recv_state = r_inflated;
- *data = dbuf;
- return n;
+ if (n != 0) {
+ *data = dbuf;
+ return n;
+ }
+ break;
case r_running:
++rx_token;
case r_running:
++rx_token;
@@
-367,8
+371,6
@@
int recv_token(int f,char **data)
*/
void see_token(char *data, int toklen)
{
*/
void see_token(char *data, int toklen)
{
- int r;
-
if (do_compression)
see_deflate_token(data, toklen);
}
if (do_compression)
see_deflate_token(data, toklen);
}