Reverted new zlib code, since it causes major breakage in Windows.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2531 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

Changes.txt

@@ -39,8 +39,6 @@
     introduced in the last release.  The new functionality should be much
     more robust.
 
-  * Updated included ZLib library to latest stable version.
-
 -Have fun!
 
 

src/zlib/adler32.c

@@ -1,5 +1,5 @@
 /* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2007 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,9 +9,9 @@
 
 #define local static
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2);
 
-#define BASE 65521      /* largest prime smaller than 65536 */
+#define BASE 65521UL    /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 
@@ -21,44 +21,39 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 
-/* use NO_DIVIDE if your processor does not do division in hardware --
+/* use NO_DIVIDE if your processor does not do division in hardware */
-   try it both ways to see which is faster */
 #ifdef NO_DIVIDE
-/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
-   (thank you to John Reiser for pointing this out) */
-#  define CHOP(a) \
-    do { \
-        unsigned long tmp = a >> 16; \
-        a &= 0xffffUL; \
-        a += (tmp << 4) - tmp; \
-    } while (0)
-#  define MOD28(a) \
-    do { \
-        CHOP(a); \
-        if (a >= BASE) a -= BASE; \
-    } while (0)
 #  define MOD(a) \
     do { \
-        CHOP(a); \
+        if (a >= (BASE << 16)) a -= (BASE << 16); \
-        MOD28(a); \
+        if (a >= (BASE << 15)) a -= (BASE << 15); \
+        if (a >= (BASE << 14)) a -= (BASE << 14); \
+        if (a >= (BASE << 13)) a -= (BASE << 13); \
+        if (a >= (BASE << 12)) a -= (BASE << 12); \
+        if (a >= (BASE << 11)) a -= (BASE << 11); \
+        if (a >= (BASE << 10)) a -= (BASE << 10); \
+        if (a >= (BASE << 9)) a -= (BASE << 9); \
+        if (a >= (BASE << 8)) a -= (BASE << 8); \
+        if (a >= (BASE << 7)) a -= (BASE << 7); \
+        if (a >= (BASE << 6)) a -= (BASE << 6); \
+        if (a >= (BASE << 5)) a -= (BASE << 5); \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
+        if (a >= BASE) a -= BASE; \
     } while (0)
-#  define MOD63(a) \
+#  define MOD4(a) \
-    do { /* this assumes a is not negative */ \
+    do { \
-        z_off64_t tmp = a >> 32; \
+        if (a >= (BASE << 4)) a -= (BASE << 4); \
-        a &= 0xffffffffL; \
+        if (a >= (BASE << 3)) a -= (BASE << 3); \
-        a += (tmp << 8) - (tmp << 5) + tmp; \
+        if (a >= (BASE << 2)) a -= (BASE << 2); \
-        tmp = a >> 16; \
+        if (a >= (BASE << 1)) a -= (BASE << 1); \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
-        tmp = a >> 16; \
-        a &= 0xffffL; \
-        a += (tmp << 4) - tmp; \
         if (a >= BASE) a -= BASE; \
     } while (0)
 #else
 #  define MOD(a) a %= BASE
-#  define MOD28(a) a %= BASE
+#  define MOD4(a) a %= BASE
-#  define MOD63(a) a %= BASE
 #endif
 
 /* ========================================================================= */
@@ -97,7 +92,7 @@ uLong ZEXPORT adler32(
         }
         if (adler >= BASE)
             adler -= BASE;
-        MOD28(sum2);            /* only added so many BASE's */
+        MOD4(sum2);             /* only added so many BASE's */
         return adler | (sum2 << 16);
     }
 
@@ -142,13 +137,8 @@ local uLong adler32_combine_(
     unsigned long sum2;
     unsigned rem;
 
-    /* for negative len, return invalid adler32 as a clue for debugging */
-    if (len2 < 0)
-        return 0xffffffffUL;
-
     /* the derivation of this formula is left as an exercise for the reader */
-    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)(len2 % BASE);
-    rem = (unsigned)len2;
     sum1 = adler1 & 0xffff;
     sum2 = rem * sum1;
     MOD(sum2);

src/zlib/crc32.c

@@ -1,5 +1,5 @@
 /* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 1995-2006, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  *
  * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
@@ -17,8 +17,6 @@
   of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
   first call get_crc_table() to initialize the tables before allowing more than
   one thread to use crc32().
-
-  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
  */
 
 #ifdef MAKECRCH
@@ -32,11 +30,31 @@
 
 #define local static
 
-/* Definitions for doing the crc four data bytes at a time. */
+/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#if !defined(NOBYFOUR) && defined(Z_U4)
+#ifndef NOBYFOUR
+#  ifdef STDC           /* need ANSI C limits.h to determine sizes */
+#    include <limits.h>
 #    define BYFOUR
-#endif
+#    if (UINT_MAX == 0xffffffffUL)
+       typedef unsigned int u4;
+#    else
+#      if (ULONG_MAX == 0xffffffffUL)
+         typedef unsigned long u4;
+#      else
+#        if (USHRT_MAX == 0xffffffffUL)
+           typedef unsigned short u4;
+#        else
+#          undef BYFOUR     /* can't find a four-byte integer type! */
+#        endif
+#      endif
+#    endif
+#  endif /* STDC */
+#endif /* !NOBYFOUR */
+
+/* Definitions for doing the crc four data bytes at a time. */
 #ifdef BYFOUR
