for systems with a broken select use u_sleep() to ensure the write

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 35b980b..1aa107c 100644 (file)
--- a/token.c
+++ b/token.c
@@ -116,7 +116,7 @@ send_deflated_token(int f, int token,
            tx_strm.zalloc = z_alloc;
            tx_strm.zfree = z_free;
            if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8,
-                            -15, 8, Z_DEFAULT_STRATEGY, -4) != Z_OK) {
+                            -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
                fprintf(FERROR, "compression init failed\n");
                exit_cleanup(1);
            }
@@ -157,13 +157,13 @@ 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);
@@ -185,7 +185,7 @@ 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;
@@ -221,6 +221,7 @@ recv_deflated_token(int f, char **data)
 {
     int n, r, flag;
     static int init_done = 0;
+    static int saved_flag = 0;
 
     for (;;) {
        switch (recv_state) {
@@ -241,15 +242,20 @@ recv_deflated_token(int f, char **data)
                inflateReset(&rx_strm);
            }
            recv_state = r_idle;
+           rx_token = 0;
            break;
            
        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);
-               rx_strm.next_in = cbuf;
+               rx_strm.next_in = (Bytef *)cbuf;
                rx_strm.avail_in = n;
                recv_state = r_inflating;
                break;
@@ -257,15 +263,24 @@ 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 || n != 0) {
+               if (r != Z_OK) {
                    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) {
@@ -288,18 +303,21 @@ 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 || 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)
+           if (rx_strm.avail_in == 0)
                recv_state = r_inflated;
-           *data = dbuf;
-           return n;
+           if (n != 0) {
+               *data = dbuf;
+               return n;
+           }
+           break;
 
        case r_running:
            ++rx_token;
@@ -319,7 +337,7 @@ 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) {