Man page: Move the description of --info=progress2 to a better place.

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 838f8c9..75d2b17 100644 (file)
--- a/token.c
+++ b/token.c
@@ -192,6 +192,8 @@ void set_compression(const char *fname)
                return;
 
        while (1) {
+               if (isUpper(&ltr))
+                       ltr = toLower(&ltr);
                while (node->letter != ltr) {
                        if (node->letter > ltr)
                                return;
@@ -306,7 +308,7 @@ send_deflated_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
                                         Z_DEFLATED, -15, 8,
                                         Z_DEFAULT_STRATEGY) != Z_OK) {
                                rprintf(FERROR, "compression init failed\n");
-                               exit_cleanup(RERR_STREAMIO);
+                               exit_cleanup(RERR_PROTOCOL);
                        }
                        if ((obuf = new_array(char, OBUF_SIZE)) == NULL)
                                out_of_memory("send_deflated_token");
@@ -450,7 +452,7 @@ static int32 recv_deflated_token(int f, char **data)
                                rx_strm.zfree = NULL;
                                if (inflateInit2(&rx_strm, -15) != Z_OK) {
                                        rprintf(FERROR, "inflate init failed\n");
-                                       exit_cleanup(RERR_STREAMIO);
+                                       exit_cleanup(RERR_PROTOCOL);
                                }
                                if (!(cbuf = new_array(char, MAX_DATA_COUNT))
                                    || !(dbuf = new_array(char, AVAIL_OUT_SIZE(CHUNK_SIZE))))
@@ -598,7 +600,7 @@ static void see_deflate_token(char *buf, int32 len)
                rx_strm.next_out = (Bytef *)dbuf;
                rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
                r = inflate(&rx_strm, Z_SYNC_FLUSH);
-               if (r != Z_OK) {
+               if (r != Z_OK && r != Z_BUF_ERROR) {
                        rprintf(FERROR, "inflate (token) returned %d\n", r);
                        exit_cleanup(RERR_STREAMIO);
                }