Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ff49baa
)
Fixed bug in receiving 32kB compressible files
author
Paul Mackerras
<paulus@samba.org>
Wed, 6 Nov 1996 04:49:53 +0000
(
04:49
+0000)
committer
Paul Mackerras
<paulus@samba.org>
Wed, 6 Nov 1996 04:49:53 +0000
(
04:49
+0000)
token.c
patch
|
blob
|
blame
|
history
diff --git
a/token.c
b/token.c
index
9d3bccd
..
38bedd6
100644
(file)
--- a/
token.c
+++ b/
token.c
@@
-221,6
+221,7
@@
recv_deflated_token(int f, char **data)
{
int n, r, flag;
static int init_done = 0;
{
int n, r, flag;
static int init_done = 0;
+ static int saved_flag = 0;
for (;;) {
switch (recv_state) {
for (;;) {
switch (recv_state) {
@@
-246,7
+247,11
@@
recv_deflated_token(int f, char **data)
case r_idle:
case r_inflated:
case r_idle:
case r_inflated:
- flag = read_byte(f);
+ if (saved_flag) {
+ flag = saved_flag & 0xff;
+ saved_flag = 0;
+ } else
+ flag = read_byte(f);
if ((flag & 0xC0) == DEFLATED_DATA) {
n = ((flag & 0x3f) << 8) + read_byte(f);
read_buf(f, cbuf, n);
if ((flag & 0xC0) == DEFLATED_DATA) {
n = ((flag & 0x3f) << 8) + read_byte(f);
read_buf(f, cbuf, n);
@@
-262,11
+267,20
@@
recv_deflated_token(int f, char **data)
rx_strm.avail_out = CHUNK_SIZE;
r = inflate(&rx_strm, Z_PACKET_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
rx_strm.avail_out = CHUNK_SIZE;
r = inflate(&rx_strm, Z_PACKET_FLUSH);
n = CHUNK_SIZE - rx_strm.avail_out;
- if (r != Z_OK
|| n != 0
) {
+ if (r != Z_OK) {
fprintf(FERROR, "inflate flush returned %d (%d bytes)\n",
r, n);
exit_cleanup(1);
}
fprintf(FERROR, "inflate flush returned %d (%d bytes)\n",
r, n);
exit_cleanup(1);
}
+ if (n != 0) {
+ /* have to return some more data and
+ save the flag for later. */
+ saved_flag = flag + 0x10000;
+ if (rx_strm.avail_out != 0)
+ recv_state = r_idle;
+ *data = dbuf;
+ return n;
+ }
recv_state = r_idle;
}
if (flag == END_FLAG) {
recv_state = r_idle;
}
if (flag == END_FLAG) {
@@
-297,7
+311,7
@@
recv_deflated_token(int f, char **data)
fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
exit_cleanup(1);
}
fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
exit_cleanup(1);
}
- if (rx_strm.avail_
out !
= 0)
+ if (rx_strm.avail_
in =
= 0)
recv_state = r_inflated;
if (n != 0) {
*data = dbuf;
recv_state = r_inflated;
if (n != 0) {
*data = dbuf;