+#  define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
+                (((w)&0xff00)<<8)+(((w)&0xff)<<24))
    local unsigned long crc32_little OF((unsigned long,
                         const unsigned char FAR *, unsigned));
    local unsigned long crc32_big OF((unsigned long,
@@ -50,16 +68,16 @@
 local unsigned long gf2_matrix_times OF((unsigned long *mat,
                                          unsigned long vec));
 local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2);
 
 
 #ifdef DYNAMIC_CRC_TABLE
 
 local volatile int crc_table_empty = 1;
-local z_crc_t FAR crc_table[TBLS][256];
+local unsigned long FAR crc_table[TBLS][256];
 local void make_crc_table OF((void));
 #ifdef MAKECRCH
-   local void write_table OF((FILE *, const z_crc_t FAR *));
+   local void write_table OF((FILE *, const unsigned long FAR *));
 #endif /* MAKECRCH */
 /*
   Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
@@ -89,9 +107,9 @@ local void make_crc_table OF((void));
 */
 local void make_crc_table()
 {
-    z_crc_t c;
+    unsigned long c;
     int n, k;
-    z_crc_t poly;                       /* polynomial exclusive-or pattern */
+    unsigned long poly;                 /* polynomial exclusive-or pattern */
     /* terms of polynomial defining this crc (except x^32): */
     static volatile int first = 1;      /* flag to limit concurrent making */
     static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
@@ -103,13 +121,13 @@ local void make_crc_table()
         first = 0;
 
         /* make exclusive-or pattern from polynomial (0xedb88320UL) */
-        poly = 0;
+        poly = 0UL;
-        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+        for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)
-            poly |= (z_crc_t)1 << (31 - p[n]);
+            poly |= 1UL << (31 - p[n]);
 
         /* generate a crc for every 8-bit value */
         for (n = 0; n < 256; n++) {
-            c = (z_crc_t)n;
+            c = (unsigned long)n;
             for (k = 0; k < 8; k++)
                 c = c & 1 ? poly ^ (c >> 1) : c >> 1;
             crc_table[0][n] = c;
@@ -120,11 +138,11 @@ local void make_crc_table()
            and then the byte reversal of those as well as the first table */
         for (n = 0; n < 256; n++) {
             c = crc_table[0][n];
-            crc_table[4][n] = ZSWAP32(c);
+            crc_table[4][n] = REV(c);
             for (k = 1; k < 4; k++) {
                 c = crc_table[0][c & 0xff] ^ (c >> 8);
                 crc_table[k][n] = c;
-                crc_table[k + 4][n] = ZSWAP32(c);
+                crc_table[k + 4][n] = REV(c);
             }
         }
 #endif /* BYFOUR */
@@ -146,7 +164,7 @@ local void make_crc_table()
         if (out == NULL) return;
         fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
         fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
-        fprintf(out, "local const z_crc_t FAR ");
+        fprintf(out, "local const unsigned long FAR ");
         fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
         write_table(out, crc_table[0]);
 #  ifdef BYFOUR
@@ -166,13 +184,12 @@ local void make_crc_table()
 #ifdef MAKECRCH
 local void write_table(
     FILE *out,
-    const z_crc_t FAR *table)
+    const unsigned long FAR *table)
 {
     int n;
 
     for (n = 0; n < 256; n++)
-        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ", table[n],
-                (unsigned long)(table[n]),
                 n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
 }
 #endif /* MAKECRCH */
@@ -187,13 +204,13 @@ local void write_table(
 /* =========================================================================
  * This function can be used by asm versions of crc32()
  */
-const z_crc_t FAR * ZEXPORT get_crc_table()
+const unsigned long FAR * ZEXPORT get_crc_table()
 {
 #ifdef DYNAMIC_CRC_TABLE
     if (crc_table_empty)
         make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
-    return (const z_crc_t FAR *)crc_table;
+    return (const unsigned long FAR *)crc_table;
 }
 
 /* ========================================================================= */
@@ -215,7 +232,7 @@ unsigned long ZEXPORT crc32(
 
 #ifdef BYFOUR
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
-        z_crc_t endian;
+        u4 endian;
 
         endian = 1;
         if (*((unsigned char *)(&endian)))
@@ -249,17 +266,17 @@ local unsigned long crc32_little(
     const unsigned char FAR *buf,
     unsigned len)
 {
-    register z_crc_t c;
+    register u4 c;
-    register const z_crc_t FAR *buf4;
+    register const u4 FAR *buf4;
 
-    c = (z_crc_t)crc;
+    c = (u4)crc;
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
         len--;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
     while (len >= 32) {
         DOLIT32;
         len -= 32;
@@ -289,17 +306,17 @@ local unsigned long crc32_big(
     const unsigned char FAR *buf,
     unsigned len)
 {
-    register z_crc_t c;
+    register u4 c;
-    register const z_crc_t FAR *buf4;
+    register const u4 FAR *buf4;
 
-    c = ZSWAP32((z_crc_t)crc);
+    c = REV((u4)crc);
     c = ~c;
     while (len && ((ptrdiff_t)buf & 3)) {
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
         len--;
     }
 
-    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    buf4 = (const u4 FAR *)(const void FAR *)buf;
     buf4--;
     while (len >= 32) {
         DOBIG32;
@@ -316,7 +333,7 @@ local unsigned long crc32_big(
         c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
     } while (--len);
     c = ~c;
-    return (unsigned long)(ZSWAP32(c));
+    return (unsigned long)(REV(c));
 }
 
 #endif /* BYFOUR */

src/zlib/crc32.h

@@ -2,7 +2,7 @@
  * Generated automatically by crc32.c
  */
 
-local const z_crc_t FAR crc_table[TBLS][256] =
+local const unsigned long FAR crc_table[TBLS][256] =
 {
   {
     0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,

src/zlib/deflate.c

@@ -1,5 +1,5 @@
 /* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -37,7 +37,7 @@
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in http://tools.ietf.org/html/rfc1951
+ *      Available in http://www.ietf.org/rfc/rfc1951.txt
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
@@ -52,7 +52,7 @@
 #include "deflate.h"
 
 const char deflate_copyright[] =
-   " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+   " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -155,9 +155,6 @@ local const config configuration_table[10] = {
 struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
 #endif
 
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
-
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
@@ -237,19 +234,10 @@ int ZEXPORT deflateInit2_(
 
     strm->msg = Z_NULL;
     if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
-#endif
     }
-    if (strm->zfree == (free_func)0)
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
 
 #ifdef FASTEST
     if (level != 0) level = 1;
@@ -325,70 +313,43 @@ int ZEXPORT deflateSetDictionary (
     uInt  dictLength)
 {
     deflate_state *s;
-    uInt str, n;
+    uInt length = dictLength;
-    int wrap;
+    uInt n;
-    unsigned avail;
+    IPos hash_head = 0;
-    unsigned char *next;
 
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
+        strm->state->wrap == 2 ||
+        (strm->state->wrap == 1 && strm->state->status != INIT_STATE))
         return Z_STREAM_ERROR;
+
     s = strm->state;
-    wrap = s->wrap;
+    if (s->wrap)
-    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
-        return Z_STREAM_ERROR;
-
-    /* when using zlib wrappers, compute Adler-32 for provided dictionary */
-    if (wrap == 1)
         strm->adler = adler32(strm->adler, dictionary, dictLength);
-    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */
 
-    /* if dictionary would fill window, just replace the history */
+    if (length < MIN_MATCH) return Z_OK;
-    if (dictLength >= s->w_size) {
+    if (length > s->w_size) {
-        if (wrap == 0) {            /* already empty otherwise */
+        length = s->w_size;
-            CLEAR_HASH(s);
+        dictionary += dictLength - length; /* use the tail of the dictionary */
-            s->strstart = 0;
-            s->block_start = 0L;
-            s->insert = 0;
-        }
-        dictionary += dictLength - s->w_size;  /* use the tail */
-        dictLength = s->w_size;
     }
+    zmemcpy(s->window, dictionary, length);
+    s->strstart = length;
+    s->block_start = (long)length;
 
-    /* insert dictionary into window and hash */
+    /* Insert all strings in the hash table (except for the last two bytes).
-    avail = strm->avail_in;
+     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-    next = strm->next_in;
+     * call of fill_window.
-    strm->avail_in = dictLength;
+     */
-    strm->next_in = (Bytef *)dictionary;
+    s->ins_h = s->window[0];
-    fill_window(s);
+    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    while (s->lookahead >= MIN_MATCH) {
+    for (n = 0; n <= length - MIN_MATCH; n++) {
-        str = s->strstart;
+        INSERT_STRING(s, n, hash_head);
-        n = s->lookahead - (MIN_MATCH-1);
-        do {
-            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-            s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-            s->head[s->ins_h] = (Pos)str;
-            str++;
-        } while (--n);
-        s->strstart = str;
-        s->lookahead = MIN_MATCH-1;
-        fill_window(s);
     }
-    s->strstart += s->lookahead;
+    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    s->block_start = (long)s->strstart;
-    s->insert = s->lookahead;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    strm->next_in = next;
-    strm->avail_in = avail;
-    s->wrap = wrap;
     return Z_OK;
 }
 
 /* ========================================================================= */
-int ZEXPORT deflateResetKeep (
+int ZEXPORT deflateReset (
     z_streamp strm)
 {
     deflate_state *s;
@@ -418,22 +379,11 @@ int ZEXPORT deflateResetKeep (
     s->last_flush = Z_NO_FLUSH;
 
     _tr_init(s);
+    lm_init(s);
 
     return Z_OK;
 }
 
-/* ========================================================================= */
-int ZEXPORT deflateReset (
-    z_streamp strm)
-{
-    int ret;
-
-    ret = deflateResetKeep(strm);
-    if (ret == Z_OK)
-        lm_init(strm->state);
-    return ret;
-}
-
 /* ========================================================================= */
 int ZEXPORT deflateSetHeader (
     z_streamp strm,
@@ -445,43 +395,15 @@ int ZEXPORT deflateSetHeader (
     return Z_OK;
 }
 
-/* ========================================================================= */
-int ZEXPORT deflatePending (
-    z_streamp strm,
-    unsigned *pending,
-    int *bits)
-{
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    if (pending != Z_NULL)
-        *pending = strm->state->pending;
-    if (bits != Z_NULL)
-        *bits = strm->state->bi_valid;
-    return Z_OK;
-}
-
 /* ========================================================================= */
 int ZEXPORT deflatePrime (
     z_streamp strm,
     int bits,
     int value)
 {
-    deflate_state *s;
-    int put;
-
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
+    strm->state->bi_valid = bits;
-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+    strm->state->bi_buf = (ush)(value & ((1 << bits) - 1));
-        return Z_BUF_ERROR;
-    do {
-        put = Buf_size - s->bi_valid;
-        if (put > bits)
-            put = bits;
-        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
-        s->bi_valid += put;
-        _tr_flush_bits(s);
-        value >>= put;
-        bits -= put;
-    } while (bits);
     return Z_OK;
 }
 
@@ -639,22 +561,19 @@ local void putShortMSB (
 local void flush_pending(
     z_streamp strm)
 {
-    unsigned len;
+    unsigned len = strm->state->pending;
-    deflate_state *s = strm->state;
 
-    _tr_flush_bits(s);
-    len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
 
-    zmemcpy(strm->next_out, s->pending_out, len);
+    zmemcpy(strm->next_out, strm->state->pending_out, len);
     strm->next_out  += len;
-    s->pending_out  += len;
+    strm->state->pending_out  += len;
     strm->total_out += len;
     strm->avail_out  -= len;
-    s->pending -= len;
+    strm->state->pending -= len;
-    if (s->pending == 0) {
+    if (strm->state->pending == 0) {
-        s->pending_out = s->pending_buf;
+        strm->state->pending_out = strm->state->pending_buf;
     }
 }
 
@@ -881,7 +800,7 @@ int ZEXPORT deflate (
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUF_ERROR.
      */
-    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+    } else if (strm->avail_in == 0 && flush <= old_flush &&
                flush != Z_FINISH) {
         ERR_RETURN(strm, Z_BUF_ERROR);
     }
@@ -930,7 +849,6 @@ int ZEXPORT deflate (
                     if (s->lookahead == 0) {
                         s->strstart = 0;
                         s->block_start = 0L;
-                        s->insert = 0;
                     }
                 }
             }
@@ -1026,12 +944,12 @@ int ZEXPORT deflateCopy (
 
     ss = source->state;
 
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy(dest, source, sizeof(z_stream));
 
     ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
     if (ds == Z_NULL) return Z_MEM_ERROR;
     dest->state = (struct internal_state FAR *) ds;
-    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+    zmemcpy(ds, ss, sizeof(deflate_state));
     ds->strm = dest;
 
     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
@@ -1047,8 +965,8 @@ int ZEXPORT deflateCopy (
     }
     /* following zmemcpy do not work for 16-bit MSDOS */
     zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
 
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
@@ -1082,15 +1000,15 @@ local int read_buf(
 
     strm->avail_in  -= len;
 
-    zmemcpy(buf, strm->next_in, len);
     if (strm->state->wrap == 1) {
-        strm->adler = adler32(strm->adler, buf, len);
+        strm->adler = adler32(strm->adler, strm->next_in, len);
     }
 #ifdef GZIP
     else if (strm->state->wrap == 2) {
-        strm->adler = crc32(strm->adler, buf, len);
+        strm->adler = crc32(strm->adler, strm->next_in, len);
     }
 #endif
+    zmemcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
 
@@ -1117,7 +1035,6 @@ local void lm_init (
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
-    s->insert = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
@@ -1393,8 +1310,6 @@ local void fill_window(
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
 
-    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
 
@@ -1447,7 +1362,7 @@ local void fill_window(
 #endif
             more += wsize;
         }
-        if (s->strm->avail_in == 0) break;
+        if (s->strm->avail_in == 0) return;
 
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
@@ -1466,24 +1381,12 @@ local void fill_window(
         s->lookahead += n;
 
         /* Initialize the hash value now that we have some input: */
-        if (s->lookahead + s->insert >= MIN_MATCH) {
+        if (s->lookahead >= MIN_MATCH) {
-            uInt str = s->strstart - s->insert;
+            s->ins_h = s->window[s->strstart];
-            s->ins_h = s->window[str];
+            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
-            while (s->insert) {
-                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
-#ifndef FASTEST
-                s->prev[str & s->w_mask] = s->head[s->ins_h];
-#endif
-                s->head[s->ins_h] = (Pos)str;
-                str++;
-                s->insert--;
-                if (s->lookahead + s->insert < MIN_MATCH)
-                    break;
-            }
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
@@ -1524,9 +1427,6 @@ local void fill_window(
             s->high_water += init;
         }
     }
-
-    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
-           "not enough room for search");
 }
 
 /* ===========================================================================
@@ -1606,14 +1506,8 @@ local block_state deflate_stored(
             FLUSH_BLOCK(s, 0);
         }
     }
-    s->insert = 0;
+    FLUSH_BLOCK(s, flush == Z_FINISH);
-    if (flush == Z_FINISH) {
+    return flush == Z_FINISH ? finish_done : block_done;
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if ((long)s->strstart > s->block_start)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
 }
 
 /* ===========================================================================
@@ -1709,14 +1603,8 @@ local block_state deflate_fast(
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    FLUSH_BLOCK(s, flush == Z_FINISH);
-    if (flush == Z_FINISH) {
+    return flush == Z_FINISH ? finish_done : block_done;
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
 }
 
 #ifndef FASTEST
@@ -1840,14 +1728,8 @@ local block_state deflate_slow(
         _tr_tally_lit(s, s->window[s->strstart-1], bflush);
         s->match_available = 0;
     }
-    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+    FLUSH_BLOCK(s, flush == Z_FINISH);
-    if (flush == Z_FINISH) {
+    return flush == Z_FINISH ? finish_done : block_done;
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
 }
 #endif /* FASTEST */
 
@@ -1867,11 +1749,11 @@ local block_state deflate_rle(
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
-         * for the longest run, plus one for the unrolled loop.
+         * for the longest encodable run.
          */
-        if (s->lookahead <= MAX_MATCH) {
+        if (s->lookahead < MAX_MATCH) {
             fill_window(s);
-            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+            if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) {
                 return need_more;
             }
             if (s->lookahead == 0) break; /* flush the current block */
@@ -1894,7 +1776,6 @@ local block_state deflate_rle(
                 if (s->match_length > s->lookahead)
                     s->match_length = s->lookahead;
             }
-            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
         }
 
         /* Emit match if have run of MIN_MATCH or longer, else emit literal */
@@ -1915,14 +1796,8 @@ local block_state deflate_rle(
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    s->insert = 0;
+    FLUSH_BLOCK(s, flush == Z_FINISH);
-    if (flush == Z_FINISH) {
+    return flush == Z_FINISH ? finish_done : block_done;
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
 }
 
 /* ===========================================================================
@@ -1954,12 +1829,6 @@ local block_state deflate_huff(
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
     }
-    s->insert = 0;
+    FLUSH_BLOCK(s, flush == Z_FINISH);
-    if (flush == Z_FINISH) {
+    return flush == Z_FINISH ? finish_done : block_done;
-        FLUSH_BLOCK(s, 1);
-        return finish_done;
-    }
-    if (s->last_lit)
-        FLUSH_BLOCK(s, 0);
-    return block_done;
 }

src/zlib/deflate.h

@@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -48,9 +48,6 @@
 #define MAX_BITS 15
 /* All codes must not exceed MAX_BITS bits */
 
-#define Buf_size 16
-/* size of bit buffer in bi_buf */
-
 #define INIT_STATE    42
 #define EXTRA_STATE   69
 #define NAME_STATE    73
@@ -191,7 +188,7 @@ typedef struct internal_state {
     int nice_match; /* Stop searching when current match exceeds this */
 
                 /* used by trees.c: */
-    /* Didn't use ct_data typedef below to suppress compiler warning */
+    /* Didn't use ct_data typedef below to supress compiler warning */
     struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
     struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
     struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
@@ -247,7 +244,7 @@ typedef struct internal_state {
     ulg opt_len;        /* bit length of current block with optimal trees */
     ulg static_len;     /* bit length of current block with static trees */
     uInt matches;       /* number of string matches in current block */
-    uInt insert;        /* bytes at end of window left to insert */
+    int last_eob_len;   /* bit length of EOB code for last block */
 
 #ifdef DEBUG
     ulg compressed_len; /* total bit length of compressed file mod 2^32 */
@@ -297,7 +294,6 @@ void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
 int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
 void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));
-void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
 void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
                         ulg stored_len, int last));

src/zlib/gzguts.h

@@ -1,5 +1,5 @@
 /* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -12,7 +12,7 @@
 #  endif
 #endif
 
-#ifdef HAVE_HIDDEN
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -27,65 +27,13 @@
 #endif
 #include <fcntl.h>
 
-#ifdef _WIN32
-#  include <stddef.h>
-#endif
-
-#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
-#  include <io.h>
-#endif
-
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS
 #endif
 
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#ifdef _MSC_VER
-#  ifndef HAVE_VSNPRINTF
+#  include <io.h>
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(__CYGWIN__)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
-#  ifndef HAVE_VSNPRINTF
-#    define HAVE_VSNPRINTF
-#  endif
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#  ifdef MSDOS
-/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
- but for now we just assume it doesn't. */
-#    define NO_vsnprintf
-#  endif
-#  ifdef __TURBOC__
-#    define NO_vsnprintf
-#  endif
-#  ifdef WIN32
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
-#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
 #  define vsnprintf _vsnprintf
-#      endif
-#    endif
-#  endif
-#  ifdef __SASC
-#    define NO_vsnprintf
-#  endif
-#  ifdef VMS
-#    define NO_vsnprintf
-#  endif
-#  ifdef __OS400__
-#    define NO_vsnprintf
-#  endif
-#  ifdef __MVS__
-#    define NO_vsnprintf
-#  endif
 #endif
 
 #ifndef local
@@ -104,7 +52,7 @@
 #  include <windows.h>
 #  define zstrerror() gz_strwinerror((DWORD)GetLastError())
 #else
-#  ifndef NO_STRERROR
+#  ifdef STDC
 #    include <errno.h>
 #    define zstrerror() strerror(errno)
 #  else
@@ -120,13 +68,6 @@
     ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
 #endif
 
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-
 /* default i/o buffer size -- double this for output when reading */
 #define GZBUFSIZE 8192
 
@@ -143,25 +84,23 @@
 
 /* internal gzip file state data structure */
 typedef struct {
-        /* exposed contents for gzgetc() macro */
-    struct gzFile_s x;      /* "x" for exposed */
-                            /* x.have: number of bytes available at x.next */
-                            /* x.next: next output data to deliver or write */
-                            /* x.pos: current position in uncompressed data */
         /* used for both reading and writing */
     int mode;               /* see gzip modes above */
     int fd;                 /* file descriptor */
     char *path;             /* path or fd for error messages */
+    z_off64_t pos;          /* current position in uncompressed data */
     unsigned size;          /* buffer size, zero if not allocated yet */
     unsigned want;          /* requested buffer size, default is GZBUFSIZE */
     unsigned char *in;      /* input buffer */
     unsigned char *out;     /* output buffer (double-sized when reading) */
-    int direct;             /* 0 if processing gzip, 1 if transparent */
+    unsigned char *next;    /* next output data to deliver or write */
         /* just for reading */
-    int how;                /* 0: get header, 1: copy, 2: decompress */
+    unsigned have;          /* amount of output data unused at next */
-    z_off64_t start;        /* where the gzip data started, for rewinding */
     int eof;                /* true if end of input file reached */
-    int past;               /* true if read requested past end */
+    z_off64_t start;        /* where the gzip data started, for rewinding */
+    z_off64_t raw;          /* where the raw data started, for seeking */
+    int how;                /* 0: get header, 1: copy, 2: decompress */
+    int direct;             /* true if last read direct, false if gzip */
         /* just for writing */
     int level;              /* compression level */
     int strategy;           /* compression strategy */

src/zlib/gzlib.c

@@ -1,23 +1,19 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 #include "gzguts.h"
 
-#if defined(_WIN32) && !defined(__BORLANDC__)
-#  define LSEEK _lseeki64
-#else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define LSEEK lseek64
 #else
 #  define LSEEK lseek
 #endif
-#endif
 
 /* Local functions */
 local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const void *, int, const char *));
+local gzFile gz_open OF((const char *, int, const char *));
 
 #if defined UNDER_CE
 
@@ -75,40 +71,28 @@ char ZLIB_INTERNAL *gz_strwinerror (
 local void gz_reset(
     gz_statep state)
 {
-    state->x.have = 0;              /* no output data available */
     if (state->mode == GZ_READ) {   /* for reading ... */
+        state->have = 0;            /* no output data available */
         state->eof = 0;             /* not at end of file */
-        state->past = 0;            /* have not read past end yet */
         state->how = LOOK;          /* look for gzip header */
+        state->direct = 1;          /* default for empty file */
     }
     state->seek = 0;                /* no seek request pending */
     gz_error(state, Z_OK, NULL);    /* clear error */
-    state->x.pos = 0;               /* no uncompressed data yet */
+    state->pos = 0;                 /* no uncompressed data yet */
     state->strm.avail_in = 0;       /* no input data yet */
 }
 
 /* Open a gzip file either by name or file descriptor. */
 local gzFile gz_open(
-    const void *path,
+    const char *path,
     int fd,
     const char *mode)
 {
     gz_statep state;
-    size_t len;
-    int oflag;
-#ifdef O_CLOEXEC
-    int cloexec = 0;
-#endif
-#ifdef O_EXCL
-    int exclusive = 0;
-#endif
-
-    /* check input */
-    if (path == NULL)
-        return NULL;
 
     /* allocate gzFile structure to return */
-    state = (gz_statep)malloc(sizeof(gz_state));
+    state = (gz_statep) malloc(sizeof(gz_state));
     if (state == NULL)
         return NULL;
     state->size = 0;            /* no buffers allocated yet */
@@ -119,7 +103,6 @@ local gzFile gz_open(
     state->mode = GZ_NONE;
     state->level = Z_DEFAULT_COMPRESSION;
     state->strategy = Z_DEFAULT_STRATEGY;
-    state->direct = 0;
     while (*mode) {
         if (*mode >= '0' && *mode <= '9')
             state->level = *mode - '0';
@@ -141,16 +124,6 @@ local gzFile gz_open(
                 return NULL;
             case 'b':       /* ignore -- will request binary anyway */
                 break;
-#ifdef O_CLOEXEC
-            case 'e':
-                cloexec = 1;
-                break;
-#endif
-#ifdef O_EXCL
-            case 'x':
-                exclusive = 1;
-                break;
-#endif
             case 'f':
                 state->strategy = Z_FILTERED;
                 break;
@@ -162,8 +135,6 @@ local gzFile gz_open(
                 break;
             case 'F':
                 state->strategy = Z_FIXED;
-            case 'T':
-                state->direct = 1;
             default:        /* could consider as an error, but just ignore */
                 ;
             }
@@ -176,67 +147,30 @@ local gzFile gz_open(
         return NULL;
     }
 
-    /* can't force transparent read */
-    if (state->mode == GZ_READ) {
-        if (state->direct) {
-            free(state);
-            return NULL;
-        }
-        state->direct = 1;      /* for empty file */
-    }
-
     /* save the path name for error messages */
-#ifdef _WIN32
+    state->path = (char*) malloc(strlen(path) + 1);
-    if (fd == -2) {
-        len = wcstombs(NULL, path, 0);
-        if (len == (size_t)-1)
-            len = 0;
-    }
-    else
-#endif
-        len = strlen((const char *)path);
-    state->path = (char *)malloc(len + 1);
     if (state->path == NULL) {
         free(state);
         return NULL;
     }
-#ifdef _WIN32
+    strcpy(state->path, path);
-    if (fd == -2)
-        if (len)
-            wcstombs(state->path, path, len + 1);
-        else
-            *(state->path) = 0;
-    else
-#endif
-        strcpy((char *)state->path, (const char *)path);
 
-    /* compute the flags for open() */
+    /* open the file with the appropriate mode (or just use fd) */
-    oflag =
+    state->fd = fd != -1 ? fd :
+        open(path,
 #ifdef O_LARGEFILE
             O_LARGEFILE |
 #endif
 #ifdef O_BINARY
             O_BINARY |
-#endif
-#ifdef O_CLOEXEC
-        (cloexec ? O_CLOEXEC : 0) |
 #endif
             (state->mode == GZ_READ ?
                 O_RDONLY :
-         (O_WRONLY | O_CREAT |
+                (O_WRONLY | O_CREAT | (
-#ifdef O_EXCL
+                    state->mode == GZ_WRITE ?
-          (exclusive ? O_EXCL : 0) |
-#endif
-          (state->mode == GZ_WRITE ?
                         O_TRUNC :
-           O_APPEND)));
+                        O_APPEND))),
-
+            0666);
-    /* open the file with the appropriate flags (or just use fd) */
-    state->fd = fd > -1 ? fd : (
-#ifdef _WIN32
-        fd == -2 ? _wopen(path, oflag, 0666) :
-#endif
-        open((const char *)path, oflag, 0666));
     if (state->fd == -1) {
         free(state->path);
         free(state);
@@ -282,7 +216,7 @@ gzFile ZEXPORT gzdopen(
     char *path;         /* identifier for error messages */
     gzFile gz;
 
-    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
+    if (fd == -1 || (path = (char*) malloc(7 + 3 * sizeof(int))) == NULL)
         return NULL;
     sprintf(path, "<fd:%d>", fd);   /* for debugging */
     gz = gz_open(path, fd, mode);
@@ -290,16 +224,6 @@ gzFile ZEXPORT gzdopen(
     return gz;
 }
 
-/* -- see zlib.h -- */
-#ifdef _WIN32
-gzFile ZEXPORT gzopen_w(
-    const wchar_t *path,
-    const char *mode)
-{
-    return gz_open(path, -2, mode);
-}
-#endif
-
 /* -- see zlib.h -- */
 int ZEXPORT gzbuffer(
     gzFile file,
@@ -319,8 +243,8 @@ int ZEXPORT gzbuffer(
         return -1;
 
     /* check and set requested size */
-    if (size < 2)
+    if (size == 0)
-        size = 2;               /* need two bytes to check magic header */
+        return -1;
     state->want = size;
     return 0;
 }
@@ -337,8 +261,7 @@ int ZEXPORT gzrewind(
     state = (gz_statep)file;
 
     /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
+    if (state->mode != GZ_READ || state->err != Z_OK)
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* back up and start over */
@@ -366,7 +289,7 @@ z_off64_t ZEXPORT gzseek64(
         return -1;
 
     /* check that there's no error */
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+    if (state->err != Z_OK)
         return -1;
 
     /* can only seek from start or relative to current position */
@@ -375,32 +298,31 @@ z_off64_t ZEXPORT gzseek64(
 
     /* normalize offset to a SEEK_CUR specification */
     if (whence == SEEK_SET)
-        offset -= state->x.pos;
+        offset -= state->pos;
     else if (state->seek)
         offset += state->skip;
     state->seek = 0;
 
     /* if within raw area while reading, just go there */
     if (state->mode == GZ_READ && state->how == COPY &&
-            state->x.pos + offset >= 0) {
+        state->pos + offset >= state->raw) {
-        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+        ret = LSEEK(state->fd, offset - state->have, SEEK_CUR);
         if (ret == -1)
             return -1;
-        state->x.have = 0;
+        state->have = 0;
         state->eof = 0;
-        state->past = 0;
         state->seek = 0;
         gz_error(state, Z_OK, NULL);
         state->strm.avail_in = 0;
-        state->x.pos += offset;
+        state->pos += offset;
-        return state->x.pos;
+        return state->pos;
     }
 
     /* calculate skip amount, rewinding if needed for back seek when reading */
     if (offset < 0) {
         if (state->mode != GZ_READ)         /* writing -- can't go backwards */
             return -1;
-        offset += state->x.pos;
+        offset += state->pos;
         if (offset < 0)                     /* before start of file! */
             return -1;
         if (gzrewind(file) == -1)           /* rewind, then skip to offset */
@@ -409,11 +331,11 @@ z_off64_t ZEXPORT gzseek64(
 
     /* if reading, skip what's in output buffer (one less gzgetc() check) */
     if (state->mode == GZ_READ) {
-        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+        n = GT_OFF(state->have) || (z_off64_t)state->have > offset ?
-            (unsigned)offset : state->x.have;
+            (unsigned)offset : state->have;
-        state->x.have -= n;
+        state->have -= n;
-        state->x.next += n;
+        state->next += n;
-        state->x.pos += n;
+        state->pos += n;
         offset -= n;
     }
 
@@ -422,7 +344,7 @@ z_off64_t ZEXPORT gzseek64(
         state->seek = 1;
         state->skip = offset;
     }
-    return state->x.pos + offset;
+    return state->pos + offset;
 }
 
 /* -- see zlib.h -- */
@@ -451,7 +373,7 @@ z_off64_t ZEXPORT gztell64(
         return -1;
 
     /* return position */
-    return state->x.pos + (state->seek ? state->skip : 0);
+    return state->pos + (state->seek ? state->skip : 0);
 }
 
 /* -- see zlib.h -- */
@@ -511,7 +433,8 @@ int ZEXPORT gzeof(
         return 0;
 
     /* return end-of-file state */
-    return state->mode == GZ_READ ? state->past : 0;
+    return state->mode == GZ_READ ?
+        (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0;
 }
 
 /* -- see zlib.h -- */
@@ -548,10 +471,8 @@ void ZEXPORT gzclearerr(
         return;
 
     /* clear error and end-of-file */
-    if (state->mode == GZ_READ) {
+    if (state->mode == GZ_READ)
         state->eof = 0;
-        state->past = 0;
-    }
     gz_error(state, Z_OK, NULL);
 }
 
@@ -573,10 +494,6 @@ void ZLIB_INTERNAL gz_error(
         state->msg = NULL;
     }
 
-    /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
-    if (err != Z_OK && err != Z_BUF_ERROR)
-        state->x.have = 0;
-
     /* set error code, and if no message, then done */
     state->err = err;
     if (msg == NULL)
@@ -589,7 +506,7 @@ void ZLIB_INTERNAL gz_error(
     }
 
     /* construct error message with path */
-    if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+    if ((state->msg = (char*) malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
         state->err = Z_MEM_ERROR;
         state->msg = (char *)"out of memory";
         return;

src/zlib/gzread.c

@@ -1,5 +1,5 @@
 /* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,9 +8,10 @@
 /* Local functions */
 local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
 local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
+local int gz_next4 OF((gz_statep, unsigned long *));
+local int gz_head OF((gz_statep));
 local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
+local int gz_make OF((gz_statep));
 local int gz_skip OF((gz_statep, z_off64_t));
 
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
@@ -45,53 +46,73 @@ local int gz_load(
    error, 0 otherwise.  Note that the eof flag is set when the end of the input
    file is reached, even though there may be unused data in the buffer.  Once
    that data has been used, no more attempts will be made to read the file.
-   If strm->avail_in != 0, then the current data is moved to the beginning of
+   gz_avail() assumes that strm->avail_in == 0. */
-   the input buffer, and then the remainder of the buffer is loaded with the
-   available data from the input file. */
 local int gz_avail(
     gz_statep state)
 {
-    unsigned got;
     z_streamp strm = &(state->strm);
 
-    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+    if (state->err != Z_OK)
         return -1;
     if (state->eof == 0) {
-        if (strm->avail_in) {       /* copy what's there to the start */
+        if (gz_load(state, state->in, state->size,
-            unsigned char *p = state->in, *q = strm->next_in;
+                (unsigned *)&(strm->avail_in)) == -1)
-            unsigned n = strm->avail_in;
-            do {
-                *p++ = *q++;
-            } while (--n);
-        }
-        if (gz_load(state, state->in + strm->avail_in,
-                    state->size - strm->avail_in, &got) == -1)
             return -1;
-        strm->avail_in += got;
         strm->next_in = state->in;
     }
     return 0;
 }
 
-/* Look for gzip header, set up for inflate or copy.  state->x.have must be 0.
+/* Get next byte from input, or -1 if end or error. */
+#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \
+                (strm->avail_in == 0 ? -1 : \
+                 (strm->avail_in--, *(strm->next_in)++)))
+
+/* Get a four-byte little-endian integer and return 0 on success and the value
+   in *ret.  Otherwise -1 is returned and *ret is not modified. */
+local int gz_next4(
+    gz_statep state,
+    unsigned long *ret)
+{
+    int ch;
+    unsigned long val;
+    z_streamp strm = &(state->strm);
+
+    val = NEXT();
+    val += (unsigned)NEXT() << 8;
+    val += (unsigned long)NEXT() << 16;
+    ch = NEXT();
+    if (ch == -1)
+        return -1;
+    val += (unsigned long)ch << 24;
+    *ret = val;
+    return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy.  state->have must be zero.
    If this is the first time in, allocate required memory.  state->how will be
    left unchanged if there is no more input data available, will be set to COPY
    if there is no gzip header and direct copying will be performed, or it will
-   be set to GZIP for decompression.  If direct copying, then leftover input
+   be set to GZIP for decompression, and the gzip header will be skipped so
-   data from the input buffer will be copied to the output buffer.  In that
+   that the next available input data is the raw deflate stream.  If direct
-   case, all further file reads will be directly to either the output buffer or
+   copying, then leftover input data from the input buffer will be copied to
-   a user buffer.  If decompressing, the inflate state will be initialized.
+   the output buffer.  In that case, all further file reads will be directly to
-   gz_look() will return 0 on success or -1 on failure. */
+   either the output buffer or a user buffer.  If decompressing, the inflate
-local int gz_look(
+   state and the check value will be initialized.  gz_head() will return 0 on
+   success or -1 on failure.  Failures may include read errors or gzip header
+   errors.  */
+local int gz_head(
     gz_statep state)
 {
     z_streamp strm = &(state->strm);
+    int flags;
+    unsigned len;
 
     /* allocate read buffers and inflate memory */
     if (state->size == 0) {
         /* allocate buffers */
-        state->in = (unsigned char *)malloc(state->want);
+        state->in = (unsigned char*) malloc(state->want);
-        state->out = (unsigned char *)malloc(state->want << 1);
+        state->out = (unsigned char*) malloc(state->want << 1);
         if (state->in == NULL || state->out == NULL) {
             if (state->out != NULL)
                 free(state->out);
@@ -108,7 +129,7 @@ local int gz_look(
         state->strm.opaque = Z_NULL;
         state->strm.avail_in = 0;
         state->strm.next_in = Z_NULL;
-        if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) {    /* gunzip */
+        if (inflateInit2(&(state->strm), -15) != Z_OK) {    /* raw inflate */
             free(state->out);
             free(state->in);
             state->size = 0;
@@ -117,45 +138,83 @@ local int gz_look(
         }
     }
 
-    /* get at least the magic bytes in the input buffer */
+    /* get some data in the input buffer */
-    if (strm->avail_in < 2) {
+    if (strm->avail_in == 0) {
         if (gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0)
             return 0;
     }
 
-    /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+    /* look for the gzip magic header bytes 31 and 139 */
-       a logical dilemma here when considering the case of a partially written
+    if (strm->next_in[0] == 31) {
-       gzip file, to wit, if a single 31 byte is written, then we cannot tell
+        strm->avail_in--;
-       whether this is a single-byte file, or just a partially written gzip
+        strm->next_in++;
-       file -- for here we assume that if a gzip file is being written, then
+        if (strm->avail_in == 0 && gz_avail(state) == -1)
-       the header will be written in a single operation, so that reading a
+            return -1;
-       single byte is sufficient indication that it is not a gzip file) */
+        if (strm->avail_in && strm->next_in[0] == 139) {
-    if (strm->avail_in > 1 &&
+            /* we have a gzip header, woo hoo! */
-            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
+            strm->avail_in--;
+            strm->next_in++;
+
+            /* skip rest of header */
+            if (NEXT() != 8) {      /* compression method */
+                gz_error(state, Z_DATA_ERROR, "unknown compression method");
+                return -1;
+            }
+            flags = NEXT();
+            if (flags & 0xe0) {     /* reserved flag bits */
+                gz_error(state, Z_DATA_ERROR, "unknown header flags set");
+                return -1;
+            }
+            NEXT();                 /* modification time */
+            NEXT();
+            NEXT();
+            NEXT();
+            NEXT();                 /* extra flags */
+            NEXT();                 /* operating system */
+            if (flags & 4) {        /* extra field */
+                len = (unsigned)NEXT();
+                len += (unsigned)NEXT() << 8;
+                while (len--)
+                    if (NEXT() < 0)
+                        break;
+            }
+            if (flags & 8)          /* file name */
+                while (NEXT() > 0)
+                    ;
+            if (flags & 16)         /* comment */
+                while (NEXT() > 0)
+                    ;
+            if (flags & 2) {        /* header crc */
+                NEXT();
+                NEXT();
+            }
+            /* an unexpected end of file is not checked for here -- it will be
+               noticed on the first request for uncompressed data */
+
+            /* set up for decompression */
             inflateReset(strm);
+            strm->adler = crc32(0L, Z_NULL, 0);
             state->how = GZIP;
             state->direct = 0;
             return 0;
         }
-
+        else {
-    /* no gzip header -- if we were decoding gzip before, then this is trailing
+            /* not a gzip file -- save first byte (31) and fall to raw i/o */
-       garbage.  Ignore the trailing garbage and finish. */
+            state->out[0] = 31;
-    if (state->direct == 0) {
+            state->have = 1;
-        strm->avail_in = 0;
+        }
-        state->eof = 1;
-        state->x.have = 0;
-        return 0;
     }
 
-    /* doing raw i/o, copy any leftover input to output -- this assumes that
+    /* doing raw i/o, save start of raw data for seeking, copy any leftover
-       the output buffer is larger than the input buffer, which also assures
+       input to output -- this assumes that the output buffer is larger than
-       space for gzungetc() */
+       the input buffer, which also assures space for gzungetc() */
-    state->x.next = state->out;
+    state->raw = state->pos;
+    state->next = state->out;
     if (strm->avail_in) {
-        memcpy(state->x.next, strm->next_in, strm->avail_in);
+        memcpy(state->next + state->have, strm->next_in, strm->avail_in);
-        state->x.have = strm->avail_in;
+        state->have += strm->avail_in;
         strm->avail_in = 0;
     }
     state->how = COPY;
@@ -164,15 +223,19 @@ local int gz_look(
 }
 
 /* Decompress from input to the provided next_out and avail_out in the state.
-   On return, state->x.have and state->x.next point to the just decompressed
+   If the end of the compressed data is reached, then verify the gzip trailer
-   data.  If the gzip stream completes, state->how is reset to LOOK to look for
+   check value and length (modulo 2^32).  state->have and state->next are set
-   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
+   to point to the just decompressed data, and the crc is updated.  If the
-   on success, -1 on failure. */
+   trailer is verified, state->how is reset to LOOK to look for the next gzip
+   stream or raw data, once state->have is depleted.  Returns 0 on success, -1
+   on failure.  Failures may include invalid compressed data or a failed gzip
+   trailer verification. */
 local int gz_decomp(
     gz_statep state)
 {
-    int ret = Z_OK;
+    int ret;
     unsigned had;
+    unsigned long crc, len;
     z_streamp strm = &(state->strm);
 
     /* fill output buffer up to end of deflate stream */
@@ -182,8 +245,8 @@ local int gz_decomp(
         if (strm->avail_in == 0 && gz_avail(state) == -1)
             return -1;
         if (strm->avail_in == 0) {
-            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
-            break;
+            return -1;
         }
 
         /* decompress and handle errors */
@@ -204,50 +267,62 @@ local int gz_decomp(
         }
     } while (strm->avail_out && ret != Z_STREAM_END);
 
-    /* update available output */
+    /* update available output and crc check value */
-    state->x.have = had - strm->avail_out;
+    state->have = had - strm->avail_out;
-    state->x.next = strm->next_out - state->x.have;
+    state->next = strm->next_out - state->have;
+    strm->adler = crc32(strm->adler, state->next, state->have);
 
-    /* if the gzip stream completed successfully, look for another */
+    /* check gzip trailer if at end of deflate stream */
-    if (ret == Z_STREAM_END)
+    if (ret == Z_STREAM_END) {
-        state->how = LOOK;
+        if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {
+            gz_error(state, Z_DATA_ERROR, "unexpected end of file");
+            return -1;
+        }
+        if (crc != strm->adler) {
+            gz_error(state, Z_DATA_ERROR, "incorrect data check");
+            return -1;
+        }
+        if (len != (strm->total_out & 0xffffffffL)) {
+            gz_error(state, Z_DATA_ERROR, "incorrect length check");
+            return -1;
+        }
+        state->how = LOOK;      /* ready for next stream, once have is 0 (leave
+                                   state->direct unchanged to remember how) */
+    }
 
     /* good decompression */
     return 0;
 }
 
-/* Fetch data and put it in the output buffer.  Assumes state->x.have is 0.
+/* Make data and put in the output buffer.  Assumes that state->have == 0.
    Data is either copied from the input file or decompressed from the input
    file depending on state->how.  If state->how is LOOK, then a gzip header is
-   looked for to determine whether to copy or decompress.  Returns -1 on error,
+   looked for (and skipped if found) to determine wither to copy or decompress.
-   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
+   Returns -1 on error, otherwise 0.  gz_make() will leave state->have as COPY
-   end of the input file has been reached and all data has been processed.  */
+   or GZIP unless the end of the input file has been reached and all data has
-local int gz_fetch(
+   been processed.  */
+local int gz_make(
     gz_statep state)
 {
     z_streamp strm = &(state->strm);
 
-    do {
+    if (state->how == LOOK) {           /* look for gzip header */
-        switch(state->how) {
+        if (gz_head(state) == -1)
-        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
-            if (gz_look(state) == -1)
             return -1;
-            if (state->how == LOOK)
+        if (state->have)                /* got some data from gz_head() */
             return 0;
-            break;
+    }
-        case COPY:      /* -> COPY */
+    if (state->how == COPY) {           /* straight copy */
-            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+        if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1)
-                    == -1)
             return -1;
-            state->x.next = state->out;
+        state->next = state->out;
-            return 0;
+    }
-        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
+    else if (state->how == GZIP) {      /* decompress */
         strm->avail_out = state->size << 1;
         strm->next_out = state->out;
         if (gz_decomp(state) == -1)
             return -1;
     }
-    } while (state->x.have == 0 && (!state->eof || strm->avail_in));
     return 0;
 }
 
@@ -261,12 +336,12 @@ local int gz_skip(
     /* skip over len bytes or reach end-of-file, whichever comes first */
     while (len)
         /* skip over whatever is in output buffer */
-        if (state->x.have) {
+        if (state->have) {
-            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+            n = GT_OFF(state->have) || (z_off64_t)state->have > len ?
-                (unsigned)len : state->x.have;
+                (unsigned)len : state->have;
-            state->x.have -= n;
+            state->have -= n;
-            state->x.next += n;
+            state->next += n;
-            state->x.pos += n;
+            state->pos += n;
             len -= n;
         }
 
@@ -277,7 +352,7 @@ local int gz_skip(
         /* need more data to skip -- load up output buffer */
         else {
             /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
+            if (gz_make(state) == -1)
                 return -1;
         }
     return 0;
@@ -299,15 +374,14 @@ int ZEXPORT gzread(
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that we're reading and that there's no (serious) error */
+    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
+    if (state->mode != GZ_READ || state->err != Z_OK)
-            (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
         return -1;
     }
 
@@ -326,51 +400,49 @@ int ZEXPORT gzread(
     got = 0;
     do {
         /* first just try copying data from the output buffer */
-        if (state->x.have) {
+        if (state->have) {
-            n = state->x.have > len ? len : state->x.have;
+            n = state->have > len ? len : state->have;
-            memcpy(buf, state->x.next, n);
+            memcpy(buf, state->next, n);
-            state->x.next += n;
+            state->next += n;
-            state->x.have -= n;
+            state->have -= n;
         }
 
         /* output buffer empty -- return if we're at the end of the input */
-        else if (state->eof && strm->avail_in == 0) {
+        else if (state->eof && strm->avail_in == 0)
-            state->past = 1;        /* tried to read past end */
             break;
-        }
 
         /* need output data -- for small len or new stream load up our output
            buffer */
         else if (state->how == LOOK || len < (state->size << 1)) {
             /* get more output, looking for header if required */
-            if (gz_fetch(state) == -1)
+            if (gz_make(state) == -1)
                 return -1;
-            continue;       /* no progress yet -- go back to copy above */
+            continue;       /* no progress yet -- go back to memcpy() above */
             /* the copy above assures that we will leave with space in the
                output buffer, allowing at least one gzungetc() to succeed */
         }
 
         /* large len -- read directly into user buffer */
         else if (state->how == COPY) {      /* read directly */
-            if (gz_load(state, (unsigned char *)buf, len, &n) == -1)
+            if (gz_load(state, (unsigned char*)buf, len, &n) == -1)
                 return -1;
         }
 
         /* large len -- decompress directly into user buffer */
         else {  /* state->how == GZIP */
             strm->avail_out = len;
-            strm->next_out = (Bytef *)buf;
+            strm->next_out = (unsigned char*) buf;
             if (gz_decomp(state) == -1)
                 return -1;
-            n = state->x.have;
+            n = state->have;
-            state->x.have = 0;
+            state->have = 0;
         }
 
         /* update progress */
         len -= n;
         buf = (char *)buf + n;
         got += n;
-        state->x.pos += n;
+        state->pos += n;
     } while (len);
 
     /* return number of bytes read into user buffer (will fit in int) */
@@ -378,7 +450,6 @@ int ZEXPORT gzread(
 }
 
 /* -- see zlib.h -- */
-#undef gzgetc
 int ZEXPORT gzgetc(
     gzFile file)
 {
@@ -391,16 +462,15 @@ int ZEXPORT gzgetc(
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no (serious) error */
+    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
+    if (state->mode != GZ_READ || state->err != Z_OK)
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* try output buffer (no need to check for skip request) */
-    if (state->x.have) {
+    if (state->have) {
-        state->x.have--;
+        state->have--;
-        state->x.pos++;
+        state->pos++;
-        return *(state->x.next)++;
+        return *(state->next)++;
     }
 
     /* nothing there -- try gzread() */
@@ -408,12 +478,6 @@ int ZEXPORT gzgetc(
     return ret < 1 ? -1 : buf[0];
 }
 
-int ZEXPORT gzgetc_(
-    gzFile file)
-{
-    return gzgetc(file);
-}
-
 /* -- see zlib.h -- */
 int ZEXPORT gzungetc(
     int c,
@@ -426,9 +490,8 @@ int ZEXPORT gzungetc(
         return -1;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no (serious) error */
+    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
+    if (state->mode != GZ_READ || state->err != Z_OK)
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
     /* process a skip request */
@@ -443,34 +506,32 @@ int ZEXPORT gzungetc(
         return -1;
 
     /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->x.have == 0) {
+    if (state->have == 0) {
-        state->x.have = 1;
+        state->have = 1;
-        state->x.next = state->out + (state->size << 1) - 1;
+        state->next = state->out + (state->size << 1) - 1;
-        state->x.next[0] = c;
+        state->next[0] = c;
-        state->x.pos--;
+        state->pos--;
-        state->past = 0;
         return c;
     }
 
     /* if no room, give up (must have already done a gzungetc()) */
-    if (state->x.have == (state->size << 1)) {
+    if (state->have == (state->size << 1)) {
-        gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+        gz_error(state, Z_BUF_ERROR, "out of room to push characters");
         return -1;
     }
 
     /* slide output data if needed and insert byte before existing data */
-    if (state->x.next == state->out) {
+    if (state->next == state->out) {
-        unsigned char *src = state->out + state->x.have;
+        unsigned char *src = state->out + state->have;
         unsigned char *dest = state->out + (state->size << 1);
         while (src > state->out)
             *--dest = *--src;
-        state->x.next = dest;
+        state->next = dest;
     }
-    state->x.have++;
+    state->have++;
-    state->x.next--;
+    state->next--;
-    state->x.next[0] = c;
+    state->next[0] = c;
-    state->x.pos--;
+    state->pos--;
-    state->past = 0;
     return c;
 }
 
@@ -490,9 +551,8 @@ char * ZEXPORT gzgets(
         return NULL;
     state = (gz_statep)file;
 
-    /* check that we're reading and that there's no (serious) error */
+    /* check that we're reading and that there's no error */
-    if (state->mode != GZ_READ ||
+    if (state->mode != GZ_READ || state->err != Z_OK)
-        (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return NULL;
 
     /* process a skip request */
@@ -509,31 +569,32 @@ char * ZEXPORT gzgets(
     left = (unsigned)len - 1;
     if (left) do {
         /* assure that something is in the output buffer */
-        if (state->x.have == 0 && gz_fetch(state) == -1)
+        if (state->have == 0) {
+            if (gz_make(state) == -1)
                 return NULL;            /* error */
-        if (state->x.have == 0) {       /* end of file */
+            if (state->have == 0) {     /* end of file */
-            state->past = 1;            /* read past end */
+                if (buf == str)         /* got bupkus */
-            break;                      /* return what we have */
+                    return NULL;
+                break;                  /* got something -- return it */
+            }
         }
 
         /* look for end-of-line in current output buffer */
-        n = state->x.have > left ? left : state->x.have;
+        n = state->have > left ? left : state->have;
-        eol = (unsigned char *)memchr(state->x.next, '\n', n);
+        eol = (unsigned char*) memchr(state->next, '\n', n);
         if (eol != NULL)
-            n = (unsigned)(eol - state->x.next) + 1;
+            n = (unsigned)(eol - state->next) + 1;
 
         /* copy through end-of-line, or remainder if not found */
-        memcpy(buf, state->x.next, n);
+        memcpy(buf, state->next, n);
-        state->x.have -= n;
+        state->have -= n;
-        state->x.next += n;
+        state->next += n;
-        state->x.pos += n;
+        state->pos += n;
         left -= n;
         buf += n;
     } while (left && eol == NULL);
 
-    /* return terminated string, or if nothing, end of file */
+    /* found end-of-line or out of space -- terminate string and return it */
-    if (buf == str)
-        return NULL;
     buf[0] = 0;
     return str;
 }
@@ -549,12 +610,16 @@ int ZEXPORT gzdirect(
         return 0;
     state = (gz_statep)file;
 
+    /* check that we're reading */
+    if (state->mode != GZ_READ)
+        return 0;
+
     /* if the state is not known, but we can find out, then do so (this is
        mainly for right after a gzopen() or gzdopen()) */
-    if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+    if (state->how == LOOK && state->have == 0)
-        (void)gz_look(state);
+        (void)gz_head(state);
 
-    /* return 1 if transparent, 0 if processing a gzip stream */
+    /* return 1 if reading direct, 0 if decompressing a gzip stream */
     return state->direct;
 }
 
@@ -562,7 +627,7 @@ int ZEXPORT gzdirect(
 int ZEXPORT gzclose_r(
     gzFile file)
 {
-    int ret, err;
+    int ret;
     gz_statep state;
 
     /* get internal structure */
@@ -580,10 +645,9 @@ int ZEXPORT gzclose_r(
         free(state->out);
         free(state->in);
     }
-    err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
     gz_error(state, Z_OK, NULL);
     free(state->path);
     ret = close(state->fd);
     free(state);
-    return ret ? Z_ERRNO : err;
+    return ret ? Z_ERRNO : Z_OK;
 }

src/zlib/gzwrite.c

@@ -1,5 +1,5 @@
 /* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004, 2005, 2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -18,18 +18,13 @@ local int gz_init(
     int ret;
     z_streamp strm = &(state->strm);
 
-    /* allocate input buffer */
+    /* allocate input and output buffers */
-    state->in = (unsigned char *)malloc(state->want);
+    state->in = (unsigned char*) malloc(state->want);
-    if (state->in == NULL) {
+    state->out = (unsigned char*) malloc(state->want);
-        gz_error(state, Z_MEM_ERROR, "out of memory");
+    if (state->in == NULL || state->out == NULL) {
-        return -1;
+        if (state->out != NULL)
-    }
+            free(state->out);
-
+        if (state->in != NULL)
-    /* only need output buffer and deflate state if compressing */
-    if (!state->direct) {
-        /* allocate output buffer */
-        state->out = (unsigned char *)malloc(state->want);
-        if (state->out == NULL) {
             free(state->in);
         gz_error(state, Z_MEM_ERROR, "out of memory");
         return -1;
@@ -40,33 +35,27 @@ local int gz_init(
     strm->zfree = Z_NULL;
     strm->opaque = Z_NULL;
     ret = deflateInit2(strm, state->level, Z_DEFLATED,
-                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+                       15 + 16, 8, state->strategy);
     if (ret != Z_OK) {
-            free(state->out);
         free(state->in);
         gz_error(state, Z_MEM_ERROR, "out of memory");
         return -1;
     }
-    }
 
     /* mark state as initialized */
     state->size = state->want;
 
-    /* initialize write buffer if compressing */
+    /* initialize write buffer */
-    if (!state->direct) {
     strm->avail_out = state->size;
     strm->next_out = state->out;
-        state->x.next = strm->next_out;
+    state->next = strm->next_out;
-    }
     return 0;
 }
 
 /* Compress whatever is at avail_in and next_in and write to the output file.
    Return -1 if there is an error writing to the output file, otherwise 0.
    flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
-   then the deflate() state is reset to start a new gzip stream.  If gz->direct
+   then the deflate() state is reset to start a new gzip stream. */
-   is true, then simply write to the output file without compressing, and
-   ignore flush. */
 local int gz_comp(
     gz_statep state,
     int flush)
@@ -79,17 +68,6 @@ local int gz_comp(
     if (state->size == 0 && gz_init(state) == -1)
         return -1;
 
-    /* write directly if requested */
-    if (state->direct) {
-        got = write(state->fd, strm->next_in, strm->avail_in);
-        if (got < 0 || (unsigned)got != strm->avail_in) {
-            gz_error(state, Z_ERRNO, zstrerror());
-            return -1;
-        }
-        strm->avail_in = 0;
-        return 0;
-    }
-
     /* run deflate() on provided input until it produces no more output */
     ret = Z_OK;
     do {
@@ -97,8 +75,8 @@ local int gz_comp(
            doing Z_FINISH then don't write until we get to Z_STREAM_END */
         if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
             (flush != Z_FINISH || ret == Z_STREAM_END))) {
-            have = (unsigned)(strm->next_out - state->x.next);
+            have = (unsigned)(strm->next_out - state->next);
-            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
+            if (have && ((got = write(state->fd, state->next, have)) < 0 ||
                          (unsigned)got != have)) {
                 gz_error(state, Z_ERRNO, zstrerror());
                 return -1;
@@ -107,7 +85,7 @@ local int gz_comp(
                 strm->avail_out = state->size;
                 strm->next_out = state->out;
             }
-            state->x.next = strm->next_out;
+            state->next = strm->next_out;
         }
 
         /* compress */
@@ -153,7 +131,7 @@ local int gz_zero(
         }
         strm->avail_in = n;
         strm->next_in = state->in;
-        state->x.pos += n;
+        state->pos += n;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return -1;
         len -= n;
@@ -185,7 +163,7 @@ int ZEXPORT gzwrite(
     /* since an int is returned, make sure len fits in one, otherwise return
        with an error (this avoids the flaw in the interface) */
     if ((int)len < 0) {
-        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+        gz_error(state, Z_BUF_ERROR, "requested length does not fit in int");
         return 0;
     }
 
@@ -215,7 +193,7 @@ int ZEXPORT gzwrite(
                 n = len;
             memcpy(strm->next_in + strm->avail_in, buf, n);
             strm->avail_in += n;
-            state->x.pos += n;
+            state->pos += n;
             buf = (char *)buf + n;
             len -= n;
             if (len && gz_comp(state, Z_NO_FLUSH) == -1)
@@ -230,7 +208,7 @@ int ZEXPORT gzwrite(
         /* directly compress user buffer to file */
         strm->avail_in = len;
         strm->next_in = (Bytef*)buf;
-        state->x.pos += len;
+        state->pos += len;
         if (gz_comp(state, Z_NO_FLUSH) == -1)
             return 0;
     }
@@ -271,15 +249,15 @@ int ZEXPORT gzputc(
         if (strm->avail_in == 0)
             strm->next_in = state->in;
         strm->next_in[strm->avail_in++] = c;
-        state->x.pos++;
+        state->pos++;
-        return c & 0xff;
+        return c;
     }
 
     /* no room in buffer or not initialized, use gz_write() */
     buf[0] = c;
     if (gzwrite(file, buf, 1) != 1)
         return -1;
-    return c & 0xff;
+    return c;
 }
 
 /* -- see zlib.h -- */
@@ -296,7 +274,7 @@ int ZEXPORT gzputs(
     return ret == 0 && len != 0 ? -1 : ret;
 }
 
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#ifdef STDC
 #include <stdarg.h>
 
 /* -- see zlib.h -- */
@@ -338,19 +316,19 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     va_start(va, format);
 #ifdef NO_vsnprintf
 #  ifdef HAS_vsprintf_void
-    (void)vsprintf((char *)(state->in), format, va);
+    (void)vsprintf(state->in, format, va);
     va_end(va);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = vsprintf((char *)(state->in), format, va);
+    len = vsprintf(state->in, format, va);
     va_end(va);
 #  endif
 #else
 #  ifdef HAS_vsnprintf_void
-    (void)vsnprintf((char *)(state->in), size, format, va);
+    (void)vsnprintf(state->in, size, format, va);
     va_end(va);
-    len = strlen((char *)(state->in));
+    len = strlen(state->in);
 #  else
     len = vsnprintf((char *)(state->in), size, format, va);
     va_end(va);
@@ -364,11 +342,11 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->x.pos += len;
+    state->pos += len;
     return len;
 }
 
-#else /* !STDC && !Z_HAVE_STDARG_H */
+#else /* !STDC */
 
 /* -- see zlib.h -- */
 int ZEXPORTVA gzprintf (
@@ -405,10 +383,6 @@ int ZEXPORTVA gzprintf (
     state = (gz_statep)file;
     strm = &(state->strm);
 
-    /* check that can really pass pointer in ints */
-    if (sizeof(int) != sizeof(void *))
-        return 0;
-
     /* check that we're writing and that there's no error */
     if (state->mode != GZ_WRITE || state->err != Z_OK)
         return 0;
@@ -433,23 +407,22 @@ int ZEXPORTVA gzprintf (
     state->in[size - 1] = 0;
 #ifdef NO_snprintf
 #  ifdef HAS_sprintf_void
-    sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+    sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
     for (len = 0; len < size; len++)
         if (state->in[len] == 0) break;
 #  else
-    len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+    len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
 #  endif
 #else
 #  ifdef HAS_snprintf_void
-    snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+    snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen((char *)(state->in));
+    len = strlen(state->in);
 #  else
-    len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+    len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
-                   a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
+                 a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-                   a19, a20);
 #  endif
 #endif
 
@@ -460,7 +433,7 @@ int ZEXPORTVA gzprintf (
     /* update buffer and position, defer compression until needed */
     strm->avail_in = (unsigned)len;
     strm->next_in = state->in;
-    state->x.pos += len;
+    state->pos += len;
     return len;
 }
 
@@ -544,7 +517,7 @@ int ZEXPORT gzsetparams(
 int ZEXPORT gzclose_w(
     gzFile file)
 {
-    int ret = Z_OK;
+    int ret = 0;
     gz_statep state;
 
     /* get internal structure */
@@ -559,24 +532,17 @@ int ZEXPORT gzclose_w(
     /* check for seek request */
     if (state->seek) {
         state->seek = 0;
-        if (gz_zero(state, state->skip) == -1)
+        ret += gz_zero(state, state->skip);
-            ret = state->err;
     }
 
     /* flush, free memory, and close file */
-    if (state->size) {
+    ret += gz_comp(state, Z_FINISH);
-        if (gz_comp(state, Z_FINISH) == -1)
-            ret = state->err;
-        if (!state->direct) {
     (void)deflateEnd(&(state->strm));
     free(state->out);
-        }
     free(state->in);
-    }
     gz_error(state, Z_OK, NULL);
     free(state->path);
-    if (close(state->fd) == -1)
+    ret += close(state->fd);
-        ret = Z_ERRNO;
     free(state);
-    return ret;
+    return ret ? Z_ERRNO : Z_OK;
 }

src/zlib/infback.c

@@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2009 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -42,19 +42,10 @@ int ZEXPORT inflateBackInit_(
         return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
-#endif
     }
-    if (strm->zfree == (free_func)0)
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-    strm->zfree = zcfree;
-#endif
     state = (struct inflate_state FAR *)ZALLOC(strm, 1,
                                                sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -403,6 +394,7 @@ int ZEXPORT inflateBack(
                     PULLBYTE();
                 }
                 if (here.val < 16) {
+                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }

src/zlib/inffixed.h

@@ -2,9 +2,9 @@
      * Generated automatically by makefixed().
      */
 
-    /* WARNING: this file should *not* be used by applications.
+    /* WARNING: this file should *not* be used by applications. It
-       It is part of the implementation of this library and is
+       is part of the implementation of the compression library and
-       subject to change. Applications should only use zlib.h.
+       is subject to change. Applications should only use zlib.h.
      */
 
     static const code lenfix[512] = {

src/zlib/inflate.c

@@ -1,5 +1,5 @@
 /* inflate.c -- zlib decompression
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -100,7 +100,7 @@ local int updatewindow OF((z_streamp strm, unsigned out));
 local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
                               unsigned len));
 
-int ZEXPORT inflateResetKeep(
+int ZEXPORT inflateReset(
     z_streamp strm)
 {
     struct inflate_state FAR *state;
@@ -109,13 +109,15 @@ int ZEXPORT inflateResetKeep(
     state = (struct inflate_state FAR *)strm->state;
     strm->total_in = strm->total_out = state->total = 0;
     strm->msg = Z_NULL;
-    if (state->wrap)        /* to support ill-conceived Java test suite */
+    strm->adler = 1;        /* to support ill-conceived Java test suite */
-        strm->adler = state->wrap & 1;
     state->mode = HEAD;
     state->last = 0;
     state->havedict = 0;
     state->dmax = 32768U;
     state->head = Z_NULL;
+    state->wsize = 0;
+    state->whave = 0;
+    state->wnext = 0;
     state->hold = 0;
     state->bits = 0;
     state->lencode = state->distcode = state->next = state->codes;
@@ -125,19 +127,6 @@ int ZEXPORT inflateResetKeep(
     return Z_OK;
 }
 
-int ZEXPORT inflateReset(
-    z_streamp strm)
-{
-    struct inflate_state FAR *state;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    state = (struct inflate_state FAR *)strm->state;
-    state->wsize = 0;
-    state->whave = 0;
-    state->wnext = 0;
-    return inflateResetKeep(strm);
-}
-
 int ZEXPORT inflateReset2(
     z_streamp strm,
     int windowBits)
@@ -191,19 +180,10 @@ int ZEXPORT inflateInit2_(
     if (strm == Z_NULL) return Z_STREAM_ERROR;
     strm->msg = Z_NULL;                 /* in case we return an error */
     if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
         strm->zalloc = zcalloc;
         strm->opaque = (voidpf)0;
-#endif
     }
-    if (strm->zfree == (free_func)0)
+    if (strm->zfree == (free_func)0) strm->zfree = zcfree;
-#ifdef Z_SOLO
-        return Z_STREAM_ERROR;
-#else
-        strm->zfree = zcfree;
-#endif
     state = (struct inflate_state FAR *)
             ZALLOC(strm, 1, sizeof(struct inflate_state));
     if (state == Z_NULL) return Z_MEM_ERROR;
@@ -341,8 +321,8 @@ void makefixed()
     low = 0;
     for (;;) {
         if ((low % 7) == 0) printf("\n        ");
-        printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencode[low].op,
+        printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits,
-               state.lencode[low].bits, state.lencode[low].val);
+               state.lencode[low].val);
         if (++low == size) break;
         putchar(',');
     }
@@ -519,6 +499,11 @@ local int updatewindow(
         bits -= bits & 7; \
     } while (0)
 
+/* Reverse the bytes in a 32-bit value */
+#define REVERSE(q) \
+    ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+     (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
 /*
    inflate() uses a state machine to process as much input data and generate as
    much output data as possible before returning.  The state machine is
@@ -812,7 +797,7 @@ int ZEXPORT inflate(
 #endif
         case DICTID:
             NEEDBITS(32);
-            strm->adler = state->check = ZSWAP32(hold);
+            strm->adler = state->check = REVERSE(hold);
             INITBITS();
             state->mode = DICT;
         case DICT:
@@ -940,6 +925,7 @@ int ZEXPORT inflate(
                     PULLBYTE();
                 }
                 if (here.val < 16) {
+                    NEEDBITS(here.bits);
                     DROPBITS(here.bits);
                     state->lens[state->have++] = here.val;
                 }
@@ -1184,7 +1170,7 @@ int ZEXPORT inflate(
 #ifdef GUNZIP
                      state->flags ? hold :
 #endif
-                     ZSWAP32(hold)) != state->check) {
+                     REVERSE(hold)) != state->check) {
                     strm->msg = (char *)"incorrect data check";
                     state->mode = BAD;
                     break;
@@ -1228,8 +1214,7 @@ int ZEXPORT inflate(
      */
   inf_leave:
     RESTORE();
-    if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+    if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
-            (state->mode < CHECK || flush != Z_FINISH)))
         if (updatewindow(strm, out)) {
             state->mode = MEM;
             return Z_MEM_ERROR;
@@ -1270,10 +1255,7 @@ int ZEXPORT inflateSetDictionary(
     uInt dictLength)
 {
     struct inflate_state FAR *state;
-    unsigned long dictid;
+    unsigned long id;
-    unsigned char *next;
-    unsigned avail;
-    int ret;
 
     /* check state */
     if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
@@ -1281,27 +1263,29 @@ int ZEXPORT inflateSetDictionary(
     if (state->wrap != 0 && state->mode != DICT)
         return Z_STREAM_ERROR;
 
-    /* check for correct dictionary identifier */
+    /* check for correct dictionary id */
     if (state->mode == DICT) {
-        dictid = adler32(0L, Z_NULL, 0);
+        id = adler32(0L, Z_NULL, 0);
-        dictid = adler32(dictid, dictionary, dictLength);
+        id = adler32(id, dictionary, dictLength);
-        if (dictid != state->check)
+        if (id != state->check)
             return Z_DATA_ERROR;
     }
 
-    /* copy dictionary to window using updatewindow(), which will amend the
+    /* copy dictionary to window */
-       existing dictionary if appropriate */
+    if (updatewindow(strm, strm->avail_out)) {
-    next = strm->next_out;
-    avail = strm->avail_out;
-    strm->next_out = (Bytef *)dictionary + dictLength;
-    strm->avail_out = 0;
-    ret = updatewindow(strm, dictLength);
-    strm->avail_out = avail;
-    strm->next_out = next;
-    if (ret) {
         state->mode = MEM;
         return Z_MEM_ERROR;
     }
+    if (dictLength > state->wsize) {
+        zmemcpy(state->window, dictionary + dictLength - state->wsize,
+                state->wsize);
+        state->whave = state->wsize;
+    }
+    else {
+        zmemcpy(state->window + state->wsize - dictLength, dictionary,
+                dictLength);
+        state->whave = dictLength;
+    }
     state->havedict = 1;
     Tracev((stderr, "inflate:   dictionary set\n"));
     return Z_OK;
@@ -1449,8 +1433,8 @@ int ZEXPORT inflateCopy(
     }
 
     /* copy state */
-    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+    zmemcpy(dest, source, sizeof(z_stream));
-    zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+    zmemcpy(copy, state, sizeof(struct inflate_state));
     if (state->lencode >= state->codes &&
         state->lencode <= state->codes + ENOUGH - 1) {
         copy->lencode = copy->codes + (state->lencode - state->codes);

src/zlib/inftrees.c

@@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2010 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -9,7 +9,7 @@
 #define MAXBITS 15
 
 const char inflate_copyright[] =
-   " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
+   " inflate 1.2.5 Copyright 1995-2010 Mark Adler ";
 /*
   If you use the zlib library in a product, an acknowledgment is welcome
   in the documentation of your product. If for some reason you cannot
@@ -62,7 +62,7 @@ int ZLIB_INTERNAL inflate_table(
         35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
     static const unsigned short lext[31] = { /* Length codes 257..285 extra */
         16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
-        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68};
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195};
     static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
         1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
         257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
@@ -289,14 +289,38 @@ int ZLIB_INTERNAL inflate_table(
         }
     }
 
-    /* fill in remaining table entry if code is incomplete (guaranteed to have
+    /*
-       at most one remaining entry, since if the code is incomplete, the
+       Fill in rest of table for incomplete codes.  This loop is similar to the
-       maximum code length that was allowed to get this far is one bit) */
+       loop above in incrementing huff for table indices.  It is assumed that
-    if (huff != 0) {
+       len is equal to curr + drop, so there is no loop needed to increment
+       through high index bits.  When the current sub-table is filled, the loop
+       drops back to the root table to fill in any remaining entries there.
+     */
     here.op = (unsigned char)64;                /* invalid code marker */
     here.bits = (unsigned char)(len - drop);
     here.val = (unsigned short)0;
-        next[huff] = here;
+    while (huff != 0) {
+        /* when done with sub-table, drop back to root table */
+        if (drop != 0 && (huff & mask) != low) {
+            drop = 0;
+            len = root;
+            next = *table;
+            here.bits = (unsigned char)len;
+        }
+
+        /* put invalid code marker in table */
+        next[huff >> drop] = here;
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
     }
 
     /* set return parameters */

src/zlib/trees.c

@@ -1,5 +1,5 @@
 /* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2010 Jean-loup Gailly
  * detect_data_type() function provided freely by Cosmin Truta, 2006
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
@@ -74,6 +74,11 @@ local const uch bl_order[BL_CODES]
  * probability, to avoid transmitting the lengths for unused bit length codes.
  */
 
+#define Buf_size (8 * 2*sizeof(char))
+/* Number of bits used within bi_buf. (bi_buf might be implemented on
+ * more than 16 bits on some systems.)
+ */
+
 /* ===========================================================================
  * Local data. These are initialized only once.
  */
@@ -394,6 +399,7 @@ void ZLIB_INTERNAL _tr_init(
 
     s->bi_buf = 0;
     s->bi_valid = 0;
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 #ifdef DEBUG
     s->compressed_len = 0L;
     s->bits_sent = 0L;
@@ -878,18 +884,16 @@ void ZLIB_INTERNAL _tr_stored_block(
     copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
 }
 
-/* ===========================================================================
- * Flush the bits in the bit buffer to pending output (leaves at most 7 bits)
- */
-void ZLIB_INTERNAL _tr_flush_bits(
-    deflate_state *s)
-{
-    bi_flush(s);
-}
-
 /* ===========================================================================
  * Send one empty static block to give enough lookahead for inflate.
  * This takes 10 bits, of which 7 may remain in the bit buffer.
+ * The current inflate code requires 9 bits of lookahead. If the
+ * last two codes for the previous block (real code plus EOB) were coded
+ * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
+ * the last real code. In this case we send two empty static blocks instead
+ * of one. (There are no problems if the previous block is stored or fixed.)
+ * To simplify the code, we assume the worst case of last real code encoded
+ * on one bit only.
  */
 void ZLIB_INTERNAL _tr_align(
     deflate_state *s)
@@ -900,6 +904,20 @@ void ZLIB_INTERNAL _tr_align(
     s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
 #endif
     bi_flush(s);
+    /* Of the 10 bits for the empty block, we have already sent
+     * (10 - bi_valid) bits. The lookahead for the last real code (before
+     * the EOB of the previous block) was thus at least one plus the length
+     * of the EOB plus what we have just sent of the empty static block.
+     */
+    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
+        send_bits(s, STATIC_TREES<<1, 3);
+        send_code(s, END_BLOCK, static_ltree);
+#ifdef DEBUG
+        s->compressed_len += 10L;
+#endif
+        bi_flush(s);
+    }
+    s->last_eob_len = 7;
 }
 
 /* ===========================================================================
@@ -1102,6 +1120,7 @@ local void compress_block(
     } while (lx < s->last_lit);
 
     send_code(s, END_BLOCK, ltree);
+    s->last_eob_len = ltree[END_BLOCK].Len;
 }
 
 /* ===========================================================================
@@ -1209,6 +1228,7 @@ local void copy_block(
     int      header)
 {
     bi_windup(s);        /* align on byte boundary */
+    s->last_eob_len = 8; /* enough lookahead for inflate */
 
     if (header) {
         put_short(s, (ush)len);

src/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -8,10 +8,6 @@
 #ifndef ZCONF_H
 #define ZCONF_H
 
-/* Added by stephen: 2012-06-07 */
-#include "bspf.hxx"
-/********************************/
-
 /*
  * If you *really* need a unique prefix for all types and library functions,
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
@@ -19,7 +15,6 @@
  * this permanently in zconf.h using "./configure --zprefix".
  */
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
 
 /* all linked symbols */
 #  define _dist_code            z__dist_code
@@ -32,11 +27,9 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
 #  define compress              z_compress
 #  define compress2             z_compress2
 #  define compressBound         z_compressBound
-#  endif
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
@@ -47,16 +40,13 @@
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
 #  define deflatePrime          z_deflatePrime
 #  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateSetHeader      z_deflateSetHeader
 #  define deflateTune           z_deflateTune
 #  define deflate_copyright     z_deflate_copyright
 #  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
 #  define gz_error              z_gz_error
 #  define gz_intmax             z_gz_intmax
 #  define gz_strwinerror        z_gz_strwinerror
@@ -71,15 +61,11 @@
 #  define gzerror               z_gzerror
 #  define gzflush               z_gzflush
 #  define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
 #  define gzgets                z_gzgets
 #  define gzoffset              z_gzoffset
 #  define gzoffset64            z_gzoffset64
 #  define gzopen                z_gzopen
 #  define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
 #  define gzprintf              z_gzprintf
 #  define gzputc                z_gzputc
 #  define gzputs                z_gzputs
@@ -92,7 +78,6 @@
 #  define gztell64              z_gztell64
 #  define gzungetc              z_gzungetc
 #  define gzwrite               z_gzwrite
-#  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
@@ -110,18 +95,13 @@
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
 #  define inflate_copyright     z_inflate_copyright
 #  define inflate_fast          z_inflate_fast
 #  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
 #  define uncompress            z_uncompress
-#  endif
 #  define zError                z_zError
-#  ifndef Z_SOLO
 #  define zcalloc               z_zcalloc
 #  define zcfree                z_zcfree
-#  endif
 #  define zlibCompileFlags      z_zlibCompileFlags
 #  define zlibVersion           z_zlibVersion
 
@@ -131,9 +111,7 @@
 #  define alloc_func            z_alloc_func
 #  define charf                 z_charf
 #  define free_func             z_free_func
-#  ifndef Z_SOLO
 #  define gzFile                z_gzFile
-#  endif
 #  define gz_header             z_gz_header
 #  define gz_headerp            z_gz_headerp
 #  define in_func               z_in_func
@@ -219,12 +197,6 @@
 #  endif
 #endif
 
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
 /* Some Mac compilers merge all .h files incorrectly: */
 #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
 #  define NO_DUMMY_DECL
@@ -271,14 +243,6 @@
 #  endif
 #endif
 
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
 /* The following definitions for FAR are needed only for MSDOS mixed
  * model programming (small or medium model with some far allocations).
  * This was tested only with MSC; for other MSDOS compilers you may have
@@ -392,45 +356,12 @@ typedef uLong FAR uLongf;
    typedef Byte       *voidp;
 #endif
 
-/* ./configure may #define Z_U4 here */
+#if !(defined(WINDOWS) || defined(WIN32))    /* was set to #if 1 by ./configure, disabled by SA - 2010-08-01 */
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  else
-#    if (ULONG_MAX == 0xffffffffUL)
-#      define Z_U4 unsigned long
-#    else
-#      if (USHRT_MAX == 0xffffffffUL)
-#        define Z_U4 unsigned short
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
 #  define Z_HAVE_UNISTD_H
 #endif
 
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
 #ifdef STDC
-#  ifndef Z_SOLO
 #  include <sys/types.h>    /* for off_t */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  include <stddef.h>           /* for wchar_t */
 #endif
 
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
@@ -439,38 +370,21 @@ typedef uLong FAR uLongf;
  * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
  * equivalently requesting no 64-bit operations
  */
-#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+#if -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
 
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#  define Z_HAVE_UNISTD_H
+#  include <unistd.h>       /* for SEEK_* and off_t */
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
 #  ifdef VMS
 #    include <unixio.h>     /* for off_t */
 #  endif
 #  ifndef z_off_t
 #    define z_off_t off_t
 #  endif
-#  endif
 #endif
 
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+#ifndef SEEK_SET
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
 #  define SEEK_CUR        1       /* Seek from current position.  */
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
@@ -480,14 +394,18 @@ typedef uLong FAR uLongf;
 #  define z_off_t long
 #endif
 
-#if !defined(_WIN32) && defined(Z_LARGE64)
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
 #  define z_off64_t off64_t
 #else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
 #  define z_off64_t z_off_t
-#  endif
+#endif
+
+#if defined(__OS400__)
+#  define NO_vsnprintf
+#endif
+
+#if defined(__MVS__)
+#  define NO_vsnprintf
 #endif
 
 /* MVS linker does not support external names larger than 8 bytes */

src/zlib/zlib.h

@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.7, May 2nd, 2012
+  version 1.2.5, April 19th, 2010
 
-  Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -24,8 +24,8 @@
 
 
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
 #ifndef ZLIB_H
@@ -37,11 +37,11 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.7"
+#define ZLIB_VERSION "1.2.5"
-#define ZLIB_VERNUM 0x1270
+#define ZLIB_VERNUM 0x1250
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 7
+#define ZLIB_VER_REVISION 5
 #define ZLIB_VER_SUBREVISION 0
 
 /*
@@ -83,15 +83,15 @@ typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
 
 typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
+    Bytef    *next_in;  /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
+    uLong    total_in;  /* total nb of input bytes read so far */
 
     Bytef    *next_out; /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
+    uLong    total_out; /* total nb of bytes output so far */
 
-    z_const char *msg;  /* last error message, NULL if no error */
+    char     *msg;      /* last error message, NULL if no error */
     struct internal_state FAR *state; /* not visible by applications */
 
     alloc_func zalloc;  /* used to allocate the internal state */
@@ -327,9 +327,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
 
     Z_FINISH can be used immediately after deflateInit if all the compression
   is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  value returned by deflateBound (see below).  If deflate does not return
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  Z_STREAM_END, then it must be called again as described above.
-  not return Z_STREAM_END, and it must be called again as described above.
 
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
@@ -452,29 +451,23 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   error.  However if all decompression is to be performed in a single step (a
   single call of inflate), the parameter flush should be set to Z_FINISH.  In
   this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
+  avail_out must be large enough to hold all the uncompressed data.  (The size
-  operation to complete.  (The size of the uncompressed data may have been
+  of the uncompressed data may have been saved by the compressor for this
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
+  purpose.) The next operation on this stream must be inflateEnd to deallocate
-  required to perform an inflation in one step.  However it may be used to
+  the decompression state.  The use of Z_FINISH is never required, but can be
-  inform inflate that a faster approach can be used for the single inflate()
+  used to inform inflate that a faster approach may be used for the single
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
+  inflate() call.
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
 
      In this implementation, inflate() always flushes as much output as
   possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
+  first call.  So the only effect of the flush parameter in this implementation
-  on the return value of inflate() as noted below, when inflate() returns early
+  is on the return value of inflate(), as noted below, or when it returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+  because Z_BLOCK or Z_TREES is used.
-  memory for a sliding window when Z_FINISH is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
+  strm->adler to the adler32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
   below.  At the end of the stream, inflate() checks that its computed adler32
   checksum is equal to that saved by the compressor and returns Z_STREAM_END
@@ -485,9 +478,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   initializing with inflateInit2().  Any information contained in the gzip
   header is not retained, so applications that need that information should
   instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
+  perform their own processing of the gzip header and trailer.
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
 
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
@@ -589,15 +580,10 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
+   without producing any compressed output.  This function must be called
-   function must be called immediately after deflateInit, deflateInit2 or
+   immediately after deflateInit, deflateInit2 or deflateReset, before any call
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
+   of deflate.  The compressor and decompressor must use exactly the same
-   function must be called either before any call of deflate, or immediately
+   dictionary (see inflateSetDictionary).
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
 
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
@@ -624,8 +610,8 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
+   or if the compression method is bsort).  deflateSetDictionary does not
-   not perform any compression: this will be done by deflate().
+   perform any compression: this will be done by deflate().
 */
 
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
@@ -702,29 +688,9 @@ ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
    deflation of sourceLen bytes.  It must be called after deflateInit() or
    deflateInit2(), and after deflateSetHeader(), if used.  This would be used
    to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
+   called before deflate().
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
 */
 
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
 ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
                                      int bits,
                                      int value));
@@ -737,9 +703,8 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    than or equal to 16, and that many of the least significant bits of value
    will be inserted in the output.
 
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+     deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+   stream state was inconsistent.
-   source stream state was inconsistent.
 */
 
 ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
@@ -825,11 +790,10 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
    if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
    can be determined from the adler32 value returned by that call of inflate.
    The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
+   deflateSetDictionary).  For raw inflate, this function can be called
-   time to set the dictionary.  If the provided dictionary is smaller than the
+   immediately after inflateInit2() or inflateReset() and before any call of
-   window and there is already data in the window, then the provided dictionary
+   inflate() to set the dictionary.  The application must insure that the
-   will amend what's there.  The application must insure that the dictionary
+   dictionary that was used for compression is provided.
-   that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
@@ -841,21 +805,17 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
 
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
-     Skips invalid compressed data until a possible full flush point (see above
+     Skips invalid compressed data until a full flush point (see above the
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+   description of deflate with Z_FULL_FLUSH) can be found, or until all
    available input is skipped.  No output is provided.
 
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-   All full flush points have this pattern, but not all occurences of this
+   if no more input was provided, Z_DATA_ERROR if no flush point has been
-   pattern are full flush points.
+   found, or Z_STREAM_ERROR if the stream structure was inconsistent.  In the
-
+   success case, the application may save the current current value of total_in
-     inflateSync returns Z_OK if a possible full flush point has been found,
+   which indicates where valid compressed data was found.  In the error case,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+   the application may repeatedly call inflateSync, providing more input each
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+   time, until success or end of the input data.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
 */
 
 ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
@@ -1002,7 +962,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
      See inflateBack() for the usage of these routines.
 
      inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not be
    allocated, or Z_VERSION_ERROR if the version of the library does not match
    the version of the header file.
 */
@@ -1128,7 +1088,6 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
      27-31: 0 (reserved)
  */
 
-#ifndef Z_SOLO
 
                         /* utility functions */
 
@@ -1190,11 +1149,10 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
 
      uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
 */
 
+
                         /* gzip file access functions */
 
 /*
@@ -1204,7 +1162,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
    wrapper, documented in RFC 1952, wrapped around a deflate stream.
 */
 
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
+typedef voidp gzFile;       /* opaque gzip file descriptor */
 
 /*
 ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
@@ -1214,28 +1172,13 @@ ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
    a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
    compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
    for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
+   deflateInit2 for more information about the strategy parameter.) Also "a"
-   request transparent writing or appending with no compression and not using
+   can be used instead of "w" to request that the gzip stream that will be
-   the gzip format.
+   written be appended to the file.  "+" will result in an error, since reading
-
+   and writing to the same gzip file is not supported.
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
 
      gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
+   case gzread will directly read from the file without decompression.
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
 
      gzopen returns NULL if the file could not be opened, if there was
    insufficient memory to allocate the gzFile state, or if an invalid mode was
@@ -1254,11 +1197,7 @@ ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
    descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
    fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
    mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
+   gzdopen does not close fd if it fails.
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
 
      gzdopen returns NULL if there was insufficient memory to allocate the
    gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
@@ -1296,26 +1235,14 @@ ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
 /*
      Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
+   the input file was not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
+   bytes into the buffer.
 
      After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
+   to read, looking for another gzip stream, or failing that, reading the rest
-   concatenated in the input file, and will all be decompressed by gzread().
+   of the input file directly without decompression.  The entire input file
-   If something other than a gzip stream is encountered after a gzip stream,
+   will be read if gzread is called until it returns less than the requested
-   that remaining trailing garbage is ignored (and no error is returned).
+   len.
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
 
      gzread returns the number of uncompressed bytes actually read, less than
    len for end of file, or -1 for error.
@@ -1329,7 +1256,7 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
    error.
 */
 
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
 /*
      Converts, formats, and writes the arguments to the compressed file under
    control of the format string, as in fprintf.  gzprintf returns the number of
@@ -1374,10 +1301,7 @@ ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
 /*
      Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
+   in case of end of file or error.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
 */
 
 ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
@@ -1473,7 +1397,9 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
 ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
 /*
      Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
+   (0) if file is a gzip stream being decompressed.  This state can change from
+   false to true while reading the input file if the end of a gzip stream is
+   reached, but is followed by data that is not another gzip stream.
 
      If the input file is empty, gzdirect() will return true, since the input
    does not contain a gzip stream.
@@ -1482,13 +1408,6 @@ ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
    cause buffers to be allocated to allow reading the file to determine if it
    is a gzip file.  Therefore if gzbuffer() is used, it should be called before
    gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
 */
 
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
@@ -1500,8 +1419,7 @@ ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
    must not be called more than once on the same allocation.
 
      gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+   file operation error, or Z_OK on success.
-   last read ended in the middle of a gzip stream, or Z_OK on success.
 */
 
 ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
@@ -1539,7 +1457,6 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
    file that is being written concurrently.
 */
 
-#endif /* !Z_SOLO */
 
                         /* checksum functions */
 
@@ -1575,17 +1492,16 @@ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
      Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
    and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
    each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
 */
 
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
      Update a running CRC-32 with the bytes buf[0..len-1] and return the
    updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
+   initial value for the for the crc.  Pre- and post-conditioning (one's
-   performed within this function so it shouldn't be done by the application.
+   complement) is performed within this function so it shouldn't be done by the
+   application.
 
    Usage example:
 
@@ -1628,42 +1544,17 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          const char *version,
                                          int stream_size));
 #define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
 #define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
         deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-                      (int)sizeof(z_stream))
 #define inflateBackInit(strm, windowBits, window) \
         inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
+                                            ZLIB_VERSION, sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
 
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
  * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
@@ -1671,7 +1562,7 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
  * functions are changed to 64 bits) -- in case these are set on systems
  * without large file support, _LFS64_LARGEFILE must also be true
  */
-#ifdef Z_LARGE64
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
@@ -1680,23 +1571,14 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
    ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
 #endif
 
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
 #  define gzopen gzopen64
 #  define gzseek gzseek64
 #  define gztell gztell64
 #  define gzoffset gzoffset64
 #  define adler32_combine adler32_combine64
 #  define crc32_combine crc32_combine64
-#  endif
+#  ifdef _LARGEFILE64_SOURCE
-#  ifndef Z_LARGE64
      ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
      ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
      ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
@@ -1713,13 +1595,6 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
    ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
 #endif
 
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
 /* hack for buggy compilers */
 #if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
     struct internal_state {int dummy;};
@@ -1728,14 +1603,8 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 /* undocumented functions */
 ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
 ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
 
 #ifdef __cplusplus
 }

src/zlib/zutil.c

@@ -1,14 +1,11 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /* @(#) $Id$ */
 
 #include "zutil.h"
-#ifndef Z_SOLO
-#  include "gzguts.h"
-#endif
 
 #ifndef NO_DUMMY_DECL
 struct internal_state      {int dummy;}; /* for buggy compilers */
@@ -88,7 +85,7 @@ uLong ZEXPORT zlibCompileFlags()
 #ifdef FASTEST
     flags += 1L << 21;
 #endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#ifdef STDC
 #  ifdef NO_vsnprintf
         flags += 1L << 25;
 #    ifdef HAS_vsprintf_void
@@ -184,7 +181,6 @@ void ZLIB_INTERNAL zmemzero(
 }
 #endif
 
-#ifndef Z_SOLO
 
 #ifdef SYS16BIT
 
@@ -320,5 +316,3 @@ void ZLIB_INTERNAL zcfree (
 }
 
 #endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */

src/zlib/zutil.h

@@ -1,5 +1,5 @@
 /* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2010 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#ifdef HAVE_HIDDEN
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
@@ -21,7 +21,7 @@
 
 #include "zlib.h"
 
-#if defined(STDC) && !defined(Z_SOLO)
+#ifdef STDC
 #  if !(defined(_WIN32_WCE) && defined(_MSC_VER))
 #    include <stddef.h>
 #  endif
@@ -29,10 +29,6 @@
 #  include <stdlib.h>
 #endif
 
-#ifdef Z_SOLO
-   typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
-#endif
-
 #ifndef local
 #  define local static
 #endif
@@ -82,7 +78,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
 #  define OS_CODE  0x00
-#  ifndef Z_SOLO
 #  if defined(__TURBOC__) || defined(__BORLANDC__)
 #    if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
        /* Allow compilation with ANSI keywords only enabled */
@@ -94,7 +89,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  else /* MSC or DJGPP */
 #    include <malloc.h>
 #  endif
-#  endif
 #endif
 
 #ifdef AMIGA
@@ -113,14 +107,13 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
 #ifdef OS2
 #  define OS_CODE  0x06
-#  if defined(M_I86) && !defined(Z_SOLO)
+#  ifdef M_I86
 #    include <malloc.h>
 #  endif
 #endif
 
 #if defined(MACOS) || defined(TARGET_OS_MAC)
 #  define OS_CODE  0x07
-#  ifndef Z_SOLO
 #  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
 #    include <unix.h> /* for fdopen */
 #  else
@@ -128,7 +121,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #      define fdopen(fd,mode) NULL /* No fdopen() */
 #    endif
 #  endif
-#  endif
 #endif
 
 #ifdef TOPS20
@@ -161,14 +153,14 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  endif
 #endif
 
-#if defined(__BORLANDC__) && !defined(MSDOS)
+#if defined(__BORLANDC__)
   #pragma warn -8004
   #pragma warn -8008
   #pragma warn -8066
 #endif
 
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
 #endif
@@ -185,7 +177,42 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 
          /* functions */
 
-#if defined(pyr) || defined(Z_SOLO)
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#if defined(__CYGWIN__)
+#  ifndef HAVE_VSNPRINTF
+#    define HAVE_VSNPRINTF
+#  endif
+#endif
+#ifndef HAVE_VSNPRINTF
+#  ifdef MSDOS
+     /* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+        but for now we just assume it doesn't. */
+#    define NO_vsnprintf
+#  endif
+#  ifdef __TURBOC__
+#    define NO_vsnprintf
+#  endif
+#  ifdef WIN32
+     /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)
+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+#         define vsnprintf _vsnprintf
+#      endif
+#    endif
+#  endif
+#  ifdef __SASC
+#    define NO_vsnprintf
+#  endif
+#endif
+#ifdef VMS
+#  define NO_vsnprintf
+#endif
+
+#if defined(pyr)
 #  define NO_MEMCPY
 #endif
 #if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
@@ -234,19 +261,14 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #  define Tracecv(c,x)
 #endif
 
-#ifndef Z_SOLO
+
-   voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
                         unsigned size));
-   void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
+void ZLIB_INTERNAL zcfree  OF((voidpf opaque, voidpf ptr));
-#endif
 
 #define ZALLOC(strm, items, size) \
            (*((strm)->zalloc))((strm)->opaque, (items), (size))
 #define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
 #define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
 
-/* Reverse the bytes in a 32-bit value */
-#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
-                    (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
 #endif /* ZUTIL_H */