Attachment 732222 Details for Bug 1046197

[patch] zlib-rsync.patch

zlib-rsync.patch (text/plain), 2.82 KB, created by Tomáš Chvátal on 2017-07-13 08:35:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomáš Chvátal

Created: 2017-07-13 08:35:38 UTC

Size: 2.82 KB

patch

obsolete

>diff -urN zlib-1.2.8/deflate.c zlib/deflate.c
>--- zlib-1.2.8/deflate.c	2013-04-29 00:57:10.000000000 +0200
>+++ zlib/deflate.c	2017-07-13 10:10:24.937232327 +0200
>@@ -51,6 +51,8 @@
> 
> #include "deflate.h"
> 
>+#define read_buf dread_buf
>+
> const char deflate_copyright[] =
>    " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
> /*
>@@ -670,7 +672,7 @@
>     deflate_state *s;
> 
>     if (strm == Z_NULL || strm->state == Z_NULL ||
>-        flush > Z_BLOCK || flush < 0) {
>+        (flush > Z_BLOCK && flush != Z_INSERT_ONLY) || flush < 0) {
>         return Z_STREAM_ERROR;
>     }
>     s = strm->state;
>@@ -1593,6 +1595,11 @@
>         s->strstart += s->lookahead;
>         s->lookahead = 0;
> 
>+	if (flush == Z_INSERT_ONLY) {
>+	    s->block_start = s->strstart;
>+	    continue;
>+	}
>+
>         /* Emit a stored block if pending_buf will be full: */
>         max_start = s->block_start + max_block_size;
>         if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
>@@ -1609,6 +1616,10 @@
>         }
>     }
>     s->insert = 0;
>+    if (flush == Z_INSERT_ONLY) {
>+	s->block_start = s->strstart;
>+	return need_more;
>+    }
>     if (flush == Z_FINISH) {
>         FLUSH_BLOCK(s, 1);
>         return finish_done;
>@@ -1654,6 +1665,12 @@
>             INSERT_STRING(s, s->strstart, hash_head);
>         }
> 
>+	if (flush == Z_INSERT_ONLY) {
>+	    s->strstart++;
>+	    s->lookahead--;
>+	    continue;
>+	}
>+
>         /* Find the longest match, discarding those <= prev_length.
>          * At this point we have always match_length < MIN_MATCH
>          */
>@@ -1711,6 +1728,10 @@
>         }
>         if (bflush) FLUSH_BLOCK(s, 0);
>     }
>+    if (flush == Z_INSERT_ONLY) {
>+	s->block_start = s->strstart;
>+	return need_more;
>+    }
>     s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
>     if (flush == Z_FINISH) {
>         FLUSH_BLOCK(s, 1);
>@@ -1757,6 +1778,12 @@
>             INSERT_STRING(s, s->strstart, hash_head);
>         }
> 
>+	if (flush == Z_INSERT_ONLY) {
>+	    s->strstart++;
>+	    s->lookahead--;
>+	    continue;
>+	}
>+
>         /* Find the longest match, discarding those <= prev_length.
>          */
>         s->prev_length = s->match_length, s->prev_match = s->match_start;
>@@ -1836,6 +1863,10 @@
>             s->lookahead--;
>         }
>     }
>+    if (flush == Z_INSERT_ONLY) {
>+	s->block_start = s->strstart;
>+	return need_more;
>+    }
>     Assert (flush != Z_NO_FLUSH, "no flush?");
>     if (s->match_available) {
>         Tracevv((stderr,"%c", s->window[s->strstart-1]));
>diff -urN zlib-1.2.8/zlib.h zlib/zlib.h
>--- zlib-1.2.8/zlib.h	2013-04-29 02:23:49.000000000 +0200
>+++ zlib/zlib.h	2017-07-13 10:10:24.937232327 +0200
>@@ -169,6 +169,7 @@
> #define Z_BLOCK         5
> #define Z_TREES         6
> /* Allowed flush values; see deflate() and inflate() below for details */
>+#define Z_INSERT_ONLY	7
> 
> #define Z_OK            0
> #define Z_STREAM_END    1

Actions: View | Diff

Attachments on bug 1046197: 732218 | 732222 | 732226