Update zlib from 1.2.7 to 1.2.11

2020-10-21 00:21:31 -04:00 · 2020-10-21 00:21:31 -04:00 · b690d4d7da
parent 0a81594056
commit b690d4d7da
31 changed files with 5324 additions and 7025 deletions
--- a/extern/zlib/CMakeLists.txt
+++ b/extern/zlib/CMakeLists.txt
@ -1,4 +1,4 @@
-if(NOT WIN32)
+if(NOT WIN32 AND NOT NX)
 find_package(ZLIB)
 endif()
 if(WIN32 OR NOT ZLIB_FOUND)
@ -29,6 +29,8 @@ add_library(z
 if(WIN32 AND NOT UNIX)
 install(FILES zconf.h zlib.h DESTINATION include COMPONENT zlib)
 install(TARGETS z DESTINATION lib COMPONENT zlib)
 else()
 target_compile_options(z PRIVATE -Wno-implicit-fallthrough)
 endif()
 set(ZLIB_LIBRARIES z CACHE PATH "Zlib libraries" FORCE)
 set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Zlib include path" FORCE)
--- a/extern/zlib/ChangeLog
+++ b/extern/zlib/ChangeLog
@ -1,30 +1,111 @@
                ChangeLog file for zlib
-!!!!
+
-!!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
+Changes in 1.2.11 (15 Jan 2017)
-!!!! distribution. This altered source distribution is NOT supported by the
+- Fix deflate stored bug when pulling last block from window
-!!!! original creators Jean-loup Gailly and Mark Adler.
+- Permit immediate deflateParams changes before any deflate input
-!!!!
+
-!!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
+Changes in 1.2.10 (2 Jan 2017)
-!!!! The purpose of the changes made herein were to specifically address
+- Avoid warnings on snprintf() return value
-!!!! compiler errors and warnings in a Microsoft Windows build environment.
+- Fix bug in deflate_stored() for zero-length input
-!!!!
+- Fix bug in gzwrite.c that produced corrupt gzip files
-!!!! Changes in 1.2.7.f-hanba-win64-v3 (31 May 2014)
+- Remove files to be installed before copying them in Makefile.in
-!!!! - Corrected infinite loop errors in inflate.c and infback.c
+- Add warnings when compiling with assembler code
-!!!! - Added ZLibTest project to MSVS 2013 solution.
+
-!!!!
+Changes in 1.2.9 (31 Dec 2016)
-!!!! Changes in 1.2.7.f-hanba-win64-v2 (17 November 2013)
+- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
-!!!! - Reverted function definitions and added preprocessor WIN32 check.
+- Improve contrib/blast to return unused bytes
-!!!! - Created Microsoft Visual Studio 2012 & 2013 solution & project files.
+- Assure that gzoffset() is correct when appending
-!!!!
+- Improve compress() and uncompress() to support large lengths
-!!!! Changes in 1.2.7.f-hanba-win64-v1 (23 May 2012)
+- Fix bug in test/example.c where error code not saved
-!!!! - Adjusted version numbers to reflect the altered source distribution
+- Remedy Coverity warning [Randers-Pehrson]
-!!!! - Adjusted function old-declarators to new style.
+- Improve speed of gzprintf() in transparent mode
-!!!! - Modified constant conditional expressions to non-conditional.
+- Fix inflateInit2() bug when windowBits is 16 or 32
-!!!! - Renamed/redefined deprecated functions to their ANSI equivalents.
+- Change DEBUG macro to ZLIB_DEBUG
-!!!! - Adjusted (carefully) data types to reduce risk of data loss.
+- Avoid uninitialized access by gzclose_w()
-!!!! - Created Microsoft Visual Studio 2008 solution & project files.
+- Allow building zlib outside of the source directory
-!!!!
+- Fix bug that accepted invalid zlib header when windowBits is zero
 - Fix gzseek() problem on MinGW due to buggy _lseeki64 there
 - Loop on write() calls in gzwrite.c in case of non-blocking I/O
 - Add --warn (-w) option to ./configure for more compiler warnings
 - Reject a window size of 256 bytes if not using the zlib wrapper
 - Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
 - Add --debug (-d) option to ./configure to define ZLIB_DEBUG
 - Fix bugs in creating a very large gzip header
 - Add uncompress2() function, which returns the input size used
 - Assure that deflateParams() will not switch functions mid-block
 - Dramatically speed up deflation for level 0 (storing)
 - Add gzfread(), duplicating the interface of fread()
 - Add gzfwrite(), duplicating the interface of fwrite()
 - Add deflateGetDictionary() function
 - Use snprintf() for later versions of Microsoft C
 - Fix *Init macros to use z_ prefix when requested
 - Replace as400 with os400 for OS/400 support [Monnerat]
 - Add crc32_z() and adler32_z() functions with size_t lengths
 - Update Visual Studio project files [AraHaan]
 Changes in 1.2.8 (28 Apr 2013)
 - Update contrib/minizip/iowin32.c for Windows RT [Vollant]
 - Do not force Z_CONST for C++
 - Clean up contrib/vstudio [Roß]
 - Correct spelling error in zlib.h
 - Fix mixed line endings in contrib/vstudio
 Changes in 1.2.7.3 (13 Apr 2013)
 - Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
 Changes in 1.2.7.2 (13 Apr 2013)
 - Change check for a four-byte type back to hexadecimal
 - Fix typo in win32/Makefile.msc
 - Add casts in gzwrite.c for pointer differences
 Changes in 1.2.7.1 (24 Mar 2013)
 - Replace use of unsafe string functions with snprintf if available
 - Avoid including stddef.h on Windows for Z_SOLO compile [Niessink]
 - Fix gzgetc undefine when Z_PREFIX set [Turk]
 - Eliminate use of mktemp in Makefile (not always available)
 - Fix bug in 'F' mode for gzopen()
 - Add inflateGetDictionary() function
 - Correct comment in deflate.h
 - Use _snprintf for snprintf in Microsoft C
 - On Darwin, only use /usr/bin/libtool if libtool is not Apple
 - Delete "--version" file if created by "ar --version" [Richard G.]
 - Fix configure check for veracity of compiler error return codes
 - Fix CMake compilation of static lib for MSVC2010 x64
 - Remove unused variable in infback9.c
 - Fix argument checks in gzlog_compress() and gzlog_write()
 - Clean up the usage of z_const and respect const usage within zlib
 - Clean up examples/gzlog.[ch] comparisons of different types
 - Avoid shift equal to bits in type (caused endless loop)
 - Fix uninitialized value bug in gzputc() introduced by const patches
 - Fix memory allocation error in examples/zran.c [Nor]
 - Fix bug where gzopen(), gzclose() would write an empty file
 - Fix bug in gzclose() when gzwrite() runs out of memory
 - Check for input buffer malloc failure in examples/gzappend.c
 - Add note to contrib/blast to use binary mode in stdio
 - Fix comparisons of differently signed integers in contrib/blast
 - Check for invalid code length codes in contrib/puff
 - Fix serious but very rare decompression bug in inftrees.c
 - Update inflateBack() comments, since inflate() can be faster
 - Use underscored I/O function names for WINAPI_FAMILY
 - Add _tr_flush_bits to the external symbols prefixed by --zprefix
 - Add contrib/vstudio/vc10 pre-build step for static only
 - Quote --version-script argument in CMakeLists.txt
 - Don't specify --version-script on Apple platforms in CMakeLists.txt
 - Fix casting error in contrib/testzlib/testzlib.c
 - Fix types in contrib/minizip to match result of get_crc_table()
 - Simplify contrib/vstudio/vc10 with 'd' suffix
 - Add TOP support to win32/Makefile.msc
 - Suport i686 and amd64 assembler builds in CMakeLists.txt
 - Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h
 - Add vc11 and vc12 build files to contrib/vstudio
 - Add gzvprintf() as an undocumented function in zlib
 - Fix configure for Sun shell
 - Remove runtime check in configure for four-byte integer type
 - Add casts and consts to ease user conversion to C++
 - Add man pages for minizip and miniunzip
 - In Makefile uninstall, don't rm if preceding cd fails
 - Do not return Z_BUF_ERROR if deflateParam() has nothing to write
 Changes in 1.2.7 (2 May 2012)
 - Replace use of memmove() with a simple copy for portability
@ -156,7 +237,7 @@ Changes in 1.2.5.2 (17 Dec 2011)
 - Add a transparent write mode to gzopen() when 'T' is in the mode
 - Update python link in zlib man page
 - Get inffixed.h and MAKEFIXED result to match
- Add a ./config --solo option to make zlib subset with no libary use
+- Add a ./config --solo option to make zlib subset with no library use
 - Add undocumented inflateResetKeep() function for CAB file decoding
 - Add --cover option to ./configure for gcc coverage testing
 - Add #define ZLIB_CONST option to use const in the z_stream interface
@ -526,7 +607,7 @@ Changes in 1.2.3.1 (16 August 2006)
 - Update make_vms.com [Zinser]
 - Use -fPIC for shared build in configure [Teredesai, Nicholson]
 - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
- Use fdopen() (not _fdopen()) for Interix in zutil.h [BŠck]
+- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
 - Add some FAQ entries about the contrib directory
 - Update the MVS question in the FAQ
 - Avoid extraneous reads after EOF in gzio.c [Brown]
@ -1140,7 +1221,7 @@ Changes in 1.0.6 (19 Jan 1998)
        386 asm code replacing longest_match().
   contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
        A C++ I/O streams interface to the zlib gz* functions
-   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
+   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
        Another C++ I/O streams interface
   contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
        A very simple tar.gz file extractor using zlib
@ -1229,7 +1310,7 @@ Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
 - fix array overlay in deflate.c which sometimes caused bad compressed data
 - fix inflate bug with empty stored block
 - fix MSDOS medium model which was broken in 0.99
- fix deflateParams() which could generated bad compressed data.
+- fix deflateParams() which could generate bad compressed data.
 - Bytef is define'd instead of typedef'ed (work around Borland bug)
 - added an INDEX file
 - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
--- a/extern/zlib/README
+++ b/extern/zlib/README
@ -1,16 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
-!!!!
+zlib 1.2.11 is a general purpose data compression library.  All the code is
 !!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
 !!!! distribution. This altered source distribution is NOT supported by the
 !!!! original creators Jean-loup Gailly and Mark Adler.
 !!!!
 !!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
 !!!! The purpose of the changes made herein were to specifically address
 !!!! compiler errors and warnings in a Microsoft Windows build environment.
 !!!!
 zlib 1.2.7 is a general purpose data compression library.  All the code is
 thread safe.  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 (zlib format), rfc1951 (deflate format) and
@ -41,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
 issue of Dr.  Dobb's Journal; a copy of the article is available at
 http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.7 are documented in the file ChangeLog.
+The changes made in version 1.2.11 are documented in the file ChangeLog.
 Unsupported third party contributions are provided in directory contrib/ .
@ -94,7 +84,7 @@ Acknowledgments:
 Copyright notice:
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ (C) 1995-2017 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
--- a/extern/zlib/adler32.c
+++ b/extern/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-2011, 2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -7,11 +7,9 @@
 #include "zutil.h"
 #define local static
 local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-#define BASE 65521      /* largest prime smaller than 65536 */
+#define BASE 65521U     /* 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 */
@ -62,14 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #endif
 /* ========================================================================= */
-#ifdef WIN32
+uLong ZEXPORT adler32_z(adler, buf, len)
 uLong ZEXPORT adler32(uLong adler, const Bytef* buf, uInt len)
 #else
 uLong ZEXPORT adler32(adler, buf, len)
    uLong adler;
    const Bytef *buf;
-uInt len;
+    z_size_t len;
 #endif
 {
    unsigned long sum2;
    unsigned n;
@ -79,18 +73,13 @@ uInt len;
    adler &= 0xffff;
    /* in case user likes doing a byte at a time, keep it fast */
-    if (len == 1)
+    if (len == 1) {
    {
        adler += buf[0];
        if (adler >= BASE)
            adler -= BASE;
        sum2 += adler;
        if (sum2 >= BASE)
            sum2 -= BASE;
        return adler | (sum2 << 16);
    }
@ -99,54 +88,40 @@ uInt len;
        return 1L;
    /* in case short lengths are provided, keep it somewhat fast */
-    if (len < 16)
+    if (len < 16) {
-    {
+        while (len--) {
        while (len--)
        {
            adler += *buf++;
            sum2 += adler;
        }
        if (adler >= BASE)
            adler -= BASE;
        MOD28(sum2);            /* only added so many BASE's */
        return adler | (sum2 << 16);
    }
    /* do length NMAX blocks -- requires just one modulo operation */
-    while (len >= NMAX)
+    while (len >= NMAX) {
    {
        len -= NMAX;
        n = NMAX / 16;          /* NMAX is divisible by 16 */
-
+        do {
        do
        {
            DO16(buf);          /* 16 sums unrolled */
            buf += 16;
-        }
+        } while (--n);
        while (--n);
        MOD(adler);
        MOD(sum2);
    }
    /* do remaining bytes (less than NMAX, still just one modulo) */
-    if (len)                    /* avoid modulos if none remaining */
+    if (len) {                  /* avoid modulos if none remaining */
-    {
+        while (len >= 16) {
        while (len >= 16)
        {
            len -= 16;
            DO16(buf);
            buf += 16;
        }
-
+        while (len--) {
        while (len--)
        {
            adler += *buf++;
            sum2 += adler;
        }
        MOD(adler);
        MOD(sum2);
    }
@ -156,14 +131,19 @@ uInt len;
 }
 /* ========================================================================= */
-#ifdef WIN32
+uLong ZEXPORT adler32(adler, buf, len)
-local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2)
+    uLong adler;
-#else
+    const Bytef *buf;
    uInt len;
 {
    return adler32_z(adler, buf, len);
 }
 /* ========================================================================= */
 local uLong adler32_combine_(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off64_t len2;
 #endif
 {
    unsigned long sum1;
    unsigned long sum2;
@ -181,39 +161,26 @@ z_off64_t len2;
    MOD(sum2);
    sum1 += (adler2 & 0xffff) + BASE - 1;
    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
    if (sum1 >= BASE) sum1 -= BASE;
    if (sum1 >= BASE) sum1 -= BASE;
-
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
    if (sum2 >= BASE) sum2 -= BASE;
    return sum1 | (sum2 << 16);
 }
 /* ========================================================================= */
 #ifdef WIN32
 uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2)
 #else
 uLong ZEXPORT adler32_combine(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off_t len2;
 #endif
 {
    return adler32_combine_(adler1, adler2, len2);
 }
 #ifdef WIN32
 uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2)
 #else
 uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
    uLong adler1;
    uLong adler2;
    z_off64_t len2;
 #endif
 {
    return adler32_combine_(adler1, adler2, len2);
 }
--- a/extern/zlib/compress.c
+++ b/extern/zlib/compress.c
@ -1,5 +1,5 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -19,66 +19,57 @@
   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
   Z_STREAM_ERROR if the level parameter is invalid.
 */
 #ifdef WIN32
 int ZEXPORT compress2(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen, int level)
 #else
 int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
    uLong sourceLen;
    int level;
 #endif
 {
    z_stream stream;
    int err;
    const uInt max = (uInt)-1;
    uLong left;
-    stream.next_in = (Bytef*)source;
+    left = *destLen;
-    stream.avail_in = (uInt)sourceLen;
+    *destLen = 0;
 #ifdef MAXSEG_64K
    /* Check for source > 64K on 16-bit machine: */
    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
 #endif
    stream.next_out = dest;
    stream.avail_out = (uInt) * destLen;
    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
    stream.zalloc = (alloc_func)0;
    stream.zfree = (free_func)0;
    stream.opaque = (voidpf)0;
    err = deflateInit(&stream, level);
    if (err != Z_OK) return err;
-    err = deflate(&stream, Z_FINISH);
+    stream.next_out = dest;
    stream.avail_out = 0;
    stream.next_in = (z_const Bytef *)source;
    stream.avail_in = 0;
-    if (err != Z_STREAM_END)
+    do {
-    {
+        if (stream.avail_out == 0) {
-        deflateEnd(&stream);
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
-        return err == Z_OK ? Z_BUF_ERROR : err;
+            left -= stream.avail_out;
        }
        if (stream.avail_in == 0) {
            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
            sourceLen -= stream.avail_in;
        }
        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
    } while (err == Z_OK);
    *destLen = stream.total_out;
-
+    deflateEnd(&stream);
-    err = deflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK : err;
    return err;
 }
 /* ===========================================================================
 */
 #ifdef WIN32
 int ZEXPORT compress(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
 #else
 int ZEXPORT compress (dest, destLen, source, sourceLen)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
    uLong sourceLen;
 #endif
 {
    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
@ -87,12 +78,8 @@ uLong sourceLen;
     If the default memLevel or windowBits for deflateInit() is changed, then
   this function needs to be updated.
 */
 #ifdef WIN32
 uLong ZEXPORT compressBound(uLong sourceLen)
 #else
 uLong ZEXPORT compressBound (sourceLen)
    uLong sourceLen;
 #endif
 {
    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
           (sourceLen >> 25) + 13;
--- a/extern/zlib/crc32.c
+++ b/extern/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, 2011, 2012, 2016 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
@ -30,17 +30,15 @@
 #include "zutil.h"      /* for STDC and FAR definitions */
 #define local static
 /* Definitions for doing the crc four data bytes at a time. */
 #if !defined(NOBYFOUR) && defined(Z_U4)
 #  define BYFOUR
 #endif
 #ifdef BYFOUR
   local unsigned long crc32_little OF((unsigned long,
-                                     const unsigned char FAR*, unsigned));
+                        const unsigned char FAR *, z_size_t));
   local unsigned long crc32_big OF((unsigned long,
-                                  const unsigned char FAR*, unsigned));
+                        const unsigned char FAR *, z_size_t));
 #  define TBLS 8
 #else
 #  define TBLS 1
@ -99,50 +97,39 @@ local void make_crc_table()
    /* See if another task is already doing this (not thread-safe, but better
       than nothing -- significantly reduces duration of vulnerability in
       case the advice about DYNAMIC_CRC_TABLE is ignored) */
-    if (first)
+    if (first) {
    {
        first = 0;
        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
        poly = 0;
        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
            poly |= (z_crc_t)1 << (31 - p[n]);
        /* generate a crc for every 8-bit value */
-        for (n = 0; n < 256; n++)
+        for (n = 0; n < 256; n++) {
        {
            c = (z_crc_t)n;
            for (k = 0; k < 8; k++)
                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
            crc_table[0][n] = c;
        }
 #ifdef BYFOUR
        /* generate crc for each value followed by one, two, and three zeros,
           and then the byte reversal of those as well as the first table */
-        for (n = 0; n < 256; n++)
+        for (n = 0; n < 256; n++) {
        {
            c = crc_table[0][n];
            crc_table[4][n] = ZSWAP32(c);
-
+            for (k = 1; k < 4; k++) {
            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);
            }
        }
 #endif /* BYFOUR */
        crc_table_empty = 0;
    }
-    else        /* not first */
+    else {      /* not first */
    {
        /* wait for the other guy to finish (not efficient, but rare) */
        while (crc_table_empty)
            ;
@ -154,9 +141,7 @@ local void make_crc_table()
        FILE *out;
        out = fopen("crc32.h", "w");
        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 ");
@ -164,13 +149,10 @@ local void make_crc_table()
        write_table(out, crc_table[0]);
 #  ifdef BYFOUR
        fprintf(out, "#ifdef BYFOUR\n");
-
+        for (k = 1; k < 8; k++) {
        for (k = 1; k < 8; k++)
        {
            fprintf(out, "  },\n  {\n");
            write_table(out, crc_table[k]);
        }
        fprintf(out, "#endif\n");
 #  endif /* BYFOUR */
        fprintf(out, "  }\n};\n");
@ -206,10 +188,8 @@ const z_crc_t FAR* table;
 const z_crc_t 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;
 }
@ -219,65 +199,63 @@ const z_crc_t FAR* ZEXPORT get_crc_table()
 #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
 /* ========================================================================= */
-#ifdef WIN32
+unsigned long ZEXPORT crc32_z(crc, buf, len)
 unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR* buf, uInt len)
 #else
 unsigned long ZEXPORT crc32(crc, buf, len)
    unsigned long crc;
    const unsigned char FAR *buf;
-uInt len;
+    z_size_t len;
 #endif
 {
    if (buf == Z_NULL) return 0UL;
 #ifdef DYNAMIC_CRC_TABLE
    if (crc_table_empty)
        make_crc_table();
 #endif /* DYNAMIC_CRC_TABLE */
 #ifdef BYFOUR
-#ifdef WIN32
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
    int size_match = (sizeof(void*) == sizeof(ptrdiff_t));
    if (size_match)
    {
 #else
    if (sizeof(void*) == sizeof(ptrdiff_t))
    {
 #endif /* WIN32 */
        z_crc_t endian;
        endian = 1;
        if (*((unsigned char *)(&endian)))
            return crc32_little(crc, buf, len);
        else
            return crc32_big(crc, buf, len);
    }
 #endif /* BYFOUR */
    crc = crc ^ 0xffffffffUL;
-
+    while (len >= 8) {
    while (len >= 8)
    {
        DO8;
        len -= 8;
    }
-
+    if (len) do {
    if (len) do
        {
        DO1;
-        }
+    } while (--len);
        while (--len);
    return crc ^ 0xffffffffUL;
 }
 /* ========================================================================= */
 unsigned long ZEXPORT crc32(crc, buf, len)
    unsigned long crc;
    const unsigned char FAR *buf;
    uInt len;
 {
    return crc32_z(crc, buf, len);
 }
 #ifdef BYFOUR
 /*
   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
   integer pointer type. This violates the strict aliasing rule, where a
   compiler can assume, for optimization purposes, that two pointers to
   fundamentally different types won't ever point to the same memory. This can
   manifest as a problem only if one of the pointers is written to. This code
   only reads from those pointers. So long as this code remains isolated in
   this compilation unit, there won't be a problem. For this reason, this code
   should not be copied and pasted into a compilation unit in which other code
   writes to the buffer that is passed to these routines.
 */
 /* ========================================================================= */
 #define DOLIT4 c ^= *buf4++; \
        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
@ -285,105 +263,75 @@ uInt len;
 #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
 /* ========================================================================= */
 #ifdef WIN32
 local unsigned long crc32_little(unsigned long crc, const unsigned char FAR* buf, unsigned len)
 #else
 local unsigned long crc32_little(crc, buf, len)
    unsigned long crc;
    const unsigned char FAR *buf;
-unsigned len;
+    z_size_t len;
 #endif
 {
    register z_crc_t c;
    register const z_crc_t FAR *buf4;
    c = (z_crc_t)crc;
    c = ~c;
-
+    while (len && ((ptrdiff_t)buf & 3)) {
    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;
-
+    while (len >= 32) {
    while (len >= 32)
    {
        DOLIT32;
        len -= 32;
    }
-
+    while (len >= 4) {
    while (len >= 4)
    {
        DOLIT4;
        len -= 4;
    }
    buf = (const unsigned char FAR *)buf4;
-    if (len) do
+    if (len) do {
        {
        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
-        }
+    } while (--len);
        while (--len);
    c = ~c;
    return (unsigned long)c;
 }
 /* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
+#define DOBIG4 c ^= *buf4++; \
        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
 #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
 /* ========================================================================= */
 #ifdef WIN32
 local unsigned long crc32_big(unsigned long crc, const unsigned char FAR* buf, unsigned len)
 #else
 local unsigned long crc32_big(crc, buf, len)
    unsigned long crc;
    const unsigned char FAR *buf;
-unsigned len;
+    z_size_t len;
 #endif
 {
    register z_crc_t c;
    register const z_crc_t FAR *buf4;
    c = ZSWAP32((z_crc_t)crc);
    c = ~c;
-
+    while (len && ((ptrdiff_t)buf & 3)) {
    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--;
+    while (len >= 32) {
    while (len >= 32)
    {
        DOBIG32;
        len -= 32;
    }
-
+    while (len >= 4) {
    while (len >= 4)
    {
        DOBIG4;
        len -= 4;
    }
    buf4++;
    buf = (const unsigned char FAR *)buf4;
-    if (len) do
+    if (len) do {
        {
        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
-        }
+    } while (--len);
        while (--len);
    c = ~c;
    return (unsigned long)(ZSWAP32(c));
 }
@ -393,38 +341,26 @@ unsigned len;
 #define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
 /* ========================================================================= */
 #ifdef WIN32
 local unsigned long gf2_matrix_times(unsigned long* mat, unsigned long vec)
 #else
 local unsigned long gf2_matrix_times(mat, vec)
    unsigned long *mat;
    unsigned long vec;
 #endif
 {
    unsigned long sum;
    sum = 0;
-
+    while (vec) {
    while (vec)
    {
        if (vec & 1)
            sum ^= *mat;
        vec >>= 1;
        mat++;
    }
    return sum;
 }
 /* ========================================================================= */
 #ifdef WIN32
 local void gf2_matrix_square(unsigned long* square, unsigned long* mat)
 #else
 local void gf2_matrix_square(square, mat)
    unsigned long *square;
    unsigned long *mat;
 #endif
 {
    int n;
@ -433,14 +369,10 @@ unsigned long* mat;
 }
 /* ========================================================================= */
 #ifdef WIN32
 local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2)
 #else
 local uLong crc32_combine_(crc1, crc2, len2)
    uLong crc1;
    uLong crc2;
    z_off64_t len2;
 #endif
 {
    int n;
    unsigned long row;
@ -454,9 +386,7 @@ z_off64_t len2;
    /* put operator for one zero bit in odd */
    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
    row = 1;
-
+    for (n = 1; n < GF2_DIM; n++) {
    for (n = 1; n < GF2_DIM; n++)
    {
        odd[n] = row;
        row <<= 1;
    }
@ -469,14 +399,11 @@ z_off64_t len2;
    /* apply len2 zeros to crc1 (first square will put the operator for one
       zero byte, eight zero bits, in even) */
-    do
+    do {
    {
        /* apply zeros operator for this bit of len2 */
        gf2_matrix_square(even, odd);
        if (len2 & 1)
            crc1 = gf2_matrix_times(even, crc1);
        len2 >>= 1;
        /* if no more bits set, then done */
@ -485,15 +412,12 @@ z_off64_t len2;
        /* another iteration of the loop with odd and even swapped */
        gf2_matrix_square(odd, even);
        if (len2 & 1)
            crc1 = gf2_matrix_times(odd, crc1);
        len2 >>= 1;
        /* if no more bits set, then done */
-    }
+    } while (len2 != 0);
    while (len2 != 0);
    /* return combined crc */
    crc1 ^= crc2;
@ -501,26 +425,18 @@ z_off64_t len2;
 }
 /* ========================================================================= */
 #ifdef WIN32
 uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2)
 #else
 uLong ZEXPORT crc32_combine(crc1, crc2, len2)
    uLong crc1;
    uLong crc2;
    z_off_t len2;
 #endif
 {
    return crc32_combine_(crc1, crc2, len2);
 }
 #ifdef WIN32
 uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2)
 #else
 uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
    uLong crc1;
    uLong crc2;
    z_off64_t len2;
 #endif
 {
    return crc32_combine_(crc1, crc2, len2);
 }
--- a/extern/zlib/deflate.c
+++ b/extern/zlib/deflate.c
--- a/extern/zlib/deflate.h
+++ b/extern/zlib/deflate.h
@ -1,5 +1,5 @@
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2012 Jean-loup Gailly
+ * Copyright (C) 1995-2016 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -51,26 +51,26 @@
 #define Buf_size 16
 /* size of bit buffer in bi_buf */
-#define INIT_STATE    42
+#define INIT_STATE    42    /* zlib header -> BUSY_STATE */
-#define EXTRA_STATE   69
+#ifdef GZIP
-#define NAME_STATE    73
+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */
-#define COMMENT_STATE 91
+#endif
-#define HCRC_STATE   103
+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */
-#define BUSY_STATE   113
+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */
-#define FINISH_STATE 666
+#define COMMENT_STATE 91    /* gzip comment -> HCRC_STATE */
 #define HCRC_STATE   103    /* gzip header CRC -> BUSY_STATE */
 #define BUSY_STATE   113    /* deflate -> FINISH_STATE */
 #define FINISH_STATE 666    /* stream complete */
 /* Stream status */
 /* Data structure describing a single value and its code string. */
-typedef struct ct_data_s
+typedef struct ct_data_s {
-{
+    union {
    union
    {
        ush  freq;       /* frequency count */
        ush  code;       /* bit string */
    } fc;
-    union
+    union {
    {
        ush  dad;        /* father node in Huffman tree */
        ush  len;        /* length of bit string */
    } dl;
@ -83,11 +83,10 @@ typedef struct ct_data_s
 typedef struct static_tree_desc_s  static_tree_desc;
-typedef struct tree_desc_s
+typedef struct tree_desc_s {
 {
    ct_data *dyn_tree;           /* the dynamic tree */
    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc* stat_desc; /* the corresponding static tree */
+    const static_tree_desc *stat_desc;  /* the corresponding static tree */
 } FAR tree_desc;
 typedef ush Pos;
@ -98,18 +97,17 @@ typedef unsigned IPos;
 * save space in the various tables. IPos is used only for parameter passing.
 */
-typedef struct internal_state
+typedef struct internal_state {
 {
    z_streamp strm;      /* pointer back to this zlib stream */
    int   status;        /* as the name implies */
    Bytef *pending_buf;  /* output still pending */
    ulg   pending_buf_size; /* size of pending_buf */
    Bytef *pending_out;  /* next pending byte to output to the stream */
-    uInt   pending;      /* nb of bytes in the pending buffer */
+    ulg   pending;       /* nb of bytes in the pending buffer */
    int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
    gz_headerp  gzhead;  /* gzip header information to write */
-    uInt   gzindex;      /* where in extra, name, or comment */
+    ulg   gzindex;       /* where in extra, name, or comment */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
+    Byte  method;        /* can only be DEFLATED */
    int   last_flush;    /* value of flush param for previous deflate call */
                /* used by deflate.c: */
@ -254,7 +252,7 @@ typedef struct internal_state
    uInt matches;       /* number of string matches in current block */
    uInt insert;        /* bytes at end of window left to insert */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
 #endif
@ -280,7 +278,7 @@ typedef struct internal_state
 /* Output a byte on the stream.
 * IN assertion: there is enough room in pending_buf.
 */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
+#define put_byte(s, c) {s->pending_buf[s->pending++] = (Bytef)(c);}
 #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
@ -314,7 +312,7 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state* s, charf* buf,
 * used.
 */
-#ifndef DEBUG
+#ifndef ZLIB_DEBUG
 /* Inline versions of _tr_tally for speed: */
 #if defined(GEN_TREES_H) || !defined(STDC)
@ -333,8 +331,8 @@ extern const uch ZLIB_INTERNAL _dist_code[];
    flush = (s->last_lit == s->lit_bufsize-1); \
   }
 # define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
+  { uch len = (uch)(length); \
-    ush dist = (distance); \
+    ush dist = (ush)(distance); \
    s->d_buf[s->last_lit] = dist; \
    s->l_buf[s->last_lit++] = len; \
    dist--; \
--- a/extern/zlib/gzclose.c
+++ b/extern/zlib/gzclose.c
@ -8,19 +8,14 @@
 /* gzclose() is in a separate file so that it is linked in only if it is used.
   That way the other gzclose functions can be used instead to avoid linking in
   unneeded compression or decompression routines. */
 #ifdef WIN32
 int ZEXPORT gzclose(gzFile file)
 #else
 int ZEXPORT gzclose(file)
    gzFile file;
 #endif
 {
 #ifndef NO_GZCOMPRESS
    gz_statep state;
    if (file == NULL)
        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file);
--- a/extern/zlib/gzguts.h
+++ b/extern/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, 2011, 2012, 2013, 2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -25,6 +25,10 @@
 #  include <stdlib.h>
 #  include <limits.h>
 #endif
 #ifndef _POSIX_SOURCE
 #  define _POSIX_SOURCE
 #endif
 #include <fcntl.h>
 #ifdef _WIN32
@ -35,6 +39,17 @@
 #  include <io.h>
 #endif
 #if defined(_WIN32) || defined(__CYGWIN__)
 #  define WIDECHAR
 #endif
 #ifdef WINAPI_FAMILY
 #  define open _open
 #  define read _read
 #  define write _write
 #  define close _close
 #endif
 #ifdef NO_DEFLATE       /* for compatibility with old definition */
 #  define NO_GZCOMPRESS
 #endif
@ -67,11 +82,6 @@
 #    define NO_vsnprintf
 #  endif
 #  ifdef WIN32
 /* In Win32, rename/redefine deprecated functions. */
 #    define close _close
 #    define open  _open
 #    define read  _read
 #    define write _write
 /* 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 )
@ -93,10 +103,19 @@
 #  endif
 #endif
 /* unlike snprintf (which is required in C99), _snprintf does not guarantee
   null termination of the result -- however this is only used in gzlib.c where
   the result is assured to fit in the space provided */
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
   define "local" for the non-static meaning of "static", for readability
   (compile with -Dlocal if your debugger can't find static symbols) */
 /* gz* functions always use library allocation functions */
 #ifndef STDC
@ -132,7 +151,8 @@ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
 #  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
 #endif
-/* default i/o buffer size -- double this for output when reading */
+/* default i/o buffer size -- double this for output when reading (this and
   twice this must be able to fit in an unsigned type) */
 #define GZBUFSIZE 8192
 /* gzip modes, also provide a little integrity check on the passed structure */
@ -147,8 +167,7 @@ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
 #define GZIP 2      /* decompress a gzip stream */
 /* internal gzip file state data structure */
-typedef struct
+typedef struct {
 {
        /* exposed contents for gzgetc() macro */
    struct gzFile_s x;      /* "x" for exposed */
                            /* x.have: number of bytes available at x.next */
@ -160,7 +179,7 @@ typedef struct
    char *path;             /* path or fd for error messages */
    unsigned size;          /* buffer size, zero if not allocated yet */
    unsigned want;          /* requested buffer size, default is GZBUFSIZE */
-    unsigned char* in;      /* input buffer */
+    unsigned char *in;      /* input buffer (double-sized when writing) */
    unsigned char *out;     /* output buffer (double-sized when reading) */
    int direct;             /* 0 if processing gzip, 1 if transparent */
        /* just for reading */
--- a/extern/zlib/gzlib.c
+++ b/extern/zlib/gzlib.c
@ -1,11 +1,11 @@
 /* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
+ * Copyright (C) 2004-2017 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
 #include "gzguts.h"
-#if defined(_WIN32) && !defined(__BORLANDC__)
+#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
 #  define LSEEK _lseeki64
 #else
 #if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
@ -45,19 +45,15 @@ DWORD error;
        (LPVOID)&msgbuf,
        0,
        NULL);
-
+    if (chars != 0) {
    if (chars != 0)
    {
        /* If there is an \r\n appended, zap it.  */
        if (chars >= 2
-                && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n')
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
        {
            chars -= 2;
            msgbuf[chars] = 0;
        }
-        if (chars > sizeof(buf) - 1)
+        if (chars > sizeof (buf) - 1) {
        {
            chars = sizeof (buf) - 1;
            msgbuf[chars] = 0;
        }
@ -65,8 +61,7 @@ DWORD error;
        wcstombs(buf, msgbuf, chars + 1);
        LocalFree(msgbuf);
    }
-    else
+    else {
    {
        sprintf(buf, "unknown win32 error (%ld)", error);
    }
@ -77,22 +72,15 @@ DWORD error;
 #endif /* UNDER_CE */
 /* Reset gzip file state */
 #ifdef WIN32
 local void gz_reset(gz_statep state)
 #else
 local void gz_reset(state)
    gz_statep state;
 #endif
 {
    state->x.have = 0;              /* no output data available */
-
+    if (state->mode == GZ_READ) {   /* for reading ... */
    if (state->mode == GZ_READ)     /* for reading ... */
    {
        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->seek = 0;                /* no seek request pending */
    gz_error(state, Z_OK, NULL);    /* clear error */
    state->x.pos = 0;               /* no uncompressed data yet */
@ -100,17 +88,13 @@ gz_statep state;
 }
 /* Open a gzip file either by name or file descriptor. */
 #ifdef WIN32
 local gzFile gz_open(const void* path, int fd, const char* mode)
 #else
 local gzFile gz_open(path, fd, mode)
    const void *path;
    int fd;
    const char *mode;
 #endif
 {
    gz_statep state;
-    size_t len;
+    z_size_t len;
    int oflag;
 #ifdef O_CLOEXEC
    int cloexec = 0;
@ -124,11 +108,9 @@ const char* mode;
        return NULL;
    /* allocate gzFile structure to return */
-    state = malloc(sizeof(gz_state));
+    state = (gz_statep)malloc(sizeof(gz_state));
    if (state == NULL)
        return NULL;
    state->size = 0;            /* no buffers allocated yet */
    state->want = GZBUFSIZE;    /* requested buffer size */
    state->msg = NULL;          /* no error message yet */
@ -138,115 +120,89 @@ const char* mode;
    state->level = Z_DEFAULT_COMPRESSION;
    state->strategy = Z_DEFAULT_STRATEGY;
    state->direct = 0;
-
+    while (*mode) {
    while (*mode)
    {
        if (*mode >= '0' && *mode <= '9')
            state->level = *mode - '0';
        else
-            switch (*mode)
+            switch (*mode) {
            {
            case 'r':
                state->mode = GZ_READ;
                break;
 #ifndef NO_GZCOMPRESS
            case 'w':
                state->mode = GZ_WRITE;
                break;
            case 'a':
                state->mode = GZ_APPEND;
                break;
 #endif
            case '+':       /* can't read and write at the same time */
                free(state);
                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;
            case 'h':
                state->strategy = Z_HUFFMAN_ONLY;
                break;
            case 'R':
                state->strategy = Z_RLE;
                break;
            case 'F':
                state->strategy = Z_FIXED;
-
+                break;
            case 'T':
                state->direct = 1;
-
+                break;
            default:        /* could consider as an error, but just ignore */
                ;
            }
        mode++;
    }
    /* must provide an "r", "w", or "a" */
-    if (state->mode == GZ_NONE)
+    if (state->mode == GZ_NONE) {
    {
        free(state);
        return NULL;
    }
    /* can't force transparent read */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
-    {
+        if (state->direct) {
        if (state->direct)
        {
            free(state);
            return NULL;
        }
        state->direct = 1;      /* for empty file */
    }
    /* save the path name for error messages */
-#ifdef _WIN32
+#ifdef WIDECHAR
-
+    if (fd == -2) {
    if (fd == -2)
    {
        len = wcstombs(NULL, path, 0);
-
+        if (len == (z_size_t)-1)
        if (len == (size_t) - 1)
            len = 0;
    }
    else
 #endif
-        len = strlen(path);
+        len = strlen((const char *)path);
-
+    state->path = (char *)malloc(len + 1);
-    state->path = malloc(len + 1);
+    if (state->path == NULL) {
    if (state->path == NULL)
    {
        free(state);
        return NULL;
    }
-
+#ifdef WIDECHAR
 #ifdef _WIN32
    if (fd == -2)
        if (len)
            wcstombs(state->path, path, len + 1);
@ -254,7 +210,11 @@ const char* mode;
            *(state->path) = 0;
    else
 #endif
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
        (void)snprintf(state->path, len + 1, "%s", (const char *)path);
 #else
        strcpy(state->path, path);
 #endif
    /* compute the flags for open() */
    oflag =
@ -279,26 +239,23 @@ const char* mode;
    /* open the file with the appropriate flags (or just use fd) */
    state->fd = fd > -1 ? fd : (
-#ifdef _WIN32
+#ifdef WIDECHAR
        fd == -2 ? _wopen(path, oflag, 0666) :
 #endif
-                    open(path, oflag, 0666));
+        open((const char *)path, oflag, 0666));
-
+    if (state->fd == -1) {
    if (state->fd == -1)
    {
        free(state->path);
        free(state);
        return NULL;
    }
-
+    if (state->mode == GZ_APPEND) {
-    if (state->mode == GZ_APPEND)
+        LSEEK(state->fd, 0, SEEK_END);  /* so gzoffset() is correct */
        state->mode = GZ_WRITE;         /* simplify later checks */
    }
    /* save the current position for rewinding (only if reading) */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
    {
        state->start = LSEEK(state->fd, 0, SEEK_CUR);
        if (state->start == -1) state->start = 0;
    }
@ -310,79 +267,62 @@ const char* mode;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 gzFile ZEXPORT gzopen(const char* path, const char* mode)
 #else
 gzFile ZEXPORT gzopen(path, mode)
    const char *path;
    const char *mode;
 #endif
 {
    return gz_open(path, -1, mode);
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 gzFile ZEXPORT gzopen64(const char* path, const char* mode)
 #else
 gzFile ZEXPORT gzopen64(path, mode)
    const char *path;
    const char *mode;
 #endif
 {
    return gz_open(path, -1, mode);
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 gzFile ZEXPORT gzdopen(int fd, const char* mode)
 #else
 gzFile ZEXPORT gzdopen(fd, mode)
    int fd;
    const char *mode;
 #endif
 {
    char *path;         /* identifier for error messages */
    gzFile gz;
-    if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+    if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL)
        return NULL;
-
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
    (void)snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd);
 #else
    sprintf(path, "<fd:%d>", fd);   /* for debugging */
 #endif
    gz = gz_open(path, fd, mode);
    free(path);
    return gz;
 }
 /* -- see zlib.h -- */
-#ifdef _WIN32
+#ifdef WIDECHAR
 gzFile ZEXPORT gzopen_w(const wchar_t* path, const char* mode)
 #else
 gzFile ZEXPORT gzopen_w(path, mode)
    const wchar_t *path;
    const char *mode;
 #endif
 {
    return gz_open(path, -2, mode);
 }
 #endif
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzbuffer(gzFile file, unsigned size)
 #else
 int ZEXPORT gzbuffer(file, size)
    gzFile file;
    unsigned size;
 #endif
 {
    gz_statep state;
    /* get internal structure and check integrity */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return -1;
@ -391,27 +331,23 @@ unsigned size;
        return -1;
    /* check and set requested size */
    if ((size << 1) < size)
        return -1;              /* need to be able to double it */
    if (size < 2)
        size = 2;               /* need two bytes to check magic header */
    state->want = size;
    return 0;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzrewind(gzFile file)
 #else
 int ZEXPORT gzrewind(file)
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    /* check that we're reading and that there's no error */
@ -422,20 +358,15 @@ gzFile file;
    /* back up and start over */
    if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
        return -1;
    gz_reset(state);
    return 0;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off64_t ZEXPORT gzseek64(gzFile file, z_off64_t offset, int whence)
 #else
 z_off64_t ZEXPORT gzseek64(file, offset, whence)
    gzFile file;
    z_off64_t offset;
    int whence;
 #endif
 {
    unsigned n;
    z_off64_t ret;
@ -444,9 +375,7 @@ int whence;
    /* get internal structure and check integrity */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return -1;
@ -463,18 +392,14 @@ int whence;
        offset -= state->x.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->x.pos + offset >= 0) {
    {
        ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
        if (ret == -1)
            return -1;
        state->x.have = 0;
        state->eof = 0;
        state->past = 0;
@ -486,23 +411,18 @@ int whence;
    }
    /* calculate skip amount, rewinding if needed for back seek when reading */
-    if (offset < 0)
+    if (offset < 0) {
    {
        if (state->mode != GZ_READ)         /* writing -- can't go backwards */
            return -1;
        offset += state->x.pos;
        if (offset < 0)                     /* before start of file! */
            return -1;
        if (gzrewind(file) == -1)           /* rewind, then skip to offset */
            return -1;
    }
    /* if reading, skip what's in output buffer (one less gzgetc() check) */
-    if (state->mode == GZ_READ)
+    if (state->mode == GZ_READ) {
    {
        n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
            (unsigned)offset : state->x.have;
        state->x.have -= n;
@ -512,24 +432,18 @@ int whence;
    }
    /* request skip (if not zero) */
-    if (offset)
+    if (offset) {
    {
        state->seek = 1;
        state->skip = offset;
    }
    return state->x.pos + offset;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off_t ZEXPORT gzseek(gzFile file, z_off_t offset, int whence)
 #else
 z_off_t ZEXPORT gzseek(file, offset, whence)
    gzFile file;
    z_off_t offset;
    int whence;
 #endif
 {
    z_off64_t ret;
@ -538,21 +452,15 @@ int whence;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off64_t ZEXPORT gztell64(gzFile file)
 #else
 z_off64_t ZEXPORT gztell64(file)
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure and check integrity */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return -1;
@ -561,12 +469,8 @@ gzFile file;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off_t ZEXPORT gztell(gzFile file)
 #else
 z_off_t ZEXPORT gztell(file)
    gzFile file;
 #endif
 {
    z_off64_t ret;
@ -575,12 +479,8 @@ gzFile file;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off64_t ZEXPORT gzoffset64(gzFile file)
 #else
 z_off64_t ZEXPORT gzoffset64(file)
    gzFile file;
 #endif
 {
    z_off64_t offset;
    gz_statep state;
@ -588,31 +488,22 @@ gzFile file;
    /* get internal structure and check integrity */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return -1;
    /* compute and return effective offset in file */
    offset = LSEEK(state->fd, 0, SEEK_CUR);
    if (offset == -1)
        return -1;
    if (state->mode == GZ_READ)             /* reading */
        offset -= state->strm.avail_in;     /* don't count buffered input */
    return offset;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 z_off_t ZEXPORT gzoffset(gzFile file)
 #else
 z_off_t ZEXPORT gzoffset(file)
    gzFile file;
 #endif
 {
    z_off64_t ret;
@ -621,21 +512,15 @@ gzFile file;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzeof(gzFile file)
 #else
 int ZEXPORT gzeof(file)
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure and check integrity */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return 0;
@ -644,58 +529,44 @@ gzFile file;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 const char* ZEXPORT gzerror(gzFile file, int* errnum)
 #else
 const char * ZEXPORT gzerror(file, errnum)
    gzFile file;
    int *errnum;
 #endif
 {
    gz_statep state;
    /* get internal structure and check integrity */
    if (file == NULL)
        return NULL;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        return NULL;
    /* return error information */
    if (errnum != NULL)
        *errnum = state->err;
-
+    return state->err == Z_MEM_ERROR ? "out of memory" :
-    return state->msg == NULL ? "" : state->msg;
+                                       (state->msg == NULL ? "" : state->msg);
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 void ZEXPORT gzclearerr(gzFile file)
 #else
 void ZEXPORT gzclearerr(file)
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure and check integrity */
    if (file == NULL)
        return;
    state = (gz_statep)file;
    if (state->mode != GZ_READ && state->mode != GZ_WRITE)
        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);
 }
@ -705,21 +576,15 @@ gzFile file;
   memory).  Simply save the error message as a static string.  If there is an
   allocation failure constructing the error message, then convert the error to
   out of memory. */
 #ifdef WIN32
 void ZLIB_INTERNAL gz_error(gz_statep state, int err, const char* msg)
 #else
 void ZLIB_INTERNAL gz_error(state, err, msg)
    gz_statep state;
    int err;
    const char *msg;
 #endif
 {
    /* free previously allocated message and clear */
-    if (state->msg != NULL)
+    if (state->msg != NULL) {
    {
        if (state->err != Z_MEM_ERROR)
            free(state->msg);
        state->msg = NULL;
    }
@ -729,29 +594,27 @@ const char* msg;
    /* set error code, and if no message, then done */
    state->err = err;
    if (msg == NULL)
        return;
-    /* for an out of memory error, save as static string */
+    /* for an out of memory error, return literal string when requested */
    if (err == Z_MEM_ERROR)
    {
        state->msg = (char*)msg;
        return;
    }
    /* construct error message with path */
-    if ((state->msg = 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;
    }
-
+#if !defined(NO_snprintf) && !defined(NO_vsnprintf)
    (void)snprintf(state->msg, strlen(state->path) + strlen(msg) + 3,
                   "%s%s%s", state->path, ": ", msg);
 #else
    strcpy(state->msg, state->path);
    strcat(state->msg, ": ");
    strcat(state->msg, msg);
-    return;
+#endif
 }
 #ifndef INT_MAX
@ -764,15 +627,11 @@ unsigned ZLIB_INTERNAL gz_intmax()
    unsigned p, q;
    p = 1;
-
+    do {
    do
    {
        q = p;
        p <<= 1;
        p++;
-    }
+    } while (p > q);
    while (p > q);
    return q >> 1;
 }
 #endif
--- a/extern/zlib/gzread.c
+++ b/extern/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, 2011, 2012, 2013, 2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -12,45 +12,37 @@ local int gz_look OF((gz_statep));
 local int gz_decomp OF((gz_statep));
 local int gz_fetch OF((gz_statep));
 local int gz_skip OF((gz_statep, z_off64_t));
 local z_size_t gz_read OF((gz_statep, voidp, z_size_t));
 /* Use read() to load a buffer -- return -1 on error, otherwise 0.  Read from
   state->fd, and update state->eof, state->err, and state->msg as appropriate.
   This function needs to loop on read(), since read() is not guaranteed to
   read the number of bytes requested, depending on the type of descriptor. */
 #ifdef WIN32
 local int gz_load(gz_statep state, unsigned char* buf, unsigned len, unsigned* have)
 #else
 local int gz_load(state, buf, len, have)
    gz_statep state;
    unsigned char *buf;
    unsigned len;
    unsigned *have;
 #endif
 {
    int ret;
    unsigned get, max = ((unsigned)-1 >> 2) + 1;
    *have = 0;
-
+    do {
-    do
+        get = len - *have;
-    {
+        if (get > max)
-        ret = read(state->fd, buf + *have, len - *have);
+            get = max;
-
+        ret = read(state->fd, buf + *have, get);
        if (ret <= 0)
            break;
-
+        *have += (unsigned)ret;
-        *have += ret;
+    } while (*have < len);
-    }
+    if (ret < 0) {
    while (*have < len);
    if (ret < 0)
    {
        gz_error(state, Z_ERRNO, zstrerror());
        return -1;
    }
    if (ret == 0)
        state->eof = 1;
    return 0;
 }
@ -61,41 +53,29 @@ unsigned* have;
   If strm->avail_in != 0, then the current data is moved to the beginning of
   the input buffer, and then the remainder of the buffer is loaded with the
   available data from the input file. */
 #ifdef WIN32
 local int gz_avail(gz_statep state)
 #else
 local int gz_avail(state)
    gz_statep state;
 #endif
 {
    unsigned got;
    z_streamp strm = &(state->strm);
    if (state->err != Z_OK && state->err != Z_BUF_ERROR)
        return -1;
-
+    if (state->eof == 0) {
-    if (state->eof == 0)
+        if (strm->avail_in) {       /* copy what's there to the start */
-    {
+            unsigned char *p = state->in;
-        if (strm->avail_in)         /* copy what's there to the start */
+            unsigned const char *q = strm->next_in;
        {
            unsigned char* p = state->in, *q = strm->next_in;
            unsigned n = strm->avail_in;
-
+            do {
            do
            {
                *p++ = *q++;
            } while (--n);
        }
            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;
 }
@ -108,34 +88,22 @@ gz_statep state;
   case, all further file reads will be directly to either the output buffer or
   a user buffer.  If decompressing, the inflate state will be initialized.
   gz_look() will return 0 on success or -1 on failure. */
 #ifdef WIN32
 local int gz_look(gz_statep state)
 #else
 local int gz_look(state)
    gz_statep state;
 #endif
 {
    z_streamp strm = &(state->strm);
    /* allocate read buffers and inflate memory */
-    if (state->size == 0)
+    if (state->size == 0) {
    {
        /* allocate buffers */
-        state->in = malloc(state->want);
+        state->in = (unsigned char *)malloc(state->want);
-        state->out = malloc(state->want << 1);
+        state->out = (unsigned char *)malloc(state->want << 1);
-
+        if (state->in == NULL || state->out == NULL) {
        if (state->in == NULL || state->out == NULL)
        {
            if (state->out != NULL)
            free(state->out);
            if (state->in != NULL)
            free(state->in);
            gz_error(state, Z_MEM_ERROR, "out of memory");
            return -1;
        }
        state->size = state->want;
        /* allocate inflate memory */
@ -144,9 +112,7 @@ gz_statep state;
        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 + 16) != Z_OK)      /* gunzip */
        {
            free(state->out);
            free(state->in);
            state->size = 0;
@ -156,11 +122,9 @@ gz_statep state;
    }
    /* get at least the magic bytes in the input buffer */
-    if (strm->avail_in < 2)
+    if (strm->avail_in < 2) {
    {
        if (gz_avail(state) == -1)
            return -1;
        if (strm->avail_in == 0)
            return 0;
    }
@ -173,8 +137,7 @@ gz_statep state;
       the header will be written in a single operation, so that reading a
       single byte is sufficient indication that it is not a gzip file) */
    if (strm->avail_in > 1 &&
-            strm->next_in[0] == 31 && strm->next_in[1] == 139)
+            strm->next_in[0] == 31 && strm->next_in[1] == 139) {
    {
        inflateReset(strm);
        state->how = GZIP;
        state->direct = 0;
@ -183,8 +146,7 @@ gz_statep state;
    /* no gzip header -- if we were decoding gzip before, then this is trailing
       garbage.  Ignore the trailing garbage and finish. */
-    if (state->direct == 0)
+    if (state->direct == 0) {
    {
        strm->avail_in = 0;
        state->eof = 1;
        state->x.have = 0;
@ -195,14 +157,11 @@ gz_statep state;
       the output buffer is larger than the input buffer, which also assures
       space for gzungetc() */
    state->x.next = state->out;
-
+    if (strm->avail_in) {
    if (strm->avail_in)
    {
        memcpy(state->x.next, strm->next_in, strm->avail_in);
        state->x.have = strm->avail_in;
        strm->avail_in = 0;
    }
    state->how = COPY;
    state->direct = 1;
    return 0;
@ -213,12 +172,8 @@ gz_statep state;
   data.  If the gzip stream completes, state->how is reset to LOOK to look for
   the next gzip stream or raw data, once state->x.have is depleted.  Returns 0
   on success, -1 on failure. */
 #ifdef WIN32
 local int gz_decomp(gz_statep state)
 #else
 local int gz_decomp(state)
    gz_statep state;
 #endif
 {
    int ret = Z_OK;
    unsigned had;
@ -226,43 +181,32 @@ gz_statep state;
    /* fill output buffer up to end of deflate stream */
    had = strm->avail_out;
-
+    do {
    do
    {
        /* get more input for inflate() */
        if (strm->avail_in == 0 && gz_avail(state) == -1)
            return -1;
-
+        if (strm->avail_in == 0) {
        if (strm->avail_in == 0)
        {
            gz_error(state, Z_BUF_ERROR, "unexpected end of file");
            break;
        }
        /* decompress and handle errors */
        ret = inflate(strm, Z_NO_FLUSH);
-
+        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
        if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT)
        {
            gz_error(state, Z_STREAM_ERROR,
                     "internal error: inflate stream corrupt");
            return -1;
        }
-
+        if (ret == Z_MEM_ERROR) {
        if (ret == Z_MEM_ERROR)
        {
            gz_error(state, Z_MEM_ERROR, "out of memory");
            return -1;
        }
-
+        if (ret == Z_DATA_ERROR) {              /* deflate stream invalid */
        if (ret == Z_DATA_ERROR)                /* deflate stream invalid */
        {
            gz_error(state, Z_DATA_ERROR,
                     strm->msg == NULL ? "compressed data error" : strm->msg);
            return -1;
        }
-    }
+    } while (strm->avail_out && ret != Z_STREAM_END);
    while (strm->avail_out && ret != Z_STREAM_END);
    /* update available output */
    state->x.have = had - strm->avail_out;
@ -282,66 +226,46 @@ gz_statep state;
   looked for to determine whether to copy or decompress.  Returns -1 on error,
   otherwise 0.  gz_fetch() will leave state->how as COPY or GZIP unless the
   end of the input file has been reached and all data has been processed.  */
 #ifdef WIN32
 local int gz_fetch(gz_statep state)
 #else
 local int gz_fetch(state)
    gz_statep state;
 #endif
 {
    z_streamp strm = &(state->strm);
-    do
+    do {
-    {
+        switch(state->how) {
        switch (state->how)
        {
        case LOOK:      /* -> LOOK, COPY (only if never GZIP), or GZIP */
            if (gz_look(state) == -1)
                return -1;
            if (state->how == LOOK)
                return 0;
            break;
        case COPY:      /* -> COPY */
            if (gz_load(state, state->out, state->size << 1, &(state->x.have))
                    == -1)
                return -1;
            state->x.next = state->out;
            return 0;
        case GZIP:      /* -> GZIP or LOOK (if end of gzip stream) */
            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));
    while (state->x.have == 0 && (!state->eof || strm->avail_in));
    return 0;
 }
 /* Skip len uncompressed bytes of output.  Return -1 on error, 0 on success. */
 #ifdef WIN32
 local int gz_skip(gz_statep state, z_off64_t len)
 #else
 local int gz_skip(state, len)
    gz_statep state;
    z_off64_t len;
 #endif
 {
    unsigned n;
    /* 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->x.have) {
        {
            n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
                (unsigned)len : state->x.have;
            state->x.have -= n;
@ -355,113 +279,83 @@ z_off64_t len;
            break;
        /* need more data to skip -- load up output buffer */
-        else
+        else {
        {
            /* get more output, looking for header if required */
            if (gz_fetch(state) == -1)
                return -1;
        }
    return 0;
 }
-/* -- see zlib.h -- */
+/* Read len bytes into buf from file, or less than len up to the end of the
-#ifdef WIN32
+   input.  Return the number of bytes read.  If zero is returned, either the
-int ZEXPORT gzread(gzFile file, voidp buf, unsigned len)
+   end of file was reached, or there was an error.  state->err must be
-#else
+   consulted in that case to determine which. */
-int ZEXPORT gzread(file, buf, len)
+local z_size_t gz_read(state, buf, len)
 gzFile file;
 voidp buf;
 unsigned len;
 #endif
 {
    unsigned got, n;
    gz_statep state;
-    z_streamp strm;
+    voidp buf;
-
+    z_size_t len;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    strm = &(state->strm);
    /* check that we're reading and that there's no (serious) error */
    if (state->mode != GZ_READ ||
            (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");
+    z_size_t got;
-        return -1;
+    unsigned n;
    }
    /* if len is zero, avoid unnecessary operations */
    if (len == 0)
        return 0;
    /* process a skip request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_skip(state, state->skip) == -1)
-            return -1;
+            return 0;
    }
    /* get len bytes to buf, or less than len if at the end */
    got = 0;
    do {
        /* set n to the maximum amount of len that fits in an unsigned int */
        n = -1;
        if (n > len)
            n = len;
    do
    {
        /* first just try copying data from the output buffer */
-        if (state->x.have)
+        if (state->x.have) {
-        {
+            if (state->x.have < n)
-            n = state->x.have > len ? len : state->x.have;
+                n = state->x.have;
            memcpy(buf, state->x.next, n);
            state->x.next += n;
            state->x.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 && state->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))
+        else if (state->how == LOOK || n < (state->size << 1)) {
        {
            /* get more output, looking for header if required */
            if (gz_fetch(state) == -1)
-                return -1;
+                return 0;
            continue;       /* no progress yet -- go back to copy 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 */
+        else if (state->how == COPY) {      /* read directly */
-        {
+            if (gz_load(state, (unsigned char *)buf, n, &n) == -1)
-            if (gz_load(state, buf, len, &n) == -1)
+                return 0;
                return -1;
        }
        /* large len -- decompress directly into user buffer */
-        else    /* state->how == GZIP */
+        else {  /* state->how == GZIP */
-        {
+            state->strm.avail_out = n;
-            strm->avail_out = len;
+            state->strm.next_out = (unsigned char *)buf;
            strm->next_out = buf;
            if (gz_decomp(state) == -1)
-                return -1;
+                return 0;
            n = state->x.have;
            state->x.have = 0;
        }
@ -471,21 +365,87 @@ unsigned len;
        buf = (char *)buf + n;
        got += n;
        state->x.pos += n;
-    }
+    } while (len);
    while (len);
-    /* return number of bytes read into user buffer (will fit in int) */
+    /* return number of bytes read into user buffer */
-    return (int)got;
+    return got;
 }
 /* -- see zlib.h -- */
-#undef gzgetc
+int ZEXPORT gzread(file, buf, len)
-#ifdef WIN32
+    gzFile file;
-int ZEXPORT gzgetc(gzFile file)
+    voidp buf;
    unsigned len;
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    /* check that we're reading and that there's no (serious) error */
    if (state->mode != GZ_READ ||
            (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 a flaw in the interface) */
    if ((int)len < 0) {
        gz_error(state, Z_STREAM_ERROR, "request does not fit in an int");
        return -1;
    }
    /* read len or fewer bytes to buf */
    len = gz_read(state, buf, len);
    /* check for an error */
    if (len == 0 && state->err != Z_OK && state->err != Z_BUF_ERROR)
        return -1;
    /* return the number of bytes read (this is assured to fit in an int) */
    return (int)len;
 }
 /* -- see zlib.h -- */
 z_size_t ZEXPORT gzfread(buf, size, nitems, file)
    voidp buf;
    z_size_t size;
    z_size_t nitems;
    gzFile file;
 {
    z_size_t len;
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    /* check that we're reading and that there's no (serious) error */
    if (state->mode != GZ_READ ||
            (state->err != Z_OK && state->err != Z_BUF_ERROR))
        return 0;
    /* compute bytes to read -- error on overflow */
    len = nitems * size;
    if (size && len / size != nitems) {
        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
        return 0;
    }
    /* read len or fewer bytes to buf, return the number of full items read */
    return len ? gz_read(state, buf, len) / size : 0;
 }
 /* -- see zlib.h -- */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #else
 #  undef gzgetc
 #endif
 int ZEXPORT gzgetc(file)
    gzFile file;
 #endif
 {
    int ret;
    unsigned char buf[1];
@ -494,7 +454,6 @@ gzFile file;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    /* check that we're reading and that there's no (serious) error */
@ -503,43 +462,33 @@ gzFile file;
        return -1;
    /* try output buffer (no need to check for skip request) */
-    if (state->x.have)
+    if (state->x.have) {
    {
        state->x.have--;
        state->x.pos++;
        return *(state->x.next)++;
    }
-    /* nothing there -- try gzread() */
+    /* nothing there -- try gz_read() */
-    ret = gzread(file, buf, 1);
+    ret = gz_read(state, buf, 1);
    return ret < 1 ? -1 : buf[0];
 }
 #ifdef WIN32
 int ZEXPORT gzgetc_(gzFile file)
 #else
 int ZEXPORT gzgetc_(file)
 gzFile file;
 #endif
 {
    return gzgetc(file);
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzungetc(signed char c, gzFile file)
 #else
 int ZEXPORT gzungetc(c, file)
    int c;
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    /* check that we're reading and that there's no (serious) error */
@ -548,10 +497,8 @@ gzFile file;
        return -1;
    /* process a skip request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_skip(state, state->skip) == -1)
            return -1;
    }
@ -561,52 +508,42 @@ gzFile file;
        return -1;
    /* if output buffer empty, put byte at end (allows more pushing) */
-    if (state->x.have == 0)
+    if (state->x.have == 0) {
    {
        state->x.have = 1;
        state->x.next = state->out + (state->size << 1) - 1;
-        state->x.next[0] = c;
+        state->x.next[0] = (unsigned char)c;
        state->x.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->x.have == (state->size << 1)) {
    {
        gz_error(state, Z_DATA_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->x.next == state->out) {
    {
        unsigned char *src = state->out + state->x.have;
        unsigned char *dest = state->out + (state->size << 1);
        while (src > state->out)
            *--dest = *--src;
        state->x.next = dest;
    }
    state->x.have++;
    state->x.next--;
-    state->x.next[0] = c;
+    state->x.next[0] = (unsigned char)c;
    state->x.pos--;
    state->past = 0;
    return c;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 char* ZEXPORT gzgets(gzFile file, char* buf, int len)
 #else
 char * ZEXPORT gzgets(file, buf, len)
    gzFile file;
    char *buf;
    int len;
 #endif
 {
    unsigned left, n;
    char *str;
@ -616,7 +553,6 @@ int len;
    /* check parameters and get internal structure */
    if (file == NULL || buf == NULL || len < 1)
        return NULL;
    state = (gz_statep)file;
    /* check that we're reading and that there's no (serious) error */
@ -625,10 +561,8 @@ int len;
        return NULL;
    /* process a skip request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_skip(state, state->skip) == -1)
            return NULL;
    }
@ -638,23 +572,18 @@ int len;
       the contents, let the user worry about that) */
    str = buf;
    left = (unsigned)len - 1;
-
+    if (left) do {
    if (left) do
        {
        /* assure that something is in the output buffer */
        if (state->x.have == 0 && gz_fetch(state) == -1)
            return NULL;                /* error */
-
+        if (state->x.have == 0) {       /* end of file */
            if (state->x.have == 0)         /* end of file */
            {
            state->past = 1;            /* read past end */
            break;                      /* return what we have */
        }
        /* look for end-of-line in current output buffer */
        n = state->x.have > left ? left : state->x.have;
-            eol = memchr(state->x.next, '\n', n);
+        eol = (unsigned char *)memchr(state->x.next, '\n', n);
        if (eol != NULL)
            n = (unsigned)(eol - state->x.next) + 1;
@ -665,31 +594,24 @@ int len;
        state->x.pos += n;
        left -= n;
        buf += n;
-        }
+    } while (left && eol == NULL);
        while (left && eol == NULL);
    /* return terminated string, or if nothing, end of file */
    if (buf == str)
        return NULL;
    buf[0] = 0;
    return str;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzdirect(gzFile file)
 #else
 int ZEXPORT gzdirect(file)
    gzFile file;
 #endif
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    /* if the state is not known, but we can find out, then do so (this is
@ -702,12 +624,8 @@ gzFile file;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzclose_r(gzFile file)
 #else
 int ZEXPORT gzclose_r(file)
    gzFile file;
 #endif
 {
    int ret, err;
    gz_statep state;
@ -715,7 +633,6 @@ gzFile file;
    /* get internal structure */
    if (file == NULL)
        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    /* check that we're reading */
@ -723,13 +640,11 @@ gzFile file;
        return Z_STREAM_ERROR;
    /* free memory and close file */
-    if (state->size)
+    if (state->size) {
    {
        inflateEnd(&(state->strm));
        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);
--- a/extern/zlib/gzwrite.c
+++ b/extern/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-2017 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -9,36 +9,29 @@
 local int gz_init OF((gz_statep));
 local int gz_comp OF((gz_statep, int));
 local int gz_zero OF((gz_statep, z_off64_t));
 local z_size_t gz_write OF((gz_statep, voidpc, z_size_t));
 /* Initialize state for writing a gzip file.  Mark initialization by setting
-   state->size to non-zero.  Return -1 on failure or 0 on success. */
+   state->size to non-zero.  Return -1 on a memory allocation failure, or 0 on
-#ifdef WIN32
+   success. */
 local int gz_init(gz_statep state)
 #else
 local int gz_init(state)
    gz_statep state;
 #endif
 {
    int ret;
    z_streamp strm = &(state->strm);
-    /* allocate input buffer */
+    /* allocate input buffer (double size for gzprintf) */
-    state->in = malloc(state->want);
+    state->in = (unsigned char *)malloc(state->want << 1);
-
+    if (state->in == NULL) {
    if (state->in == NULL)
    {
        gz_error(state, Z_MEM_ERROR, "out of memory");
        return -1;
    }
    /* only need output buffer and deflate state if compressing */
-    if (!state->direct)
+    if (!state->direct) {
    {
        /* allocate output buffer */
-        state->out = malloc(state->want);
+        state->out = (unsigned char *)malloc(state->want);
-
+        if (state->out == NULL) {
        if (state->out == NULL)
        {
            free(state->in);
            gz_error(state, Z_MEM_ERROR, "out of memory");
            return -1;
@ -50,46 +43,39 @@ gz_statep state;
        strm->opaque = Z_NULL;
        ret = deflateInit2(strm, state->level, Z_DEFLATED,
                           MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
-
+        if (ret != Z_OK) {
        if (ret != Z_OK)
        {
            free(state->out);
            free(state->in);
            gz_error(state, Z_MEM_ERROR, "out of memory");
            return -1;
        }
        strm->next_in = NULL;
    }
    /* mark state as initialized */
    state->size = state->want;
    /* initialize write buffer if compressing */
-    if (!state->direct)
+    if (!state->direct) {
    {
        strm->avail_out = state->size;
        strm->next_out = state->out;
        state->x.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.
+   Return -1 if there is an error writing to the output file or if gz_init()
-   flush is assumed to be a valid deflate() flush value.  If flush is Z_FINISH,
+   fails to allocate memory, otherwise 0.  flush is assumed to be a valid
-   then the deflate() state is reset to start a new gzip stream.  If gz->direct
+   deflate() flush value.  If flush is Z_FINISH, then the deflate() state is
-   is true, then simply write to the output file without compressing, and
+   reset to start a new gzip stream.  If gz->direct is true, then simply write
-   ignore flush. */
+   to the output file without compressing, and ignore flush. */
 #ifdef WIN32
 local int gz_comp(gz_statep state, int flush)
 #else
 local int gz_comp(state, flush)
    gz_statep state;
    int flush;
 #endif
 {
-    int ret, got;
+    int ret, writ;
-    unsigned have;
+    unsigned have, put, max = ((unsigned)-1 >> 2) + 1;
    z_streamp strm = &(state->strm);
    /* allocate memory if this is the first time through */
@ -97,62 +83,54 @@ int flush;
        return -1;
    /* write directly if requested */
-    if (state->direct)
+    if (state->direct) {
-    {
+        while (strm->avail_in) {
-        got = write(state->fd, strm->next_in, strm->avail_in);
+            put = strm->avail_in > max ? max : strm->avail_in;
-
+            writ = write(state->fd, strm->next_in, put);
-        if (got < 0 || (unsigned)got != strm->avail_in)
+            if (writ < 0) {
        {
                gz_error(state, Z_ERRNO, zstrerror());
                return -1;
            }
-
+            strm->avail_in -= (unsigned)writ;
-        strm->avail_in = 0;
+            strm->next_in += writ;
        }
        return 0;
    }
    /* run deflate() on provided input until it produces no more output */
    ret = Z_OK;
-
+    do {
    do
    {
        /* write out current buffer contents if full, or if flushing, but if
           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)))
+            (flush != Z_FINISH || ret == Z_STREAM_END))) {
-        {
+            while (strm->next_out > state->x.next) {
-            have = (unsigned)(strm->next_out - state->x.next);
+                put = strm->next_out - state->x.next > (int)max ? max :
-
+                      (unsigned)(strm->next_out - state->x.next);
-            if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
+                writ = write(state->fd, state->x.next, put);
-                         (unsigned)got != have))
+                if (writ < 0) {
            {
                    gz_error(state, Z_ERRNO, zstrerror());
                    return -1;
                }
-
+                state->x.next += writ;
-            if (strm->avail_out == 0)
+            }
-            {
+            if (strm->avail_out == 0) {
                strm->avail_out = state->size;
                strm->next_out = state->out;
                state->x.next = state->out;
            }
            state->x.next = strm->next_out;
        }
        /* compress */
        have = strm->avail_out;
        ret = deflate(strm, flush);
-
+        if (ret == Z_STREAM_ERROR) {
        if (ret == Z_STREAM_ERROR)
        {
            gz_error(state, Z_STREAM_ERROR,
                      "internal error: deflate stream corrupt");
            return -1;
        }
        have -= strm->avail_out;
-    }
+    } while (have);
    while (have);
    /* if that completed a deflate stream, allow another to start */
    if (flush == Z_FINISH)
@ -162,14 +140,11 @@ int flush;
    return 0;
 }
-/* Compress len zeros to output.  Return -1 on error, 0 on success. */
+/* Compress len zeros to output.  Return -1 on a write error or memory
-#ifdef WIN32
+   allocation failure by gz_comp(), or 0 on success. */
 local int gz_zero(gz_statep state, z_off64_t len)
 #else
 local int gz_zero(state, len)
    gz_statep state;
    z_off64_t len;
 #endif
 {
    int first;
    unsigned n;
@ -181,64 +156,31 @@ z_off64_t len;
    /* compress len zeros (len guaranteed > 0) */
    first = 1;
-
+    while (len) {
    while (len)
    {
        n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
            (unsigned)len : state->size;
-
+        if (first) {
        if (first)
        {
            memset(state->in, 0, n);
            first = 0;
        }
        strm->avail_in = n;
        strm->next_in = state->in;
        state->x.pos += n;
        if (gz_comp(state, Z_NO_FLUSH) == -1)
            return -1;
        len -= n;
    }
    return 0;
 }
-/* -- see zlib.h -- */
+/* Write len bytes from buf to file.  Return the number of bytes written.  If
-#ifdef WIN32
+   the returned value is less than len, then there was an error. */
-int ZEXPORT gzwrite(gzFile file, voidpc buf, unsigned len)
+local z_size_t gz_write(state, buf, len)
 #else
 int ZEXPORT gzwrite(file, buf, len)
 gzFile file;
 voidpc buf;
 unsigned len;
 #endif
 {
    unsigned put = len;
    unsigned n;
    gz_statep state;
-    z_streamp strm;
+    voidpc buf;
-
+    z_size_t len;
    /* get internal structure */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    strm = &(state->strm);
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
        return 0;
    /* 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");
+    z_size_t put = len;
        return 0;
    }
    /* if len is zero, avoid unnecessary operations */
    if (len == 0)
@ -249,67 +191,121 @@ unsigned len;
        return 0;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
            return 0;
    }
    /* for small len, copy to input buffer, otherwise compress directly */
-    if (len < state->size)
+    if (len < state->size) {
    {
        /* copy to input buffer, compress when full */
-        do
+        do {
-        {
+            unsigned have, copy;
            if (strm->avail_in == 0)
                strm->next_in = state->in;
            n = state->size - strm->avail_in;
            if (n > len)
                n = len;
            memcpy(strm->next_in + strm->avail_in, buf, n);
            strm->avail_in += n;
            state->x.pos += n;
            buf = (char*)buf + n;
            len -= n;
            if (state->strm.avail_in == 0)
                state->strm.next_in = state->in;
            have = (unsigned)((state->strm.next_in + state->strm.avail_in) -
                              state->in);
            copy = state->size - have;
            if (copy > len)
                copy = len;
            memcpy(state->in + have, buf, copy);
            state->strm.avail_in += copy;
            state->x.pos += copy;
            buf = (const char *)buf + copy;
            len -= copy;
            if (len && gz_comp(state, Z_NO_FLUSH) == -1)
                return 0;
        } while (len);
    }
-        while (len);
+    else {
    }
    else
    {
        /* consume whatever's left in the input buffer */
-        if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+        if (state->strm.avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
            return 0;
        /* directly compress user buffer to file */
-        strm->avail_in = len;
+        state->strm.next_in = (z_const Bytef *)buf;
-        strm->next_in = (voidp)buf;
+        do {
-        state->x.pos += len;
+            unsigned n = (unsigned)-1;
-
+            if (n > len)
                n = len;
            state->strm.avail_in = n;
            state->x.pos += n;
            if (gz_comp(state, Z_NO_FLUSH) == -1)
                return 0;
            len -= n;
        } while (len);
    }
-    /* input was all buffered or compressed (put will fit in int) */
+    /* input was all buffered or compressed */
-    return (int)put;
+    return put;
 }
 /* -- see zlib.h -- */
 int ZEXPORT gzwrite(file, buf, len)
    gzFile file;
    voidpc buf;
    unsigned len;
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
        return 0;
    /* since an int is returned, make sure len fits in one, otherwise return
       with an error (this avoids a flaw in the interface) */
    if ((int)len < 0) {
        gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
        return 0;
    }
    /* write len bytes from buf (the return value will fit in an int) */
    return (int)gz_write(state, buf, len);
 }
 /* -- see zlib.h -- */
 z_size_t ZEXPORT gzfwrite(buf, size, nitems, file)
    voidpc buf;
    z_size_t size;
    z_size_t nitems;
    gzFile file;
 {
    z_size_t len;
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return 0;
    state = (gz_statep)file;
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
        return 0;
    /* compute bytes to read -- error on overflow */
    len = nitems * size;
    if (size && len / size != nitems) {
        gz_error(state, Z_STREAM_ERROR, "request does not fit in a size_t");
        return 0;
    }
    /* write len bytes to buf, return the number of full items written */
    return len ? gz_write(state, buf, len) / size : 0;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzputc(gzFile file, unsigned char c)
 #else
 int ZEXPORT gzputc(file, c)
    gzFile file;
    int c;
 #endif
 {
    unsigned have;
    unsigned char buf[1];
    gz_statep state;
    z_streamp strm;
@ -317,7 +313,6 @@ int c;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    strm = &(state->strm);
@ -326,50 +321,54 @@ int c;
        return -1;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
            return -1;
    }
    /* try writing to input buffer for speed (state->size == 0 if buffer not
       initialized) */
-    if (strm->avail_in < state->size)
+    if (state->size) {
    {
        if (strm->avail_in == 0)
            strm->next_in = state->in;
-
+        have = (unsigned)((strm->next_in + strm->avail_in) - state->in);
-        strm->next_in[strm->avail_in++] = c;
+        if (have < state->size) {
            state->in[have] = (unsigned char)c;
            strm->avail_in++;
            state->x.pos++;
            return c & 0xff;
        }
    }
    /* no room in buffer or not initialized, use gz_write() */
-    buf[0] = c;
+    buf[0] = (unsigned char)c;
-
+    if (gz_write(state, buf, 1) != 1)
    if (gzwrite(file, buf, 1) != 1)
        return -1;
    return c & 0xff;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzputs(gzFile file, const char* str)
 #else
 int ZEXPORT gzputs(file, str)
    gzFile file;
    const char *str;
 #endif
 {
    int ret;
-    unsigned len;
+    z_size_t len;
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
        return -1;
    state = (gz_statep)file;
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
        return -1;
    /* write string */
-    len = (unsigned)strlen(str);
+    len = strlen(str);
-    ret = gzwrite(file, str, len);
+    ret = gz_write(state, str, len);
    return ret == 0 && len != 0 ? -1 : ret;
 }
@ -377,79 +376,89 @@ const char* str;
 #include <stdarg.h>
 /* -- see zlib.h -- */
-int ZEXPORTVA gzprintf(gzFile file, const char* format, ...)
+int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va)
 {
-    int size, len;
+    int len;
    unsigned left;
    char *next;
    gz_statep state;
    z_streamp strm;
    va_list va;
    /* get internal structure */
    if (file == NULL)
-        return -1;
+        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    strm = &(state->strm);
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
+        return Z_STREAM_ERROR;
    /* make sure we have some buffer space */
    if (state->size == 0 && gz_init(state) == -1)
-        return 0;
+        return state->err;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
-            return 0;
+            return state->err;
    }
-    /* consume whatever's left in the input buffer */
+    /* do the printf() into the input buffer, put length in len -- the input
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+       buffer is double-sized just for this function, so there is guaranteed to
-        return 0;
+       be state->size bytes available after the current contents */
-
+    if (strm->avail_in == 0)
-    /* do the printf() into the input buffer, put length in len */
+        strm->next_in = state->in;
-    size = (int)(state->size);
+    next = (char *)(state->in + (strm->next_in - state->in) + strm->avail_in);
-    state->in[size - 1] = 0;
+    next[state->size - 1] = 0;
    va_start(va, format);
 #ifdef NO_vsnprintf
 #  ifdef HAS_vsprintf_void
-    (void)vsprintf((char*)(state->in), format, va);
+    (void)vsprintf(next, format, va);
-    va_end(va);
+    for (len = 0; len < state->size; len++)
-
+        if (next[len] == 0) break;
    for (len = 0; len < size; len++)
        if (state->in[len] == 0) break;
 #  else
-    len = vsprintf((char*)(state->in), format, va);
+    len = vsprintf(next, format, va);
    va_end(va);
 #  endif
 #else
 #  ifdef HAS_vsnprintf_void
-    (void)vsnprintf((char*)(state->in), size, format, va);
+    (void)vsnprintf(next, state->size, format, va);
-    va_end(va);
+    len = strlen(next);
    len = strlen((char*)(state->in));
 #  else
-    len = vsnprintf((char*)(state->in), size, format, va);
+    len = vsnprintf(next, state->size, format, va);
    va_end(va);
 #  endif
 #endif
    /* check that printf() results fit in buffer */
-    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+    if (len == 0 || (unsigned)len >= state->size || next[state->size - 1] != 0)
        return 0;
-    /* update buffer and position, defer compression until needed */
+    /* update buffer and position, compress first half if past that */
-    strm->avail_in = (unsigned)len;
+    strm->avail_in += (unsigned)len;
    strm->next_in = state->in;
    state->x.pos += len;
    if (strm->avail_in >= state->size) {
        left = strm->avail_in - state->size;
        strm->avail_in = state->size;
        if (gz_comp(state, Z_NO_FLUSH) == -1)
            return state->err;
        memcpy(state->in, state->in + state->size, left);
        strm->next_in = state->in;
        strm->avail_in = left;
    }
    return len;
 }
 int ZEXPORTVA gzprintf(gzFile file, const char *format, ...)
 {
    va_list va;
    int ret;
    va_start(va, format);
    ret = gzvprintf(file, format, va);
    va_end(va);
    return ret;
 }
 #else /* !STDC && !Z_HAVE_STDARG_H */
 /* -- see zlib.h -- */
@ -460,97 +469,96 @@ const char* format;
    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
 {
-    int size, len;
+    unsigned len, left;
    char *next;
    gz_statep state;
    z_streamp strm;
    /* get internal structure */
    if (file == NULL)
-        return -1;
+        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    strm = &(state->strm);
    /* check that can really pass pointer in ints */
    if (sizeof(int) != sizeof(void *))
-        return 0;
+        return Z_STREAM_ERROR;
    /* check that we're writing and that there's no error */
    if (state->mode != GZ_WRITE || state->err != Z_OK)
-        return 0;
+        return Z_STREAM_ERROR;
    /* make sure we have some buffer space */
    if (state->size == 0 && gz_init(state) == -1)
-        return 0;
+        return state->error;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
-            return 0;
+            return state->error;
    }
-    /* consume whatever's left in the input buffer */
+    /* do the printf() into the input buffer, put length in len -- the input
-    if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+       buffer is double-sized just for this function, so there is guaranteed to
-        return 0;
+       be state->size bytes available after the current contents */
-
+    if (strm->avail_in == 0)
-    /* do the printf() into the input buffer, put length in len */
+        strm->next_in = state->in;
-    size = (int)(state->size);
+    next = (char *)(strm->next_in + strm->avail_in);
-    state->in[size - 1] = 0;
+    next[state->size - 1] = 0;
 #ifdef NO_snprintf
 #  ifdef HAS_sprintf_void
-    sprintf((char*)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+    sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12,
-            a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+            a13, a14, a15, a16, a17, a18, a19, a20);
    for (len = 0; len < size; len++)
-        if (state->in[len] == 0) break;
+        if (next[len] == 0)
-
+            break;
 #  else
-    len = sprintf((char*)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+    len = sprintf(next, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11,
-                  a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+                  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(next, state->size, format, a1, a2, a3, a4, a5, a6, a7, a8, a9,
-             a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+             a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-    len = strlen((char*)(state->in));
+    len = strlen(next);
 #  else
-    len = snprintf((char*)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+    len = snprintf(next, state->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
    /* check that printf() results fit in buffer */
-    if (len <= 0 || len >= (int)size || state->in[size - 1] != 0)
+    if (len == 0 || len >= state->size || next[state->size - 1] != 0)
        return 0;
-    /* update buffer and position, defer compression until needed */
+    /* update buffer and position, compress first half if past that */
-    strm->avail_in = (unsigned)len;
+    strm->avail_in += len;
    strm->next_in = state->in;
    state->x.pos += len;
-    return len;
+    if (strm->avail_in >= state->size) {
        left = strm->avail_in - state->size;
        strm->avail_in = state->size;
        if (gz_comp(state, Z_NO_FLUSH) == -1)
            return state->err;
        memcpy(state->in, state->in + state->size, left);
        strm->next_in = state->in;
        strm->avail_in = left;
    }
    return (int)len;
 }
 #endif
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzflush(gzFile file, int flush)
 #else
 int ZEXPORT gzflush(file, flush)
    gzFile file;
    int flush;
 #endif
 {
    gz_statep state;
    /* get internal structure */
    if (file == NULL)
-        return -1;
+        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    /* check that we're writing and that there's no error */
@ -562,28 +570,22 @@ int flush;
        return Z_STREAM_ERROR;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
-            return -1;
+            return state->err;
    }
    /* compress remaining data with requested flush */
-    gz_comp(state, flush);
+    (void)gz_comp(state, flush);
    return state->err;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzsetparams(gzFile file, int level, int strategy)
 #else
 int ZEXPORT gzsetparams(file, level, strategy)
    gzFile file;
    int level;
    int strategy;
 #endif
 {
    gz_statep state;
    z_streamp strm;
@ -591,7 +593,6 @@ int strategy;
    /* get internal structure */
    if (file == NULL)
        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    strm = &(state->strm);
@ -604,36 +605,27 @@ int strategy;
        return Z_OK;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
-            return -1;
+            return state->err;
    }
    /* change compression parameters for subsequent input */
-    if (state->size)
+    if (state->size) {
    {
        /* flush previous input with previous parameters before changing */
-        if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
+        if (strm->avail_in && gz_comp(state, Z_BLOCK) == -1)
            return state->err;
        deflateParams(strm, level, strategy);
    }
    state->level = level;
    state->strategy = strategy;
    return Z_OK;
 }
 /* -- see zlib.h -- */
 #ifdef WIN32
 int ZEXPORT gzclose_w(gzFile file)
 #else
 int ZEXPORT gzclose_w(file)
    gzFile file;
 #endif
 {
    int ret = Z_OK;
    gz_statep state;
@ -641,7 +633,6 @@ gzFile file;
    /* get internal structure */
    if (file == NULL)
        return Z_STREAM_ERROR;
    state = (gz_statep)file;
    /* check that we're writing */
@ -649,35 +640,26 @@ gzFile file;
        return Z_STREAM_ERROR;
    /* check for seek request */
-    if (state->seek)
+    if (state->seek) {
    {
        state->seek = 0;
        if (gz_zero(state, state->skip) == -1)
            ret = state->err;
    }
    /* flush, free memory, and close file */
    if (state->size)
    {
    if (gz_comp(state, Z_FINISH) == -1)
        ret = state->err;
-
+    if (state->size) {
-        if (!state->direct)
+        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 = Z_ERRNO;
    free(state);
    return ret;
 }
--- a/extern/zlib/infback.c
+++ b/extern/zlib/infback.c
@ -1,5 +1,5 @@
 /* infback.c -- inflate using a call-back interface
- * Copyright (C) 1995-2011 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -15,23 +15,6 @@
 #include "inflate.h"
 #include "inffast.h"
 /*
 #ifdef WIN32
 #define Z_FALSE     (__LINE__ == -1)
 #else
 #define Z_FALSE     0
 #endif
 */
 #if defined(WIN32) && defined(_MSC_VER)
 #  define Z_ONCE __pragma( warning(push) ) \
    __pragma(warning(disable:4127)) \
 while (0) \
    __pragma(warning(pop))
 #else
 #  define Z_ONCE while( 0 )
 #endif
 /* function prototypes */
 local void fixedtables OF((struct inflate_state FAR *state));
@ -42,31 +25,23 @@ local void fixedtables OF((struct inflate_state FAR* state));
   windowBits is in the range 8..15, and window is a user-supplied
   window and output buffer that is 2**windowBits bytes.
 */
 #ifdef WIN32
 int ZEXPORT inflateBackInit_(z_streamp strm, int windowBits, unsigned char FAR* window, const char* version, int stream_size)
 #else
 int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
 z_streamp strm;
 int windowBits;
 unsigned char FAR *window;
 const char *version;
 int stream_size;
 #endif
 {
    struct inflate_state FAR *state;
    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
        stream_size != (int)(sizeof(z_stream)))
        return Z_VERSION_ERROR;
    if (strm == Z_NULL || window == Z_NULL ||
        windowBits < 8 || windowBits > 15)
        return Z_STREAM_ERROR;
    strm->msg = Z_NULL;                 /* in case we return an error */
-
+    if (strm->zalloc == (alloc_func)0) {
    if (strm->zalloc == (alloc_func)0)
    {
 #ifdef Z_SOLO
        return Z_STREAM_ERROR;
 #else
@ -74,23 +49,19 @@ int stream_size;
        strm->opaque = (voidpf)0;
 #endif
    }
    if (strm->zfree == (free_func)0)
 #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;
    Tracev((stderr, "inflate: allocated\n"));
    strm->state = (struct internal_state FAR *)state;
    state->dmax = 32768U;
-    state->wbits = windowBits;
+    state->wbits = (uInt)windowBits;
    state->wsize = 1U << windowBits;
    state->window = window;
    state->wnext = 0;
@ -108,12 +79,8 @@ int stream_size;
   used for threaded applications, since the rewriting of the tables and virgin
   may not be thread-safe.
 */
 #ifdef WIN32
 local void fixedtables(struct inflate_state FAR* state)
 #else
 local void fixedtables(state)
 struct inflate_state FAR *state;
 #endif
 {
 #ifdef BUILDFIXED
    static int virgin = 1;
@ -121,22 +88,16 @@ struct inflate_state FAR* state;
    static code fixed[544];
    /* build fixed huffman tables if first call (may not be thread safe) */
-    if (virgin)
+    if (virgin) {
    {
        unsigned sym, bits;
        static code *next;
        /* literal/length table */
        sym = 0;
        while (sym < 144) state->lens[sym++] = 8;
        while (sym < 256) state->lens[sym++] = 9;
        while (sym < 280) state->lens[sym++] = 7;
        while (sym < 288) state->lens[sym++] = 8;
        next = fixed;
        lenfix = next;
        bits = 9;
@ -144,9 +105,7 @@ struct inflate_state FAR* state;
        /* distance table */
        sym = 0;
        while (sym < 32) state->lens[sym++] = 5;
        distfix = next;
        bits = 5;
        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
@ -154,7 +113,6 @@ struct inflate_state FAR* state;
        /* do this just once */
        virgin = 0;
    }
 #else /* !BUILDFIXED */
 #   include "inffixed.h"
 #endif /* BUILDFIXED */
@ -175,7 +133,7 @@ struct inflate_state FAR* state;
        have = strm->avail_in; \
        hold = state->hold; \
        bits = state->bits; \
-    } Z_ONCE
+    } while (0)
 /* Set state from registers for inflate_fast() */
 #define RESTORE() \
@ -186,14 +144,14 @@ struct inflate_state FAR* state;
        strm->avail_in = have; \
        state->hold = hold; \
        state->bits = bits; \
-    } Z_ONCE
+    } while (0)
 /* Clear the input bit accumulator */
 #define INITBITS() \
    do { \
        hold = 0; \
        bits = 0; \
-    } Z_ONCE
+    } while (0)
 /* Assure that some input is available.  If input is requested, but denied,
   then return a Z_BUF_ERROR from inflateBack(). */
@ -207,7 +165,7 @@ struct inflate_state FAR* state;
                goto inf_leave; \
            } \
        } \
-    } Z_ONCE
+    } while (0)
 /* Get a byte of input into the bit accumulator, or return from inflateBack()
   with an error if there is no input available. */
@ -217,7 +175,7 @@ struct inflate_state FAR* state;
        have--; \
        hold += (unsigned long)(*next++) << bits; \
        bits += 8; \
-    } Z_ONCE
+    } while (0)
 /* Assure that there are at least n bits in the bit accumulator.  If there is
   not enough available input to do that, then return from inflateBack() with
@ -226,7 +184,7 @@ struct inflate_state FAR* state;
    do { \
        while (bits < (unsigned)(n)) \
            PULLBYTE(); \
-    } Z_ONCE
+    } while (0)
 /* Return the low n bits of the bit accumulator (n < 16) */
 #define BITS(n) \
@ -237,14 +195,14 @@ struct inflate_state FAR* state;
    do { \
        hold >>= (n); \
        bits -= (unsigned)(n); \
-    } Z_ONCE
+    } while (0)
 /* Remove zero to seven bits as needed to go to a byte boundary */
 #define BYTEBITS() \
    do { \
        hold >>= bits & 7; \
        bits -= bits & 7; \
-    } Z_ONCE
+    } while (0)
 /* Assure that some output space is available, by writing out the window
   if it's full.  If the write fails, return from inflateBack() with a
@ -260,7 +218,7 @@ struct inflate_state FAR* state;
                goto inf_leave; \
            } \
        } \
-    } Z_ONCE
+    } while (0)
 /*
   strm provides the memory allocation functions and window buffer on input,
@ -289,19 +247,15 @@ struct inflate_state FAR* state;
   inflateBack() can also return Z_STREAM_ERROR if the input parameters
   are not correct, i.e. strm is Z_NULL or the state was not initialized.
 */
 #ifdef WIN32
 int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR* in_desc, out_func out, void FAR* out_desc)
 #else
 int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
 z_streamp strm;
 in_func in;
 void FAR *in_desc;
 out_func out;
 void FAR *out_desc;
 #endif
 {
    struct inflate_state FAR *state;
-    unsigned char FAR* next;    /* next input */
+    z_const unsigned char FAR *next;    /* next input */
    unsigned char FAR *put;     /* next output */
    unsigned have, left;        /* available input and output */
    unsigned long hold;         /* bit buffer */
@ -318,7 +272,6 @@ void FAR* out_desc;
    /* Check that the strm exists and that the state was initialized */
    if (strm == Z_NULL || strm->state == Z_NULL)
        return Z_STREAM_ERROR;
    state = (struct inflate_state FAR *)strm->state;
    /* Reset the state */
@ -335,48 +288,38 @@ void FAR* out_desc;
    /* Inflate until end of block marked as last */
    for (;;)
-        switch (state->mode)
+        switch (state->mode) {
        {
        case TYPE:
            /* determine and dispatch block type */
-                if (state->last)
+            if (state->last) {
                {
                BYTEBITS();
                state->mode = DONE;
                break;
            }
            NEEDBITS(3);
            state->last = BITS(1);
            DROPBITS(1);
-
+            switch (BITS(2)) {
                switch (BITS(2))
                {
            case 0:                             /* stored block */
                Tracev((stderr, "inflate:     stored block%s\n",
                        state->last ? " (last)" : ""));
                state->mode = STORED;
                break;
            case 1:                             /* fixed block */
                fixedtables(state);
                Tracev((stderr, "inflate:     fixed codes block%s\n",
                        state->last ? " (last)" : ""));
                state->mode = LEN;              /* decode codes */
                break;
            case 2:                             /* dynamic block */
                Tracev((stderr, "inflate:     dynamic codes block%s\n",
                        state->last ? " (last)" : ""));
                state->mode = TABLE;
                break;
            case 3:
                strm->msg = (char *)"invalid block type";
                state->mode = BAD;
            }
            DROPBITS(2);
            break;
@ -384,30 +327,23 @@ void FAR* out_desc;
            /* get and verify stored block length */
            BYTEBITS();                         /* go to byte boundary */
            NEEDBITS(32);
-
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
                if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff))
                {
                strm->msg = (char *)"invalid stored block lengths";
                state->mode = BAD;
                break;
            }
            state->length = (unsigned)hold & 0xffff;
            Tracev((stderr, "inflate:       stored length %u\n",
                    state->length));
            INITBITS();
            /* copy stored block from input to output */
-                while (state->length != 0)
+            while (state->length != 0) {
                {
                copy = state->length;
                PULL();
                ROOM();
                if (copy > have) copy = have;
                if (copy > left) copy = left;
                zmemcpy(put, next, copy);
                have -= copy;
                next += copy;
@ -415,7 +351,6 @@ void FAR* out_desc;
                put += copy;
                state->length -= copy;
            }
            Tracev((stderr, "inflate:       stored end\n"));
            state->mode = TYPE;
            break;
@ -430,106 +365,79 @@ void FAR* out_desc;
            state->ncode = BITS(4) + 4;
            DROPBITS(4);
 #ifndef PKZIP_BUG_WORKAROUND
-
+            if (state->nlen > 286 || state->ndist > 30) {
                if (state->nlen > 286 || state->ndist > 30)
                {
                strm->msg = (char *)"too many length or distance symbols";
                state->mode = BAD;
                break;
            }
 #endif
            Tracev((stderr, "inflate:       table sizes ok\n"));
            /* get code length code lengths (not a typo) */
            state->have = 0;
-
+            while (state->have < state->ncode) {
                while (state->have < state->ncode)
                {
                NEEDBITS(3);
                state->lens[order[state->have++]] = (unsigned short)BITS(3);
                DROPBITS(3);
            }
            while (state->have < 19)
                state->lens[order[state->have++]] = 0;
            state->next = state->codes;
            state->lencode = (code const FAR *)(state->next);
            state->lenbits = 7;
            ret = inflate_table(CODES, state->lens, 19, &(state->next),
                                &(state->lenbits), state->work);
-
+            if (ret) {
                if (ret)
                {
                strm->msg = (char *)"invalid code lengths set";
                state->mode = BAD;
                break;
            }
            Tracev((stderr, "inflate:       code lengths ok\n"));
            /* get length and distance code code lengths */
            state->have = 0;
-
+            while (state->have < state->nlen + state->ndist) {
-                while (state->have < state->nlen + state->ndist)
+                for (;;) {
                {
                    for (;;)
                    {
                    here = state->lencode[BITS(state->lenbits)];
                    if ((unsigned)(here.bits) <= bits) break;
                    PULLBYTE();
                }
-
+                if (here.val < 16) {
                    if (here.val < 16)
                    {
                    DROPBITS(here.bits);
                    state->lens[state->have++] = here.val;
                }
-                    else
+                else {
-                    {
+                    if (here.val == 16) {
                        if (here.val == 16)
                        {
                        NEEDBITS(here.bits + 2);
                        DROPBITS(here.bits);
-
+                        if (state->have == 0) {
                            if (state->have == 0)
                            {
                            strm->msg = (char *)"invalid bit length repeat";
                            state->mode = BAD;
                            break;
                        }
                        len = (unsigned)(state->lens[state->have - 1]);
                        copy = 3 + BITS(2);
                        DROPBITS(2);
                    }
-                        else if (here.val == 17)
+                    else if (here.val == 17) {
                        {
                        NEEDBITS(here.bits + 3);
                        DROPBITS(here.bits);
                        len = 0;
                        copy = 3 + BITS(3);
                        DROPBITS(3);
                    }
-                        else
+                    else {
                        {
                        NEEDBITS(here.bits + 7);
                        DROPBITS(here.bits);
                        len = 0;
                        copy = 11 + BITS(7);
                        DROPBITS(7);
                    }
-
+                    if (state->have + copy > state->nlen + state->ndist) {
                        if (state->have + copy > state->nlen + state->ndist)
                        {
                        strm->msg = (char *)"invalid bit length repeat";
                        state->mode = BAD;
                        break;
                    }
                    while (copy--)
                        state->lens[state->have++] = (unsigned short)len;
                }
@ -539,8 +447,7 @@ void FAR* out_desc;
            if (state->mode == BAD) break;
            /* check for end-of-block code (better have one) */
-                if (state->lens[256] == 0)
+            if (state->lens[256] == 0) {
                {
                strm->msg = (char *)"invalid code -- missing end-of-block";
                state->mode = BAD;
                break;
@ -554,77 +461,55 @@ void FAR* out_desc;
            state->lenbits = 9;
            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
                                &(state->lenbits), state->work);
-
+            if (ret) {
                if (ret)
                {
                strm->msg = (char *)"invalid literal/lengths set";
                state->mode = BAD;
                break;
            }
            state->distcode = (code const FAR *)(state->next);
            state->distbits = 6;
            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
                            &(state->next), &(state->distbits), state->work);
-
+            if (ret) {
                if (ret)
                {
                strm->msg = (char *)"invalid distances set";
                state->mode = BAD;
                break;
            }
            Tracev((stderr, "inflate:       codes ok\n"));
            state->mode = LEN;
        case LEN:
            /* use inflate_fast() if we have enough input and output */
-                if (have >= 6 && left >= 258)
+            if (have >= 6 && left >= 258) {
                {
                RESTORE();
                if (state->whave < state->wsize)
                    state->whave = state->wsize - left;
                inflate_fast(strm, state->wsize);
                LOAD();
                break;
            }
            /* get a literal, length, or end-of-block code */
-                for (;;)
+            for (;;) {
                {
                here = state->lencode[BITS(state->lenbits)];
                if ((unsigned)(here.bits) <= bits) break;
                PULLBYTE();
            }
-
+            if (here.op && (here.op & 0xf0) == 0) {
                if (here.op && (here.op & 0xf0) == 0)
                {
                last = here;
-
+                for (;;) {
                    for (;;)
                    {
                    here = state->lencode[last.val +
                            (BITS(last.bits + last.op) >> last.bits)];
                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                    PULLBYTE();
                }
                DROPBITS(last.bits);
            }
            DROPBITS(here.bits);
            state->length = (unsigned)here.val;
            /* process literal */
-                if (here.op == 0)
+            if (here.op == 0) {
                {
                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                        "inflate:         literal '%c'\n" :
                        "inflate:         literal 0x%02x\n", here.val));
@ -636,16 +521,14 @@ void FAR* out_desc;
            }
            /* process end of block */
-                if (here.op & 32)
+            if (here.op & 32) {
                {
                Tracevv((stderr, "inflate:         end of block\n"));
                state->mode = TYPE;
                break;
            }
            /* invalid code */
-                if (here.op & 64)
+            if (here.op & 64) {
                {
                strm->msg = (char *)"invalid literal/length code";
                state->mode = BAD;
                break;
@ -653,116 +536,80 @@ void FAR* out_desc;
            /* length code -- get extra bits, if any */
            state->extra = (unsigned)(here.op) & 15;
-
+            if (state->extra != 0) {
                if (state->extra != 0)
                {
                NEEDBITS(state->extra);
                state->length += BITS(state->extra);
                DROPBITS(state->extra);
            }
            Tracevv((stderr, "inflate:         length %u\n", state->length));
            /* get distance code */
-                for (;;)
+            for (;;) {
                {
                here = state->distcode[BITS(state->distbits)];
                if ((unsigned)(here.bits) <= bits) break;
                PULLBYTE();
            }
-
+            if ((here.op & 0xf0) == 0) {
                if ((here.op & 0xf0) == 0)
                {
                last = here;
-
+                for (;;) {
                    for (;;)
                    {
                    here = state->distcode[last.val +
                            (BITS(last.bits + last.op) >> last.bits)];
                    if ((unsigned)(last.bits + here.bits) <= bits) break;
                    PULLBYTE();
                }
                DROPBITS(last.bits);
            }
            DROPBITS(here.bits);
-
+            if (here.op & 64) {
                if (here.op & 64)
                {
                strm->msg = (char *)"invalid distance code";
                state->mode = BAD;
                break;
            }
            state->offset = (unsigned)here.val;
            /* get distance extra bits, if any */
            state->extra = (unsigned)(here.op) & 15;
-
+            if (state->extra != 0) {
                if (state->extra != 0)
                {
                NEEDBITS(state->extra);
                state->offset += BITS(state->extra);
                DROPBITS(state->extra);
            }
            if (state->offset > state->wsize - (state->whave < state->wsize ?
-                                                    left : 0))
+                                                left : 0)) {
                {
                strm->msg = (char *)"invalid distance too far back";
                state->mode = BAD;
                break;
            }
            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
            /* copy match from window to output */
-                do
+            do {
                {
                ROOM();
                copy = state->wsize - state->offset;
-
+                if (copy < left) {
                    if (copy < left)
                    {
                    from = put + copy;
                    copy = left - copy;
                }
-                    else
+                else {
                    {
                    from = put - state->offset;
                    copy = left;
                }
                if (copy > state->length) copy = state->length;
                state->length -= copy;
                left -= copy;
-
+                do {
                    do
                    {
                    *put++ = *from++;
-                    }
+                } while (--copy);
-                    while (--copy);
+            } while (state->length != 0);
                }
                while (state->length != 0);
            break;
        case DONE:
            /* inflate stream terminated properly -- write leftover output */
            ret = Z_STREAM_END;
-
+            if (left < state->wsize) {
                if (left < state->wsize)
                {
                if (out(out_desc, state->window, state->wsize - left))
                    ret = Z_BUF_ERROR;
            }
            goto inf_leave;
        case BAD:
@ -781,16 +628,11 @@ inf_leave:
    return ret;
 }
 #ifdef WIN32
 int ZEXPORT inflateBackEnd(z_streamp strm)
 #else
 int ZEXPORT inflateBackEnd(strm)
 z_streamp strm;
 #endif
 {
    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
        return Z_STREAM_ERROR;
    ZFREE(strm, strm->state);
    strm->state = Z_NULL;
    Tracev((stderr, "inflate: end\n"));
--- a/extern/zlib/inffast.c
+++ b/extern/zlib/inffast.c
@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
- * Copyright (C) 1995-2008, 2010 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -8,26 +8,9 @@
 #include "inflate.h"
 #include "inffast.h"
-#ifndef ASMINF
+#ifdef ASMINF
-
+#  pragma message("Assembler code may have bugs -- use at your own risk")
 /* Allow machine dependent optimization for post-increment or pre-increment.
   Based on testing to date,
   Pre-increment preferred for:
   - PowerPC G3 (Adler)
   - MIPS R5000 (Randers-Pehrson)
   Post-increment preferred for:
   - none
   No measurable difference:
   - Pentium III (Anderson)
   - M68060 (Nikl)
 */
 #ifdef POSTINC
 #  define OFF 0
 #  define PUP(a) *(a)++
 #else
 #  define OFF 1
 #  define PUP(a) *++(a)
 #endif
 /*
   Decode literal, length, and distance codes and write out the resulting
@ -64,17 +47,13 @@
      requires strm->avail_out >= 258 for each loop to avoid checking for
      output space.
 */
 #ifdef WIN32
 void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned int start)
 #else
 void ZLIB_INTERNAL inflate_fast(strm, start)
 z_streamp strm;
 unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #endif
 {
    struct inflate_state FAR *state;
-    unsigned char FAR* in;      /* local strm->next_in */
+    z_const unsigned char FAR *in;      /* local strm->next_in */
-    unsigned char FAR* last;    /* while in < last, enough input available */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
    unsigned char FAR *out;     /* local strm->next_out */
    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
    unsigned char FAR *end;     /* while out < end, enough space available */
@ -100,9 +79,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
    /* copy state to local variables */
    state = (struct inflate_state FAR *)strm->state;
-    in = strm->next_in - OFF;
+    in = strm->next_in;
    last = in + (strm->avail_in - 5);
-    out = strm->next_out - OFF;
+    out = strm->next_out;
    beg = out - (start - strm->avail_out);
    end = out + (strm->avail_out - 257);
 #ifdef INFLATE_STRICT
@ -121,287 +100,194 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
    /* decode literals and length/distances until end-of-block or not enough
       input data or output space */
-    do
+    do {
-    {
+        if (bits < 15) {
-        if (bits < 15)
+            hold += (unsigned long)(*in++) << bits;
        {
            hold += (unsigned long)(PUP(in)) << bits;
            bits += 8;
-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;
            bits += 8;
        }
        here = lcode[hold & lmask];
      dolen:
        op = (unsigned)(here.bits);
        hold >>= op;
        bits -= op;
        op = (unsigned)(here.op);
-
+        if (op == 0) {                          /* literal */
        if (op == 0)                            /* literal */
        {
            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
                    "inflate:         literal '%c'\n" :
                    "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
+            *out++ = (unsigned char)(here.val);
        }
-        else if (op & 16)                       /* length base */
+        else if (op & 16) {                     /* length base */
        {
            len = (unsigned)(here.val);
            op &= 15;                           /* number of extra bits */
-
+            if (op) {
-            if (op)
+                if (bits < op) {
-            {
+                    hold += (unsigned long)(*in++) << bits;
                if (bits < op)
                {
                    hold += (unsigned long)(PUP(in)) << bits;
                    bits += 8;
                }
                len += (unsigned)hold & ((1U << op) - 1);
                hold >>= op;
                bits -= op;
            }
            Tracevv((stderr, "inflate:         length %u\n", len));
-
+            if (bits < 15) {
-            if (bits < 15)
+                hold += (unsigned long)(*in++) << bits;
            {
                hold += (unsigned long)(PUP(in)) << bits;
                bits += 8;
-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;
                bits += 8;
            }
            here = dcode[hold & dmask];
          dodist:
            op = (unsigned)(here.bits);
            hold >>= op;
            bits -= op;
            op = (unsigned)(here.op);
-
+            if (op & 16) {                      /* distance base */
            if (op & 16)                        /* distance base */
            {
                dist = (unsigned)(here.val);
                op &= 15;                       /* number of extra bits */
-
+                if (bits < op) {
-                if (bits < op)
+                    hold += (unsigned long)(*in++) << bits;
                {
                    hold += (unsigned long)(PUP(in)) << bits;
                    bits += 8;
-
+                    if (bits < op) {
-                    if (bits < op)
+                        hold += (unsigned long)(*in++) << bits;
                    {
                        hold += (unsigned long)(PUP(in)) << bits;
                        bits += 8;
                    }
                }
                dist += (unsigned)hold & ((1U << op) - 1);
 #ifdef INFLATE_STRICT
-
+                if (dist > dmax) {
                if (dist > dmax)
                {
                    strm->msg = (char *)"invalid distance too far back";
                    state->mode = BAD;
                    break;
                }
 #endif
                hold >>= op;
                bits -= op;
                Tracevv((stderr, "inflate:         distance %u\n", dist));
                op = (unsigned)(out - beg);     /* max distance in output */
-
+                if (dist > op) {                /* see if copy from window */
                if (dist > op)                  /* see if copy from window */
                {
                    op = dist - op;             /* distance back in window */
-
+                    if (op > whave) {
-                    if (op > whave)
+                        if (state->sane) {
                    {
                        if (state->sane)
                        {
                            strm->msg =
                                (char *)"invalid distance too far back";
                            state->mode = BAD;
                            break;
                        }
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
-
+                        if (len <= op - whave) {
-                        if (len <= op - whave)
+                            do {
-                        {
+                                *out++ = 0;
-                            do
+                            } while (--len);
                            {
                                PUP(out) = 0;
                            }
                            while (--len);
                            continue;
                        }
                        len -= op - whave;
-
+                        do {
-                        do
+                            *out++ = 0;
-                        {
+                        } while (--op > whave);
-                            PUP(out) = 0;
+                        if (op == 0) {
                        }
                        while (--op > whave);
                        if (op == 0)
                        {
                            from = out - dist;
-
+                            do {
-                            do
+                                *out++ = *from++;
-                            {
+                            } while (--len);
                                PUP(out) = PUP(from);
                            }
                            while (--len);
                            continue;
                        }
 #endif
                    }
-
+                    from = window;
-                    from = window - OFF;
+                    if (wnext == 0) {           /* very common case */
                    if (wnext == 0)             /* very common case */
                    {
                        from += wsize - op;
-
+                        if (op < len) {         /* some from window */
                        if (op < len)           /* some from window */
                        {
                            len -= op;
-
+                            do {
-                            do
+                                *out++ = *from++;
-                            {
+                            } while (--op);
                                PUP(out) = PUP(from);
                            }
                            while (--op);
                            from = out - dist;  /* rest from output */
                        }
                    }
-                    else if (wnext < op)        /* wrap around window */
+                    else if (wnext < op) {      /* wrap around window */
                    {
                        from += wsize + wnext - op;
                        op -= wnext;
-
+                        if (op < len) {         /* some from end of window */
                        if (op < len)           /* some from end of window */
                        {
                            len -= op;
-
+                            do {
-                            do
+                                *out++ = *from++;
-                            {
+                            } while (--op);
-                                PUP(out) = PUP(from);
+                            from = window;
-                            }
+                            if (wnext < len) {  /* some from start of window */
                            while (--op);
                            from = window - OFF;
                            if (wnext < len)    /* some from start of window */
                            {
                                op = wnext;
                                len -= op;
-
+                                do {
-                                do
+                                    *out++ = *from++;
-                                {
+                                } while (--op);
                                    PUP(out) = PUP(from);
                                }
                                while (--op);
                                from = out - dist;      /* rest from output */
                            }
                        }
                    }
-                    else                        /* contiguous in window */
+                    else {                      /* contiguous in window */
                    {
                        from += wnext - op;
-
+                        if (op < len) {         /* some from window */
                        if (op < len)           /* some from window */
                        {
                            len -= op;
-
+                            do {
-                            do
+                                *out++ = *from++;
-                            {
+                            } while (--op);
                                PUP(out) = PUP(from);
                            }
                            while (--op);
                            from = out - dist;  /* rest from output */
                        }
                    }
-
+                    while (len > 2) {
-                    while (len > 2)
+                        *out++ = *from++;
-                    {
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                        PUP(out) = PUP(from);
                        PUP(out) = PUP(from);
                        len -= 3;
                    }
-
+                    if (len) {
-                    if (len)
+                        *out++ = *from++;
                    {
                        PUP(out) = PUP(from);
                        if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                    }
                }
-                else
+                else {
                {
                    from = out - dist;          /* copy direct from output */
-
+                    do {                        /* minimum length is three */
-                    do                          /* minimum length is three */
+                        *out++ = *from++;
-                    {
+                        *out++ = *from++;
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
                        PUP(out) = PUP(from);
                        PUP(out) = PUP(from);
                        len -= 3;
-                    }
+                    } while (len > 2);
-                    while (len > 2);
+                    if (len) {
-
+                        *out++ = *from++;
                    if (len)
                    {
                        PUP(out) = PUP(from);
                        if (len > 1)
-                            PUP(out) = PUP(from);
+                            *out++ = *from++;
                    }
                }
            }
-            else if ((op & 64) == 0)            /* 2nd level distance code */
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
            {
                here = dcode[here.val + (hold & ((1U << op) - 1))];
                goto dodist;
            }
-            else
+            else {
            {
                strm->msg = (char *)"invalid distance code";
                state->mode = BAD;
                break;
            }
        }
-        else if ((op & 64) == 0)                /* 2nd level length code */
+        else if ((op & 64) == 0) {              /* 2nd level length code */
        {
            here = lcode[here.val + (hold & ((1U << op) - 1))];
            goto dolen;
        }
-        else if (op & 32)                       /* end-of-block */
+        else if (op & 32) {                     /* end-of-block */
        {
            Tracevv((stderr, "inflate:         end of block\n"));
            state->mode = TYPE;
            break;
        }
-        else
+        else {
        {
            strm->msg = (char *)"invalid literal/length code";
            state->mode = BAD;
            break;
        }
-    }
+    } while (in < last && out < end);
    while (in < last && out < end);
    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
    len = bits >> 3;
@ -410,8 +296,8 @@ dodist:
    hold &= (1U << bits) - 1;
    /* update state and return */
-    strm->next_in = in + OFF;
+    strm->next_in = in;
-    strm->next_out = out + OFF;
+    strm->next_out = out;
    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
    strm->avail_out = (unsigned)(out < end ?
                                 257 + (end - out) : 257 - (out - end));
--- a/extern/zlib/inffixed.h
+++ b/extern/zlib/inffixed.h
@ -7,8 +7,7 @@
       subject to change. Applications should only use zlib.h.
     */
-static const code lenfix[512] =
+    static const code lenfix[512] = {
 {
        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
@ -85,8 +84,7 @@ static const code lenfix[512] =
        {0,9,255}
    };
-static const code distfix[32] =
+    static const code distfix[32] = {
 {
        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
--- a/extern/zlib/inflate.c
+++ b/extern/zlib/inflate.c
--- a/extern/zlib/inflate.h
+++ b/extern/zlib/inflate.h
@ -1,5 +1,5 @@
 /* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -17,9 +17,8 @@
 #endif
 /* Possible inflate modes between inflate() calls */
-typedef enum
+typedef enum {
-{
+    HEAD = 16180,   /* i: waiting for magic header */
    HEAD,       /* i: waiting for magic header */
    FLAGS,      /* i: waiting for method and flags (gzip) */
    TIME,       /* i: waiting for modification time (gzip) */
    OS,         /* i: waiting for extra flags and operating system (gzip) */
@ -78,12 +77,14 @@ typedef enum
        CHECK -> LENGTH -> DONE
 */
-/* state maintained between inflate() calls.  Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
-struct inflate_state
+   including the allocated sliding window, which is up to 32K bytes. */
-{
+struct inflate_state {
    z_streamp strm;             /* pointer back to this zlib stream */
    inflate_mode mode;          /* current inflate mode */
    int last;                   /* true if processing last block */
-    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
                                   bit 2 true to validate check value */
    int havedict;               /* true if dictionary provided */
    int flags;                  /* gzip header method and flags (0 if zlib) */
    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
--- a/extern/zlib/inftrees.c
+++ b/extern/zlib/inftrees.c
@ -1,5 +1,5 @@
 /* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -9,8 +9,7 @@
 #define MAXBITS 15
 const char inflate_copyright[] =
-    // " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
+   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
    " inflate 1.2.7.f-hanba-win64 Copyright (C) 2012-14 Jonathan Hanba";
 /*
  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
@ -18,18 +17,6 @@ const char inflate_copyright[] =
  copyright string in the executable of your product.
 */
 /*
 * !!!!
 * !!!! Please e-mail mailto://hanbaj@gmail.com for help with this altered source
 * !!!! distribution. This altered source distribution is NOT supported by the
 * !!!! original creators Jean-loup Gailly and Mark Adler.
 * !!!!
 * !!!! zlib 1.2.7.f-hanba-win64 is an altered source distribution of zlib 1.2.7.
 * !!!! The purpose of the changes made herein were to specifically address
 * !!!! compiler errors and warnings in a Microsoft Windows build environment.
 * !!!!
 */
 /*
   Build a set of tables to decode the provided canonical Huffman code.
   The code lengths are lens[0..codes-1].  The result starts at *table,
@ -42,9 +29,6 @@ const char inflate_copyright[] =
   table index bits.  It will differ if the request is greater than the
   longest code or if it is less than the shortest code.
 */
 #ifdef WIN32
 int ZLIB_INTERNAL inflate_table(codetype type, unsigned short FAR* lens, unsigned int codes, code FAR* FAR* table, unsigned FAR* bits, unsigned short FAR* work)
 #else
 int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
 codetype type;
 unsigned short FAR *lens;
@ -52,7 +36,6 @@ unsigned codes;
 code FAR * FAR *table;
 unsigned FAR *bits;
 unsigned short FAR *work;
 #endif
 {
    unsigned len;               /* a code's length in bits */
    unsigned sym;               /* index of code symbols */
@ -71,31 +54,23 @@ unsigned short FAR* work;
    code FAR *next;             /* next available space in table */
    const unsigned short FAR *base;     /* base value table to use */
    const unsigned short FAR *extra;    /* extra bits table to use */
-    int end;                    /* use base and extra for symbol > end */
+    unsigned match;             /* use base and extra for symbol >= match */
    unsigned short count[MAXBITS+1];    /* number of codes of each length */
    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
-    static const unsigned short lbase[31] =   /* Length codes 257..285 base */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
    {
        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
+        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 */
    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, 77, 202};
-    };
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
    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,
-        8193, 12289, 16385, 24577, 0, 0
+        8193, 12289, 16385, 24577, 0, 0};
-    };
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
    static const unsigned short dext[32] =   /* Distance codes 0..29 extra */
    {
        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
-        28, 28, 29, 29, 64, 64
+        28, 28, 29, 29, 64, 64};
    };
    /*
       Process a set of code lengths to create a canonical Huffman code.  The
@ -131,20 +106,15 @@ unsigned short FAR* work;
    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
    for (len = 0; len <= MAXBITS; len++)
        count[len] = 0;
    for (sym = 0; sym < codes; sym++)
        count[lens[sym]]++;
    /* bound code lengths, force root to be within code lengths */
    root = *bits;
    for (max = MAXBITS; max >= 1; max--)
        if (count[max] != 0) break;
    if (root > max) root = max;
-
+    if (max == 0) {                     /* no symbols to code at all */
    if (max == 0)                       /* no symbols to code at all */
    {
        here.op = (unsigned char)64;    /* invalid code marker */
        here.bits = (unsigned char)1;
        here.val = (unsigned short)0;
@ -153,29 +123,22 @@ unsigned short FAR* work;
        *bits = 1;
        return 0;     /* no symbols, but wait for decoding to report error */
    }
    for (min = 1; min < max; min++)
        if (count[min] != 0) break;
    if (root < min) root = min;
    /* check for an over-subscribed or incomplete set of lengths */
    left = 1;
-
+    for (len = 1; len <= MAXBITS; len++) {
    for (len = 1; len <= MAXBITS; len++)
    {
        left <<= 1;
        left -= count[len];
        if (left < 0) return -1;        /* over-subscribed */
    }
    if (left > 0 && (type == CODES || max != 1))
        return -1;                      /* incomplete set */
    /* generate offsets into symbol table for each length for sorting */
    offs[1] = 0;
    for (len = 1; len < MAXBITS; len++)
        offs[len + 1] = offs[len] + count[len];
@ -215,25 +178,20 @@ unsigned short FAR* work;
     */
    /* set up for code type */
-    switch (type)
+    switch (type) {
    {
    case CODES:
        base = extra = work;    /* dummy value--not used */
-            end = 19;
+        match = 20;
        break;
    case LENS:
        base = lbase;
            base -= 257;
        extra = lext;
-            extra -= 257;
+        match = 257;
            end = 256;
        break;
    default:    /* DISTS */
        base = dbase;
        extra = dext;
-            end = -1;
+        match = 0;
    }
    /* initialize state for loop */
@ -248,28 +206,23 @@ unsigned short FAR* work;
    mask = used - 1;            /* mask for comparing low */
    /* check available table space */
-    if ((type == LENS && used >= ENOUGH_LENS) ||
+    if ((type == LENS && used > ENOUGH_LENS) ||
-            (type == DISTS && used >= ENOUGH_DISTS))
+        (type == DISTS && used > ENOUGH_DISTS))
        return 1;
    /* process all codes and make table entries */
-    for (;;)
+    for (;;) {
    {
        /* create table entry */
        here.bits = (unsigned char)(len - drop);
-
+        if (work[sym] + 1U < match) {
        if ((int)(work[sym]) < end)
        {
            here.op = (unsigned char)0;
            here.val = work[sym];
        }
-        else if ((int)(work[sym]) > end)
+        else if (work[sym] >= match) {
-        {
+            here.op = (unsigned char)(extra[work[sym] - match]);
-            here.op = (unsigned char)(extra[work[sym]]);
+            here.val = base[work[sym] - match];
            here.val = base[work[sym]];
        }
-        else
+        else {
        {
            here.op = (unsigned char)(32 + 64);         /* end of block */
            here.val = 0;
        }
@ -278,22 +231,16 @@ unsigned short FAR* work;
        incr = 1U << (len - drop);
        fill = 1U << curr;
        min = fill;                 /* save offset to next table */
-
+        do {
        do
        {
            fill -= incr;
            next[(huff >> drop) + fill] = here;
-        }
+        } while (fill != 0);
        while (fill != 0);
        /* backwards increment the len-bit code huff */
        incr = 1U << (len - 1);
        while (huff & incr)
            incr >>= 1;
-
+        if (incr != 0) {
        if (incr != 0)
        {
            huff &= incr - 1;
            huff += incr;
        }
@ -302,17 +249,13 @@ unsigned short FAR* work;
        /* go to next symbol, update count, len */
        sym++;
-
+        if (--(count[len]) == 0) {
        if (--(count[len]) == 0)
        {
            if (len == max) break;
            len = lens[work[sym]];
        }
        /* create new sub-table if needed */
-        if (len > root && (huff & mask) != low)
+        if (len > root && (huff & mask) != low) {
        {
            /* if first time, transition to sub-tables */
            if (drop == 0)
                drop = root;
@ -323,22 +266,17 @@ unsigned short FAR* work;
            /* determine length of next table */
            curr = len - drop;
            left = (int)(1 << curr);
-
+            while (curr + drop < max) {
            while (curr + drop < max)
            {
                left -= count[curr + drop];
                if (left <= 0) break;
                curr++;
                left <<= 1;
            }
            /* check for enough space */
            used += 1U << curr;
-
+            if ((type == LENS && used > ENOUGH_LENS) ||
-            if ((type == LENS && used >= ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
                    (type == DISTS && used >= ENOUGH_DISTS))
                return 1;
            /* point entry in root table to sub-table */
@ -352,8 +290,7 @@ unsigned short FAR* work;
    /* fill in remaining table entry if code is incomplete (guaranteed to have
       at most one remaining entry, since if the code is incomplete, the
       maximum code length that was allowed to get this far is one bit) */
-    if (huff != 0)
+    if (huff != 0) {
    {
        here.op = (unsigned char)64;            /* invalid code marker */
        here.bits = (unsigned char)(len - drop);
        here.val = (unsigned short)0;
--- a/extern/zlib/inftrees.h
+++ b/extern/zlib/inftrees.h
@ -21,8 +21,7 @@
   of the bit buffer.  val is the actual byte to output in the case
   of a literal, the base length or distance, or the offset from
   the current table to the next table.  Each entry is four bytes. */
-typedef struct
+typedef struct {
 {
    unsigned char op;           /* operation, extra bits, table bits */
    unsigned char bits;         /* bits in this part of the code */
    unsigned short val;         /* offset in table or code value */
@ -52,8 +51,7 @@ typedef struct
 #define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
 /* Type of code to build for inflate_table() */
-typedef enum
+typedef enum {
 {
    CODES,
    LENS,
    DISTS
--- a/extern/zlib/test/example.c
+++ b/extern/zlib/test/example.c
@ -1,5 +1,5 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2006, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -26,13 +26,13 @@
    } \
 }
-const char hello[] = "hello, hello!";
+static z_const char hello[] = "hello, hello!";
 /* "hello world" would be more standard, but the repeated "hello"
 * stresses the compression code better, sorry...
 */
-const char dictionary[] = "hello";
+static const char dictionary[] = "hello";
-uLong dictId; /* Adler32 value of the dictionary */
+static uLong dictId;    /* Adler32 value of the dictionary */
 void test_deflate       OF((Byte *compr, uLong comprLen));
 void test_inflate       OF((Byte *compr, uLong comprLen,
@ -59,13 +59,13 @@ void* myalloc(q, n, m)
    void *q;
    unsigned n, m;
 {
-    q = Z_NULL;
+    (void)q;
    return calloc(n, m);
 }
 void myfree(void *q, void *p)
 {
-    q = Z_NULL;
+    (void)q;
    free(p);
 }
@ -100,13 +100,10 @@ uLong comprLen, uncomprLen;
    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
    CHECK_ERR(err, "uncompress");
-    if (strcmp((char*)uncompr, hello))
+    if (strcmp((char*)uncompr, hello)) {
    {
        fprintf(stderr, "bad uncompress\n");
        exit(1);
-    }
+    } else {
    else
    {
        printf("uncompress(): %s\n", (char *)uncompr);
    }
 }
@ -128,92 +125,66 @@ uLong uncomprLen;
    z_off_t pos;
    file = gzopen(fname, "wb");
-
+    if (file == NULL) {
    if (file == NULL)
    {
        fprintf(stderr, "gzopen error\n");
        exit(1);
    }
    gzputc(file, 'h');
-
+    if (gzputs(file, "ello") != 4) {
    if (gzputs(file, "ello") != 4)
    {
        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
        exit(1);
    }
-
+    if (gzprintf(file, ", %s!", "hello") != 8) {
    if (gzprintf(file, ", %s!", "hello") != 8)
    {
        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
        exit(1);
    }
    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
    gzclose(file);
    file = gzopen(fname, "rb");
-
+    if (file == NULL) {
    if (file == NULL)
    {
        fprintf(stderr, "gzopen error\n");
        exit(1);
    }
    strcpy((char*)uncompr, "garbage");
-    if (gzread(file, uncompr, (unsigned)uncomprLen) != len)
+    if (gzread(file, uncompr, (unsigned)uncomprLen) != len) {
    {
        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
        exit(1);
    }
-
+    if (strcmp((char*)uncompr, hello)) {
    if (strcmp((char*)uncompr, hello))
    {
        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
        exit(1);
-    }
+    } else {
    else
    {
        printf("gzread(): %s\n", (char*)uncompr);
    }
    pos = gzseek(file, -8L, SEEK_CUR);
-
+    if (pos != 6 || gztell(file) != pos) {
    if (pos != 6 || gztell(file) != pos)
    {
        fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
                (long)pos, (long)gztell(file));
        exit(1);
    }
-    if (gzgetc(file) != ' ')
+    if (gzgetc(file) != ' ') {
    {
        fprintf(stderr, "gzgetc error\n");
        exit(1);
    }
-    if (gzungetc(' ', file) != ' ')
+    if (gzungetc(' ', file) != ' ') {
    {
        fprintf(stderr, "gzungetc error\n");
        exit(1);
    }
    gzgets(file, (char*)uncompr, (int)uncomprLen);
-
+    if (strlen((char*)uncompr) != 7) { /* " hello!" */
    if (strlen((char*)uncompr) != 7)   /* " hello!" */
    {
        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
        exit(1);
    }
-
+    if (strcmp((char*)uncompr, hello + 6)) {
    if (strcmp((char*)uncompr, hello + 6))
    {
        fprintf(stderr, "bad gzgets after gzseek\n");
        exit(1);
-    }
+    } else {
    else
    {
        printf("gzgets() after gzseek: %s\n", (char*)uncompr);
    }
@ -241,24 +212,19 @@ uLong comprLen;
    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
    CHECK_ERR(err, "deflateInit");
-    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_in  = (z_const unsigned char *)hello;
    c_stream.next_out = compr;
-    while (c_stream.total_in != len && c_stream.total_out < comprLen)
+    while (c_stream.total_in != len && c_stream.total_out < comprLen) {
    {
        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
        err = deflate(&c_stream, Z_NO_FLUSH);
        CHECK_ERR(err, "deflate");
    }
    /* Finish the stream, still forcing small buffers: */
-    for (;;)
+    for (;;) {
    {
        c_stream.avail_out = 1;
        err = deflate(&c_stream, Z_FINISH);
        if (err == Z_STREAM_END) break;
        CHECK_ERR(err, "deflate");
    }
@ -289,26 +255,20 @@ uLong comprLen, uncomprLen;
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen)
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
    {
        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
        err = inflate(&d_stream, Z_NO_FLUSH);
        if (err == Z_STREAM_END) break;
        CHECK_ERR(err, "inflate");
    }
    err = inflateEnd(&d_stream);
    CHECK_ERR(err, "inflateEnd");
-    if (strcmp((char*)uncompr, hello))
+    if (strcmp((char*)uncompr, hello)) {
    {
        fprintf(stderr, "bad inflate\n");
        exit(1);
-    }
+    } else {
    else
    {
        printf("inflate(): %s\n", (char *)uncompr);
    }
 }
@ -340,9 +300,7 @@ uLong comprLen, uncomprLen;
    c_stream.avail_in = (uInt)uncomprLen;
    err = deflate(&c_stream, Z_NO_FLUSH);
    CHECK_ERR(err, "deflate");
-
+    if (c_stream.avail_in != 0) {
    if (c_stream.avail_in != 0)
    {
        fprintf(stderr, "deflate not greedy\n");
        exit(1);
    }
@ -362,13 +320,10 @@ uLong comprLen, uncomprLen;
    CHECK_ERR(err, "deflate");
    err = deflate(&c_stream, Z_FINISH);
-
+    if (err != Z_STREAM_END) {
    if (err != Z_STREAM_END)
    {
        fprintf(stderr, "deflate should report Z_STREAM_END\n");
        exit(1);
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
 }
@ -395,27 +350,21 @@ uLong comprLen, uncomprLen;
    err = inflateInit(&d_stream);
    CHECK_ERR(err, "inflateInit");
-    for (;;)
+    for (;;) {
    {
        d_stream.next_out = uncompr;            /* discard the output */
        d_stream.avail_out = (uInt)uncomprLen;
        err = inflate(&d_stream, Z_NO_FLUSH);
        if (err == Z_STREAM_END) break;
        CHECK_ERR(err, "large inflate");
    }
    err = inflateEnd(&d_stream);
    CHECK_ERR(err, "inflateEnd");
-    if (d_stream.total_out != 2 * uncomprLen + comprLen / 2)
+    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
    {
        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
        exit(1);
-    }
+    } else {
    else
    {
        printf("large_inflate(): OK\n");
    }
 }
@ -438,7 +387,7 @@ uLong* comprLen;
    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
    CHECK_ERR(err, "deflateInit");
-    c_stream.next_in  = (Bytef*)hello;
+    c_stream.next_in  = (z_const unsigned char *)hello;
    c_stream.next_out = compr;
    c_stream.avail_in = 3;
    c_stream.avail_out = (uInt)*comprLen;
@ -449,12 +398,9 @@ uLong* comprLen;
    c_stream.avail_in = len - 3;
    err = deflate(&c_stream, Z_FINISH);
-
+    if (err != Z_STREAM_END) {
    if (err != Z_STREAM_END)
    {
        CHECK_ERR(err, "deflate");
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
@ -486,7 +432,7 @@ uLong comprLen, uncomprLen;
    d_stream.next_out = uncompr;
    d_stream.avail_out = (uInt)uncomprLen;
-    inflate(&d_stream, Z_NO_FLUSH);
+    err = inflate(&d_stream, Z_NO_FLUSH);
    CHECK_ERR(err, "inflate");
    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
@ -494,14 +440,11 @@ uLong comprLen, uncomprLen;
    CHECK_ERR(err, "inflateSync");
    err = inflate(&d_stream, Z_FINISH);
-
+    if (err != Z_DATA_ERROR) {
    if (err != Z_DATA_ERROR)
    {
        fprintf(stderr, "inflate should report DATA_ERROR\n");
        /* Because of incorrect adler32 */
        exit(1);
    }
    err = inflateEnd(&d_stream);
    CHECK_ERR(err, "inflateEnd");
@ -533,17 +476,14 @@ uLong comprLen;
    c_stream.next_out = compr;
    c_stream.avail_out = (uInt)comprLen;
-    c_stream.next_in = (Bytef*)hello;
+    c_stream.next_in = (z_const unsigned char *)hello;
    c_stream.avail_in = (uInt)strlen(hello)+1;
    err = deflate(&c_stream, Z_FINISH);
-
+    if (err != Z_STREAM_END) {
    if (err != Z_STREAM_END)
    {
        fprintf(stderr, "deflate should report Z_STREAM_END\n");
        exit(1);
    }
    err = deflateEnd(&c_stream);
    CHECK_ERR(err, "deflateEnd");
 }
@ -573,37 +513,27 @@ uLong comprLen, uncomprLen;
    d_stream.next_out = uncompr;
    d_stream.avail_out = (uInt)uncomprLen;
-    for (;;)
+    for (;;) {
    {
        err = inflate(&d_stream, Z_NO_FLUSH);
        if (err == Z_STREAM_END) break;
-
+        if (err == Z_NEED_DICT) {
-        if (err == Z_NEED_DICT)
+            if (d_stream.adler != dictId) {
        {
            if (d_stream.adler != dictId)
            {
                fprintf(stderr, "unexpected dictionary");
                exit(1);
            }
            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
                                       (int)sizeof(dictionary));
        }
        CHECK_ERR(err, "inflate with dict");
    }
    err = inflateEnd(&d_stream);
    CHECK_ERR(err, "inflateEnd");
-    if (strcmp((char*)uncompr, hello))
+    if (strcmp((char*)uncompr, hello)) {
    {
        fprintf(stderr, "bad inflate with dict\n");
        exit(1);
-    }
+    } else {
    else
    {
        printf("inflate with dictionary: %s\n", (char *)uncompr);
    }
 }
@ -621,14 +551,11 @@ char* argv[];
    uLong uncomprLen = comprLen;
    static const char* myVersion = ZLIB_VERSION;
-    if (zlibVersion()[0] != myVersion[0])
+    if (zlibVersion()[0] != myVersion[0]) {
    {
        fprintf(stderr, "incompatible zlib version\n");
        exit(1);
-    }
+    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
    else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0)
    {
        fprintf(stderr, "warning: different zlib version\n");
    }
@ -637,18 +564,17 @@ char* argv[];
    compr    = (Byte*)calloc((uInt)comprLen, 1);
    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
    /* compr and uncompr are cleared to avoid reading uninitialized
     * data and to ensure that uncompr compresses well.
     */
-    if (compr == Z_NULL || uncompr == Z_NULL)
+    if (compr == Z_NULL || uncompr == Z_NULL) {
    {
        printf("out of memory\n");
        exit(1);
    }
 #ifdef Z_SOLO
-    argc = strlen(argv[0]);
+    (void)argc;
    (void)argv;
 #else
    test_compress(compr, comprLen, uncompr, uncomprLen);
--- a/extern/zlib/test/infcover.c
+++ b/extern/zlib/test/infcover.c
@ -1,5 +1,5 @@
 /* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011 Mark Adler
+ * Copyright (C) 2011, 2016 Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -53,16 +53,14 @@
 */
 /* these items are strung together in a linked list, one for each allocation */
-struct mem_item
+struct mem_item {
 {
    void *ptr;                  /* pointer to allocated memory */
    size_t size;                /* requested size of allocation */
    struct mem_item *next;      /* pointer to next item in list, or NULL */
 };
 /* this structure is at the root of the linked list, and tracks statistics */
-struct mem_zone
+struct mem_zone {
 {
    struct mem_item *first;     /* pointer to first item in list, or NULL */
    size_t total, highwater;    /* total allocations, and largest total */
    size_t limit;               /* memory allocation limit, or 0 if no limit */
@ -84,21 +82,16 @@ local void* mem_alloc(void* mem, unsigned count, unsigned size)
    /* perform allocation using the standard library, fill memory with a
       non-zero value to make sure that the code isn't depending on zeros */
    ptr = malloc(len);
    if (ptr == NULL)
        return NULL;
    memset(ptr, 0xa5, len);
    /* create a new item for the list */
    item = malloc(sizeof(struct mem_item));
-
+    if (item == NULL) {
    if (item == NULL)
    {
        free(ptr);
        return NULL;
    }
    item->ptr = ptr;
    item->size = len;
@ -108,7 +101,6 @@ local void* mem_alloc(void* mem, unsigned count, unsigned size)
    /* update the statistics */
    zone->total += item->size;
    if (zone->total > zone->highwater)
        zone->highwater = zone->total;
@ -123,8 +115,7 @@ local void mem_free(void* mem, void* ptr)
    struct mem_zone *zone = mem;
    /* if no zone, just do a free */
-    if (zone == NULL)
+    if (zone == NULL) {
    {
        free(ptr);
        return;
    }
@ -132,22 +123,15 @@ local void mem_free(void* mem, void* ptr)
    /* point next to the item that matches ptr, or NULL if not found -- remove
       the item from the linked list if found */
    next = zone->first;
-
+    if (next) {
    if (next)
    {
        if (next->ptr == ptr)
            zone->first = next->next;   /* first one is it, remove from list */
-        else
+        else {
-        {
+            do {                        /* search the linked list */
            do                          /* search the linked list */
            {
                item = next;
                next = item->next;
-            }
+            } while (next != NULL && next->ptr != ptr);
-            while (next != NULL && next->ptr != ptr);
+            if (next) {                 /* if found, remove from linked list */
            if (next)                   /* if found, remove from linked list */
            {
                item->next = next->next;
                zone->notlifo++;        /* not a LIFO free */
            }
@ -156,8 +140,7 @@ local void mem_free(void* mem, void* ptr)
    }
    /* if found, update the statistics and free the item */
-    if (next)
+    if (next) {
    {
        zone->total -= next->size;
        free(next);
    }
@ -225,9 +208,7 @@ local void mem_done(z_stream* strm, char* prefix)
    /* free leftover allocations and item structures, if any */
    item = zone->first;
-
+    while (item != NULL) {
    while (item != NULL)
    {
        free(item->ptr);
        next = item->next;
        free(item);
@ -239,10 +220,8 @@ local void mem_done(z_stream* strm, char* prefix)
    if (count || zone->total)
        fprintf(stderr, "** %s: %lu bytes in %d blocks not freed\n",
                prefix, zone->total, count);
    if (zone->notlifo)
        fprintf(stderr, "** %s: %d frees not LIFO\n", prefix, zone->notlifo);
    if (zone->rogue)
        fprintf(stderr, "** %s: %d frees not recognized\n",
                prefix, zone->rogue);
@ -258,26 +237,22 @@ local void mem_done(z_stream* strm, char* prefix)
 /* Decode a hexadecimal string, set *len to length, in[] to the bytes.  This
   decodes liberally, in that hex digits can be adjacent, in which case two in
-   a row writes a byte.  Or they can delimited by any non-hex character, where
+   a row writes a byte.  Or they can be delimited by any non-hex character,
-   the delimiters are ignored except when a single hex digit is followed by a
+   where the delimiters are ignored except when a single hex digit is followed
-   delimiter in which case that single digit writes a byte.  The returned
+   by a delimiter, where that single digit writes a byte.  The returned data is
-   data is allocated and must eventually be freed.  NULL is returned if out of
+   allocated and must eventually be freed.  NULL is returned if out of memory.
-   memory.  If the length is not needed, then len can be NULL. */
+   If the length is not needed, then len can be NULL. */
 local unsigned char *h2b(const char *hex, unsigned *len)
 {
-    unsigned char* in;
+    unsigned char *in, *re;
    unsigned next, val;
    in = malloc((strlen(hex) + 1) >> 1);
    if (in == NULL)
        return NULL;
    next = 0;
    val = 1;
-
+    do {
    do
    {
        if (*hex >= '0' && *hex <= '9')
            val = (val << 4) + *hex - '0';
        else if (*hex >= 'A' && *hex <= 'F')
@ -286,20 +261,15 @@ local unsigned char* h2b(const char* hex, unsigned* len)
            val = (val << 4) + *hex - 'a' + 10;
        else if (val != 1 && val < 32)  /* one digit followed by delimiter */
            val += 240;                 /* make it look like two digits */
-
+        if (val > 255) {                /* have two digits */
        if (val > 255)                  /* have two digits */
        {
            in[next++] = val & 0xff;    /* save the decoded byte */
            val = 1;                    /* start over */
        }
-    }
+    } while (*hex++);       /* go through the loop with the terminating null */
    while (*hex++);         /* go through the loop with the terminating null */
    if (len != NULL)
        *len = next;
-
+    re = realloc(in, next);
-    in = reallocf(in, next);
+    return re == NULL ? in : re;
    return in;
 }
 /* generic inflate() run, where hex is the hexadecimal input data, what is the
@ -324,50 +294,33 @@ local void inf(char* hex, char* what, unsigned step, int win, unsigned len,
    strm.avail_in = 0;
    strm.next_in = Z_NULL;
    ret = inflateInit2(&strm, win);
-
+    if (ret != Z_OK) {
    if (ret != Z_OK)
    {
        mem_done(&strm, what);
        return;
    }
-
+    out = malloc(len);                          assert(out != NULL);
-    out = malloc(len);
+    if (win == 47) {
    assert(out != NULL);
    if (win == 47)
    {
        head.extra = out;
        head.extra_max = len;
        head.name = out;
        head.name_max = len;
        head.comment = out;
        head.comm_max = len;
-        ret = inflateGetHeader(&strm, &head);
+        ret = inflateGetHeader(&strm, &head);   assert(ret == Z_OK);
        assert(ret == Z_OK);
    }
-
+    in = h2b(hex, &have);                       assert(in != NULL);
    in = h2b(hex, &have);
    assert(in != NULL);
    if (step == 0 || step > have)
        step = have;
    strm.avail_in = step;
    have -= step;
    strm.next_in = in;
-
+    do {
    do
    {
        strm.avail_out = len;
        strm.next_out = out;
-        ret = inflate(&strm, Z_NO_FLUSH);
+        ret = inflate(&strm, Z_NO_FLUSH);       assert(err == 9 || ret == err);
        assert(err == 9 || ret == err);
        if (ret != Z_OK && ret != Z_BUF_ERROR && ret != Z_NEED_DICT)
            break;
-
+        if (ret == Z_NEED_DICT) {
        if (ret == Z_NEED_DICT)
        {
            ret = inflateSetDictionary(&strm, in, 1);
                                                assert(ret == Z_DATA_ERROR);
            mem_limit(&strm, 1);
@ -377,27 +330,19 @@ local void inf(char* hex, char* what, unsigned step, int win, unsigned len,
            ((struct inflate_state *)strm.state)->mode = DICT;
            ret = inflateSetDictionary(&strm, out, 0);
                                                assert(ret == Z_OK);
-            ret = inflate(&strm, Z_NO_FLUSH);
+            ret = inflate(&strm, Z_NO_FLUSH);   assert(ret == Z_BUF_ERROR);
            assert(ret == Z_BUF_ERROR);
        }
-
+        ret = inflateCopy(&copy, &strm);        assert(ret == Z_OK);
-        ret = inflateCopy(&copy, &strm);
+        ret = inflateEnd(&copy);                assert(ret == Z_OK);
        assert(ret == Z_OK);
        ret = inflateEnd(&copy);
        assert(ret == Z_OK);
        err = 9;                        /* don't care next time around */
        have += strm.avail_in;
        strm.avail_in = step > have ? have : step;
        have -= strm.avail_in;
-    }
+    } while (strm.avail_in);
    while (strm.avail_in);
    free(in);
    free(out);
-    ret = inflateReset2(&strm, -8);
+    ret = inflateReset2(&strm, -8);             assert(ret == Z_OK);
-    assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
    ret = inflateEnd(&strm);
    assert(ret == Z_OK);
    mem_done(&strm, what);
 }
@ -410,17 +355,13 @@ local void cover_support(void)
    mem_setup(&strm);
    strm.avail_in = 0;
    strm.next_in = Z_NULL;
-    ret = inflateInit(&strm);
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
    assert(ret == Z_OK);
    mem_used(&strm, "inflate init");
-    ret = inflatePrime(&strm, 5, 31);
+    ret = inflatePrime(&strm, 5, 31);           assert(ret == Z_OK);
-    assert(ret == Z_OK);
+    ret = inflatePrime(&strm, -1, 0);           assert(ret == Z_OK);
    ret = inflatePrime(&strm, -1, 0);
    assert(ret == Z_OK);
    ret = inflateSetDictionary(&strm, Z_NULL, 0);
                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateEnd(&strm);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
    assert(ret == Z_OK);
    mem_done(&strm, "prime");
    inf("63 0", "force window allocation", 0, -15, 1, Z_OK);
@ -438,10 +379,8 @@ local void cover_support(void)
    strm.avail_in = 0;
    strm.next_in = Z_NULL;
-    ret = inflateInit(&strm);
+    ret = inflateInit(&strm);                   assert(ret == Z_OK);
-    assert(ret == Z_OK);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
    ret = inflateEnd(&strm);
    assert(ret == Z_OK);
    fputs("inflate built-in memory routines\n", stderr);
 }
@ -452,12 +391,9 @@ local void cover_wrap(void)
    z_stream strm, copy;
    unsigned char dict[257];
-    ret = inflate(Z_NULL, 0);
+    ret = inflate(Z_NULL, 0);                   assert(ret == Z_STREAM_ERROR);
-    assert(ret == Z_STREAM_ERROR);
+    ret = inflateEnd(Z_NULL);                   assert(ret == Z_STREAM_ERROR);
-    ret = inflateEnd(Z_NULL);
+    ret = inflateCopy(Z_NULL, Z_NULL);          assert(ret == Z_STREAM_ERROR);
    assert(ret == Z_STREAM_ERROR);
    ret = inflateCopy(Z_NULL, Z_NULL);
    assert(ret == Z_STREAM_ERROR);
    fputs("inflate bad parameters\n", stderr);
    inf("1f 8b 0 0", "bad gzip method", 0, 31, 0, Z_DATA_ERROR);
@ -483,36 +419,27 @@ local void cover_wrap(void)
    strm.avail_out = 1;
    strm.next_out = (void *)&ret;
    mem_limit(&strm, 1);
-    ret = inflate(&strm, Z_NO_FLUSH);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
-    assert(ret == Z_MEM_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_MEM_ERROR);
    ret = inflate(&strm, Z_NO_FLUSH);
    assert(ret == Z_MEM_ERROR);
    mem_limit(&strm, 0);
    memset(dict, 0, 257);
    ret = inflateSetDictionary(&strm, dict, 257);
                                                assert(ret == Z_OK);
    mem_limit(&strm, (sizeof(struct inflate_state) << 1) + 256);
-    ret = inflatePrime(&strm, 16, 0);
+    ret = inflatePrime(&strm, 16, 0);           assert(ret == Z_OK);
    assert(ret == Z_OK);
    strm.avail_in = 2;
    strm.next_in = (void *)"\x80";
-    ret = inflateSync(&strm);
+    ret = inflateSync(&strm);                   assert(ret == Z_DATA_ERROR);
-    assert(ret == Z_DATA_ERROR);
+    ret = inflate(&strm, Z_NO_FLUSH);           assert(ret == Z_STREAM_ERROR);
    ret = inflate(&strm, Z_NO_FLUSH);
    assert(ret == Z_STREAM_ERROR);
    strm.avail_in = 4;
    strm.next_in = (void *)"\0\0\xff\xff";
-    ret = inflateSync(&strm);
+    ret = inflateSync(&strm);                   assert(ret == Z_OK);
    assert(ret == Z_OK);
    (void)inflateSyncPoint(&strm);
-    ret = inflateCopy(&copy, &strm);
+    ret = inflateCopy(&copy, &strm);            assert(ret == Z_MEM_ERROR);
    assert(ret == Z_MEM_ERROR);
    mem_limit(&strm, 0);
-    ret = inflateUndermine(&strm, 1);
+    ret = inflateUndermine(&strm, 1);           assert(ret == Z_DATA_ERROR);
    assert(ret == Z_DATA_ERROR);
    (void)inflateMark(&strm);
-    ret = inflateEnd(&strm);
+    ret = inflateEnd(&strm);                    assert(ret == Z_OK);
    assert(ret == Z_OK);
    mem_done(&strm, "miscellaneous, force memory errors");
 }
@ -523,17 +450,13 @@ local unsigned pull(void* desc, unsigned char** buf)
    static unsigned char dat[] = {0x63, 0, 2, 0};
    struct inflate_state *state;
-    if (desc == Z_NULL)
+    if (desc == Z_NULL) {
    {
        next = 0;
        return 0;   /* no input (already provided at next_in) */
    }
    state = (void *)((z_stream *)desc)->state;
    if (state != Z_NULL)
        state->mode = SYNC;     /* force an otherwise impossible situation */
    return next < sizeof(dat) ? (*buf = dat + next++, 1) : 0;
 }
@ -552,17 +475,14 @@ local void cover_back(void)
    ret = inflateBackInit_(Z_NULL, 0, win, 0, 0);
                                                assert(ret == Z_VERSION_ERROR);
-    ret = inflateBackInit(Z_NULL, 0, win);
+    ret = inflateBackInit(Z_NULL, 0, win);      assert(ret == Z_STREAM_ERROR);
    assert(ret == Z_STREAM_ERROR);
    ret = inflateBack(Z_NULL, Z_NULL, Z_NULL, Z_NULL, Z_NULL);
                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateBackEnd(Z_NULL);
+    ret = inflateBackEnd(Z_NULL);               assert(ret == Z_STREAM_ERROR);
    assert(ret == Z_STREAM_ERROR);
    fputs("inflateBack bad parameters\n", stderr);
    mem_setup(&strm);
-    ret = inflateBackInit(&strm, 15, win);
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
    assert(ret == Z_OK);
    strm.avail_in = 2;
    strm.next_in = (void *)"\x03";
    ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
@ -575,19 +495,15 @@ local void cover_back(void)
        /* force mode error by mucking with state */
    ret = inflateBack(&strm, pull, &strm, push, Z_NULL);
                                                assert(ret == Z_STREAM_ERROR);
-    ret = inflateBackEnd(&strm);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
    assert(ret == Z_OK);
    mem_done(&strm, "inflateBack bad state");
-    ret = inflateBackInit(&strm, 15, win);
+    ret = inflateBackInit(&strm, 15, win);      assert(ret == Z_OK);
-    assert(ret == Z_OK);
+    ret = inflateBackEnd(&strm);                assert(ret == Z_OK);
    ret = inflateBackEnd(&strm);
    assert(ret == Z_OK);
    fputs("inflateBack built-in memory routines\n", stderr);
 }
 /* do a raw inflate of data in hexadecimal with both inflate and inflateBack */
 local int try(char *hex, char *id, int err)
 {
    int ret;
@ -619,31 +535,23 @@ local int try(char* hex, char* id, int err)
    assert(ret == Z_OK);
    strm.avail_in = len;
    strm.next_in = in;
-
+    do {
    do
    {
        strm.avail_out = size;
        strm.next_out = out;
        ret = inflate(&strm, Z_TREES);
        assert(ret != Z_STREAM_ERROR && ret != Z_MEM_ERROR);
        if (ret == Z_DATA_ERROR || ret == Z_NEED_DICT)
            break;
-    }
+    } while (strm.avail_in || strm.avail_out == 0);
-    while (strm.avail_in || strm.avail_out == 0);
+    if (err) {
    if (err)
    {
        assert(ret == Z_DATA_ERROR);
        assert(strcmp(id, strm.msg) == 0);
    }
    inflateEnd(&strm);
    mem_done(&strm, prefix);
    /* then with inflateBack */
-    if (err >= 0)
+    if (err >= 0) {
    {
        strcpy(prefix, id);
        strcat(prefix, "-back");
        mem_setup(&strm);
@ -653,13 +561,10 @@ local int try(char* hex, char* id, int err)
        strm.next_in = in;
        ret = inflateBack(&strm, pull, Z_NULL, push, Z_NULL);
        assert(ret != Z_STREAM_ERROR);
-
+        if (err) {
        if (err)
        {
            assert(ret == Z_DATA_ERROR);
            assert(strcmp(id, strm.msg) == 0);
        }
        inflateBackEnd(&strm);
        mem_done(&strm, prefix);
    }
@ -676,53 +581,33 @@ local int try(char* hex, char* id, int err)
 local void cover_inflate(void)
 {
    try("0 0 0 0 0", "invalid stored block lengths", 1);
    try("3 0", "fixed", 0);
    try("6", "invalid block type", 1);
    try("1 1 0 fe ff 0", "stored", 0);
    try("fc 0 0", "too many length or distance symbols", 1);
    try("4 0 fe ff", "invalid code lengths set", 1);
    try("4 0 24 49 0", "invalid bit length repeat", 1);
    try("4 0 24 e9 ff ff", "invalid bit length repeat", 1);
    try("4 0 24 e9 ff 6d", "invalid code -- missing end-of-block", 1);
    try("4 80 49 92 24 49 92 24 71 ff ff 93 11 0",
        "invalid literal/lengths set", 1);
    try("4 80 49 92 24 49 92 24 f b4 ff ff c3 84", "invalid distances set", 1);
    try("4 c0 81 8 0 0 0 0 20 7f eb b 0 0", "invalid literal/length code", 1);
    try("2 7e ff ff", "invalid distance code", 1);
    try("c c0 81 0 0 0 0 0 90 ff 6b 4 0", "invalid distance too far back", 1);
    /* also trailer mismatch just in inflate() */
    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 1", "incorrect data check", -1);
    try("1f 8b 8 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 1",
        "incorrect length check", -1);
    try("5 c0 21 d 0 0 0 80 b0 fe 6d 2f 91 6c", "pull 17", 0);
    try("5 e0 81 91 24 cb b2 2c 49 e2 f 2e 8b 9a 47 56 9f fb fe ec d2 ff 1f",
        "long code", 0);
    try("ed c0 1 1 0 0 0 40 20 ff 57 1b 42 2c 4f", "length extra", 0);
    try("ed cf c1 b1 2c 47 10 c4 30 fa 6f 35 1d 1 82 59 3d fb be 2e 2a fc f c",
        "long distance and extra", 0);
    try("ed c0 81 0 0 0 0 80 a0 fd a9 17 a9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "
        "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6", "window end", 0);
    inf("2 8 20 80 0 3 0", "inflate_fast TYPE return", 0, -15, 258,
        Z_STREAM_END);
    inf("63 18 5 40 c 0", "window wrap", 3, -8, 300, Z_OK);
@ -740,7 +625,6 @@ local void cover_trees(void)
       enough errors, since zlib insures that enough is always enough */
    for (bits = 0; bits < 15; bits++)
        lens[bits] = (unsigned short)(bits + 1);
    lens[15] = 15;
    next = table;
    bits = 15;
--- a/extern/zlib/test/minigzip.c
+++ b/extern/zlib/test/minigzip.c
@ -1,5 +1,5 @@
 /* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
+ * Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -40,6 +40,10 @@
 #  define SET_BINARY_MODE(file)
 #endif
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #  define snprintf _snprintf
 #endif
 #ifdef VMS
 #  define unlink delete
 #  define GZ_SUFFIX "-gz"
@ -88,19 +92,15 @@ DWORD error;
        (LPVOID)&msgbuf,
        0,
        NULL);
-
+    if (chars != 0) {
    if (chars != 0)
    {
        /* If there is an \r\n appended, zap it.  */
        if (chars >= 2
-                && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n')
+            && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') {
        {
            chars -= 2;
            msgbuf[chars] = 0;
        }
-        if (chars > sizeof(buf) - 1)
+        if (chars > sizeof (buf) - 1) {
        {
            chars = sizeof (buf) - 1;
            msgbuf[chars] = 0;
        }
@ -108,8 +108,7 @@ DWORD error;
        wcstombs(buf, msgbuf, chars + 1);
        LocalFree(msgbuf);
    }
-    else
+    else {
    {
        sprintf(buf, "unknown win32 error (%ld)", error);
    }
@ -157,19 +156,18 @@ void* myalloc(q, n, m)
    void *q;
    unsigned n, m;
 {
-    q = Z_NULL;
+    (void)q;
    return calloc(n, m);
 }
 void myfree(q, p)
    void *q, *p;
 {
-    q = Z_NULL;
+    (void)q;
    free(p);
 }
-typedef struct gzFile_s
+typedef struct gzFile_s {
 {
    FILE *file;
    int write;
    int err;
@ -204,40 +202,30 @@ const char* mode;
    int ret;
    gz = malloc(sizeof(struct gzFile_s));
    if (gz == NULL)
        return NULL;
    gz->write = strchr(mode, 'w') != NULL;
    gz->strm.zalloc = myalloc;
    gz->strm.zfree = myfree;
    gz->strm.opaque = Z_NULL;
    if (gz->write)
        ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
-    else
+    else {
    {
        gz->strm.next_in = 0;
        gz->strm.avail_in = Z_NULL;
        ret = inflateInit2(&(gz->strm), 15 + 16);
    }
-
+    if (ret != Z_OK) {
    if (ret != Z_OK)
    {
        free(gz);
        return NULL;
    }
    gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
                              fopen(path, gz->write ? "wb" : "rb");
-
+    if (gz->file == NULL) {
    if (gz->file == NULL)
    {
        gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
        free(gz);
        return NULL;
    }
    gz->err = 0;
    gz->msg = "";
    return gz;
@ -255,20 +243,15 @@ unsigned len;
    if (gz == NULL || !gz->write)
        return 0;
    strm = &(gz->strm);
    strm->next_in = (void *)buf;
    strm->avail_in = len;
-
+    do {
    do
    {
        strm->next_out = out;
        strm->avail_out = BUFLEN;
        (void)deflate(strm, Z_NO_FLUSH);
        fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
-    }
+    } while (strm->avail_out == 0);
    while (strm->avail_out == 0);
    return len;
 }
@ -286,37 +269,26 @@ unsigned len;
    if (gz == NULL || gz->write)
        return 0;
    if (gz->err)
        return 0;
    strm = &(gz->strm);
    strm->next_out = (void *)buf;
    strm->avail_out = len;
-
+    do {
    do
    {
        got = fread(in, 1, 1, gz->file);
        if (got == 0)
            break;
        strm->next_in = in;
        strm->avail_in = 1;
        ret = inflate(strm, Z_NO_FLUSH);
-
+        if (ret == Z_DATA_ERROR) {
        if (ret == Z_DATA_ERROR)
        {
            gz->err = Z_DATA_ERROR;
            gz->msg = strm->msg;
            return 0;
        }
        if (ret == Z_STREAM_END)
            inflateReset(strm);
-    }
+    } while (strm->avail_out);
    while (strm->avail_out);
    return len - strm->avail_out;
 }
@ -330,28 +302,20 @@ gzFile gz;
    if (gz == NULL)
        return Z_STREAM_ERROR;
    strm = &(gz->strm);
-
+    if (gz->write) {
    if (gz->write)
    {
        strm->next_in = Z_NULL;
        strm->avail_in = 0;
-
+        do {
        do
        {
            strm->next_out = out;
            strm->avail_out = BUFLEN;
            (void)deflate(strm, Z_FINISH);
            fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
-        }
+        } while (strm->avail_out == 0);
        while (strm->avail_out == 0);
        deflateEnd(strm);
    }
    else
        inflateEnd(strm);
    fclose(gz->file);
    free(gz);
    return Z_OK;
@ -369,7 +333,7 @@ int* err;
 #endif
-char* prog;
+static char *prog;
 void error            OF((const char *msg));
 void gz_compress      OF((FILE   *in, gzFile out));
@ -404,31 +368,22 @@ gzFile out;
    int err;
 #ifdef USE_MMAP
    /* Try first compressing with mmap. If mmap fails (minigzip used in a
     * pipe), use the normal fread loop.
     */
    if (gz_compress_mmap(in, out) == Z_OK) return;
 #endif
-
+    for (;;) {
    for (;;)
    {
        len = (int)fread(buf, 1, sizeof(buf), in);
-
+        if (ferror(in)) {
        if (ferror(in))
        {
            perror("fread");
            exit(1);
        }
        if (len == 0) break;
        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
    }
    fclose(in);
    if (gzclose(out) != Z_OK) error("failed gzclose");
 }
@ -450,14 +405,11 @@ gzFile out;
    /* Determine the size of the file, needed for mmap: */
    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
    buf_len = sb.st_size;
    if (buf_len <= 0) return Z_ERRNO;
    /* Now do the actual mmap: */
    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
    if (buf == (caddr_t)(-1)) return Z_ERRNO;
    /* Compress the whole file at once: */
@ -467,9 +419,7 @@ gzFile out;
    munmap(buf, buf_len);
    fclose(in);
    if (gzclose(out) != Z_OK) error("failed gzclose");
    return Z_OK;
 }
 #endif /* USE_MMAP */
@ -485,20 +435,15 @@ FILE*   out;
    int len;
    int err;
-    for (;;)
+    for (;;) {
    {
        len = gzread(in, buf, sizeof(buf));
        if (len < 0) error (gzerror(in, &err));
        if (len == 0) break;
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len)
+        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
        {
            error("failed fwrite");
        }
    }
    if (fclose(out)) error("failed fclose");
    if (gzclose(in) != Z_OK) error("failed gzclose");
@ -517,31 +462,28 @@ char*  mode;
    FILE  *in;
    gzFile out;
-    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile))
+    if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
    {
        fprintf(stderr, "%s: filename too long\n", prog);
        exit(1);
    }
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
    snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX);
 #else
    strcpy(outfile, file);
    strcat(outfile, GZ_SUFFIX);
 #endif
    in = fopen(file, "rb");
-
+    if (in == NULL) {
    if (in == NULL)
    {
        perror(file);
        exit(1);
    }
    out = gzopen(outfile, mode);
-
+    if (out == NULL) {
    if (out == NULL)
    {
        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
        exit(1);
    }
    gz_compress(in, out);
    unlink(file);
@ -558,41 +500,39 @@ char*  file;
    char *infile, *outfile;
    FILE  *out;
    gzFile in;
-    size_t len = strlen(file);
+    unsigned len = strlen(file);
-    if (len + strlen(GZ_SUFFIX) >= sizeof(buf))
+    if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
    {
        fprintf(stderr, "%s: filename too long\n", prog);
        exit(1);
    }
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
    snprintf(buf, sizeof(buf), "%s", file);
 #else
    strcpy(buf, file);
 #endif
-    if (len > SUFFIX_LEN && strcmp(file + len - SUFFIX_LEN, GZ_SUFFIX) == 0)
+    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
    {
        infile = file;
        outfile = buf;
        outfile[len-3] = '\0';
-    }
+    } else {
    else
    {
        outfile = file;
        infile = buf;
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
        snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX);
 #else
        strcat(infile, GZ_SUFFIX);
 #endif
    }
    in = gzopen(infile, "rb");
-
+    if (in == NULL) {
    if (in == NULL)
    {
        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
        exit(1);
    }
    out = fopen(outfile, "wb");
-
+    if (out == NULL) {
    if (out == NULL)
    {
        perror(file);
        exit(1);
    }
@ -622,16 +562,18 @@ char* argv[];
    gzFile file;
    char *bname, outmode[20];
 #if !defined(NO_snprintf) && !defined(NO_vsnprintf)
    snprintf(outmode, sizeof(outmode), "%s", "wb6 ");
 #else
    strcpy(outmode, "wb6 ");
 #endif
    prog = argv[0];
    bname = strrchr(argv[0], '/');
    if (bname)
      bname++;
    else
      bname = argv[0];
    argc--, argv++;
    if (!strcmp(bname, "gunzip"))
@ -639,8 +581,7 @@ char* argv[];
    else if (!strcmp(bname, "zcat"))
      copyout = uncompr = 1;
-    while (argc > 0)
+    while (argc > 0) {
    {
      if (strcmp(*argv, "-c") == 0)
        copyout = 1;
      else if (strcmp(*argv, "-d") == 0)
@ -656,88 +597,55 @@ char* argv[];
        outmode[2] = (*argv)[1];
      else
        break;
      argc--, argv++;
    }
    if (outmode[3] == ' ')
        outmode[3] = 0;
-
+    if (argc == 0) {
    if (argc == 0)
    {
        SET_BINARY_MODE(stdin);
        SET_BINARY_MODE(stdout);
-
+        if (uncompr) {
        if (uncompr)
        {
            file = gzdopen(fileno(stdin), "rb");
            if (file == NULL) error("can't gzdopen stdin");
            gz_uncompress(file, stdout);
-        }
+        } else {
        else
        {
            file = gzdopen(fileno(stdout), outmode);
            if (file == NULL) error("can't gzdopen stdout");
            gz_compress(stdin, file);
        }
-    }
+    } else {
-    else
+        if (copyout) {
    {
        if (copyout)
        {
            SET_BINARY_MODE(stdout);
        }
-
+        do {
-        do
+            if (uncompr) {
-        {
+                if (copyout) {
            if (uncompr)
            {
                if (copyout)
                {
                    file = gzopen(*argv, "rb");
                    if (file == NULL)
                        fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
                    else
                        gz_uncompress(file, stdout);
-                }
+                } else {
                else
                {
                    file_uncompress(*argv);
                }
-            }
+            } else {
-            else
+                if (copyout) {
            {
                if (copyout)
                {
                    FILE * in = fopen(*argv, "rb");
-                    if (in == NULL)
+                    if (in == NULL) {
                    {
                        perror(*argv);
-                    }
+                    } else {
                    else
                    {
                        file = gzdopen(fileno(stdout), outmode);
                        if (file == NULL) error("can't gzdopen stdout");
                        gz_compress(in, file);
                    }
-                }
+                } else {
                else
                {
                    file_compress(*argv, outmode);
                }
            }
        } while (argv++, --argc);
    }
        while (argv++, --argc);
    }
    return 0;
 }
--- a/extern/zlib/trees.c
+++ b/extern/zlib/trees.c
--- a/extern/zlib/trees.h
+++ b/extern/zlib/trees.h
@ -1,7 +1,6 @@
 /* header created automatically with -DGEN_TREES_H */
-local const ct_data static_ltree[L_CODES + 2] =
+local const ct_data static_ltree[L_CODES+2] = {
 {
 {{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
 {{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
 {{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
@ -62,8 +61,7 @@ local const ct_data static_ltree[L_CODES + 2] =
 {{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
 };
-local const ct_data static_dtree[D_CODES] =
+local const ct_data static_dtree[D_CODES] = {
 {
 {{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
 {{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
 {{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
@ -72,8 +70,7 @@ local const ct_data static_dtree[D_CODES] =
 {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
 };
-const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] =
+const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {
 {
 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
@ -102,8 +99,7 @@ const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] =
 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
 };
-const uch ZLIB_INTERNAL _length_code[MAX_MATCH - MIN_MATCH + 1] =
+const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {
 {
 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
@ -119,14 +115,12 @@ const uch ZLIB_INTERNAL _length_code[MAX_MATCH - MIN_MATCH + 1] =
 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
 };
-local const int base_length[LENGTH_CODES] =
+local const int base_length[LENGTH_CODES] = {
 {
 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
 64, 80, 96, 112, 128, 160, 192, 224, 0
 };
-local const int base_dist[D_CODES] =
+local const int base_dist[D_CODES] = {
 {
    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
--- a/extern/zlib/uncompr.c
+++ b/extern/zlib/uncompr.c
@ -1,5 +1,5 @@
 /* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2003, 2010 Jean-loup Gailly.
+ * Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -9,63 +9,85 @@
 #include "zlib.h"
 /* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
+     Decompresses the source buffer into the destination buffer.  *sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
+   the byte length of the source buffer. Upon entry, *destLen is the total size
-   size of the destination buffer, which must be large enough to hold the
+   of the destination buffer, which must be large enough to hold the entire
-   entire uncompressed data. (The size of the uncompressed data must have
+   uncompressed data. (The size of the uncompressed data must have been saved
-   been saved previously by the compressor and transmitted to the decompressor
+   previously by the compressor and transmitted to the decompressor by some
-   by some mechanism outside the scope of this compression library.)
+   mechanism outside the scope of this compression library.) Upon exit,
-   Upon exit, destLen is the actual size of the compressed buffer.
+   *destLen is the size of the decompressed data and *sourceLen is the number
   of source bytes consumed. Upon return, source + *sourceLen points to the
   first unused input byte.
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer, or
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
+   Z_DATA_ERROR if the input data was corrupted, including if the input data is
   an incomplete zlib stream.
 */
-#ifdef WIN32
+int ZEXPORT uncompress2 (dest, destLen, source, sourceLen)
-int ZEXPORT uncompress(Bytef* dest, uLongf* destLen, const Bytef* source, uLong sourceLen)
+    Bytef *dest;
-#else
+    uLongf *destLen;
    const Bytef *source;
    uLong *sourceLen;
 {
    z_stream stream;
    int err;
    const uInt max = (uInt)-1;
    uLong len, left;
    Byte buf[1];    /* for detection of incomplete stream when *destLen == 0 */
    len = *sourceLen;
    if (*destLen) {
        left = *destLen;
        *destLen = 0;
    }
    else {
        left = 1;
        dest = buf;
    }
    stream.next_in = (z_const Bytef *)source;
    stream.avail_in = 0;
    stream.zalloc = (alloc_func)0;
    stream.zfree = (free_func)0;
    stream.opaque = (voidpf)0;
    err = inflateInit(&stream);
    if (err != Z_OK) return err;
    stream.next_out = dest;
    stream.avail_out = 0;
    do {
        if (stream.avail_out == 0) {
            stream.avail_out = left > (uLong)max ? max : (uInt)left;
            left -= stream.avail_out;
        }
        if (stream.avail_in == 0) {
            stream.avail_in = len > (uLong)max ? max : (uInt)len;
            len -= stream.avail_in;
        }
        err = inflate(&stream, Z_NO_FLUSH);
    } while (err == Z_OK);
    *sourceLen -= len + stream.avail_in;
    if (dest != buf)
        *destLen = stream.total_out;
    else if (stream.total_out && err == Z_BUF_ERROR)
        left = 1;
    inflateEnd(&stream);
    return err == Z_STREAM_END ? Z_OK :
           err == Z_NEED_DICT ? Z_DATA_ERROR  :
           err == Z_BUF_ERROR && left + stream.avail_out ? Z_DATA_ERROR :
           err;
 }
 int ZEXPORT uncompress (dest, destLen, source, sourceLen)
    Bytef *dest;
    uLongf *destLen;
    const Bytef *source;
    uLong sourceLen;
 #endif
 {
-    z_stream stream;
+    return uncompress2(dest, destLen, source, &sourceLen);
    int err;
    stream.next_in = (Bytef*)source;
    stream.avail_in = (uInt)sourceLen;
    /* Check for source > 64K on 16-bit machine: */
    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
    stream.next_out = dest;
    stream.avail_out = (uInt) * destLen;
    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
    stream.zalloc = (alloc_func)0;
    stream.zfree = (free_func)0;
    err = inflateInit(&stream);
    if (err != Z_OK) return err;
    err = inflate(&stream, Z_FINISH);
    if (err != Z_STREAM_END)
    {
        inflateEnd(&stream);
        if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0))
            return Z_DATA_ERROR;
        return err;
    }
    *destLen = stream.total_out;
    err = inflateEnd(&stream);
    return err;
 }
--- a/extern/zlib/zconf.h
+++ b/extern/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-2016 Jean-loup Gailly, Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -17,10 +17,11 @@
 #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
 #  define Z_PREFIX_SET
-/* all linked symbols */
+/* all linked symbols and init macros */
 #  define _dist_code            z__dist_code
 #  define _length_code          z__length_code
 #  define _tr_align             z__tr_align
 #  define _tr_flush_bits        z__tr_flush_bits
 #  define _tr_flush_block       z__tr_flush_block
 #  define _tr_init              z__tr_init
 #  define _tr_stored_block      z__tr_stored_block
@ -28,6 +29,7 @@
 #  define adler32               z_adler32
 #  define adler32_combine       z_adler32_combine
 #  define adler32_combine64     z_adler32_combine64
 #  define adler32_z             z_adler32_z
 #  ifndef Z_SOLO
 #    define compress              z_compress
 #    define compress2             z_compress2
@ -36,10 +38,14 @@
 #  define crc32                 z_crc32
 #  define crc32_combine         z_crc32_combine
 #  define crc32_combine64       z_crc32_combine64
 #  define crc32_z               z_crc32_z
 #  define deflate               z_deflate
 #  define deflateBound          z_deflateBound
 #  define deflateCopy           z_deflateCopy
 #  define deflateEnd            z_deflateEnd
 #  define deflateGetDictionary  z_deflateGetDictionary
 #  define deflateInit           z_deflateInit
 #  define deflateInit2          z_deflateInit2
 #  define deflateInit2_         z_deflateInit2_
 #  define deflateInit_          z_deflateInit_
 #  define deflateParams         z_deflateParams
@ -66,6 +72,8 @@
 #    define gzeof                 z_gzeof
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
 #    define gzfread               z_gzfread
 #    define gzfwrite              z_gzfwrite
 #    define gzgetc                z_gzgetc
 #    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
@ -87,31 +95,39 @@
 #    define gztell                z_gztell
 #    define gztell64              z_gztell64
 #    define gzungetc              z_gzungetc
 #    define gzvprintf             z_gzvprintf
 #    define gzwrite               z_gzwrite
 #  endif
 #  define inflate               z_inflate
 #  define inflateBack           z_inflateBack
 #  define inflateBackEnd        z_inflateBackEnd
 #  define inflateBackInit       z_inflateBackInit
 #  define inflateBackInit_      z_inflateBackInit_
 #  define inflateCodesUsed      z_inflateCodesUsed
 #  define inflateCopy           z_inflateCopy
 #  define inflateEnd            z_inflateEnd
 #  define inflateGetDictionary  z_inflateGetDictionary
 #  define inflateGetHeader      z_inflateGetHeader
 #  define inflateInit           z_inflateInit
 #  define inflateInit2          z_inflateInit2
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateInit_          z_inflateInit_
 #  define inflateMark           z_inflateMark
 #  define inflatePrime          z_inflatePrime
 #  define inflateReset          z_inflateReset
 #  define inflateReset2         z_inflateReset2
 #  define inflateResetKeep      z_inflateResetKeep
 #  define inflateSetDictionary  z_inflateSetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
+#  define inflateValidate       z_inflateValidate
 #  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
 #    define uncompress2           z_uncompress2
 #  endif
 #  define zError                z_zError
 #  ifndef Z_SOLO
@ -221,9 +237,19 @@
 #  define z_const
 #endif
-/* Some Mac compilers merge all .h files incorrectly: */
+#ifdef Z_SOLO
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+   typedef unsigned long z_size_t;
-#  define NO_DUMMY_DECL
+#else
 #  define z_longlong long long
 #  if defined(NO_SIZE_T)
     typedef unsigned NO_SIZE_T z_size_t;
 #  elif defined(STDC)
 #    include <stddef.h>
     typedef size_t z_size_t;
 #  else
     typedef unsigned long z_size_t;
 #  endif
 #  undef z_longlong
 #endif
 /* Maximum value for memLevel in deflateInit2 */
@ -253,7 +279,7 @@
 Of course this will generally degrade compression (there's no free lunch).
   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ that is, 32K for windowBits=15 (default value) plus about 7 kilobytes
 for small objects.
 */
@ -388,22 +414,16 @@ typedef Byte FAR*   voidpf;
   typedef Byte       *voidp;
 #endif
 /* ./configure may #define Z_U4 here */
 #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
 #  include <limits.h>
 #  if (UINT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned
-#  else
+#  elif (ULONG_MAX == 0xffffffffUL)
 #    if (ULONG_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned long
-#    else
+#  elif (USHRT_MAX == 0xffffffffUL)
 #      if (USHRT_MAX == 0xffffffffUL)
 #    define Z_U4 unsigned short
 #  endif
 #endif
 #  endif
 #endif
 #ifdef Z_U4
   typedef Z_U4 z_crc_t;
@ -425,9 +445,17 @@ typedef unsigned long z_crc_t;
 #  endif
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
 #    include <stdarg.h>         /* for va_list */
 #  endif
 #endif
 #ifdef _WIN32
 #  ifndef Z_SOLO
 #    include <stddef.h>         /* for wchar_t */
 #  endif
 #endif
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
 * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
@ -435,7 +463,7 @@ typedef unsigned long z_crc_t;
 * 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 defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
 #  undef _LARGEFILE64_SOURCE
 #endif
@ -443,7 +471,7 @@ typedef unsigned long z_crc_t;
 #  define Z_HAVE_UNISTD_H
 #endif
 #ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
+#  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 */
--- a/extern/zlib/zlib.h
+++ b/extern/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.11, January 15th, 2017
-  Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 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
@ -28,31 +28,6 @@
  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
 */
 /*
  version 1.2.7.f-hanba-win64-v3, May 31, 2014
  Copyright (C) 2012-2014 Jonathan Hanba (hanbaj@gmail.com)
  Date     Who  Comment
  -------  ---  ------------------------------------------------------------
  23May12  jh   Adjusted version strings to adobt the original creators'
                mandated x.x.x.f version format that is cited in the FAQ
                located at http://www.zlib.net/zlib_faq.html#faq24.
  24May12  jh   Updated older-style function declarators.
                Modified constant conditional expressions to be non-constant.
                Changed deprecated functions to their ANSI equivalents.
                Carefully adjusted data types to reduce risk of data loss.
  17Nov13  jh   Added older-style function declarations back in the source.
                Added a WIN32 preprocessor check to the function declarations.
                Changed version to 1.2.7.f-hanba-win64-v2.
  31May14  jh   Corrected infinite loop errors created by modifying while(0)
                statements for Windows in source files inflate.c and infback.c.
                Changed version to 1.2.7.f-hanba-win64-v3.
 */
 #ifndef ZLIB_H
 #define ZLIB_H
@ -62,12 +37,12 @@
 extern "C" {
 #endif
-#define ZLIB_VERSION "1.2.7.f-hanba-win64-v3"
+#define ZLIB_VERSION "1.2.11"
-#define ZLIB_VERNUM 0x127f
+#define ZLIB_VERNUM 0x12b0
 #define ZLIB_VER_MAJOR 1
 #define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 7
+#define ZLIB_VER_REVISION 11
-#define ZLIB_VER_SUBREVISION 0xf
+#define ZLIB_VER_SUBREVISION 0
 /*
    The 'zlib' compression library provides in-memory compression and
@ -90,7 +65,8 @@ extern "C" {
  with "gz".  The gzip format is different from the zlib format.  gzip is a
  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-    This library can optionally read and write gzip streams in memory as well.
+    This library can optionally read and write gzip and raw deflate streams in
  memory as well.
    The zlib format was designed to be compact and fast for use in memory
  and on communications channels.  The gzip format was designed for single-
@ -99,7 +75,7 @@ extern "C" {
    The library does not install any signal handler.  The decoder checks
  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
+  even in the case of corrupted input.
 */
 typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
@ -107,13 +83,12 @@ typedef void (*free_func)  OF((voidpf opaque, voidpf address));
 struct internal_state;
-typedef struct z_stream_s
+typedef struct z_stream_s {
 {
    z_const 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 */
-    Bytef*    next_out; /* next output byte should be put there */
+    Bytef    *next_out; /* next output byte will go here */
    uInt     avail_out; /* remaining free space at next_out */
    uLong    total_out; /* total number of bytes output so far */
@ -124,8 +99,9 @@ typedef struct z_stream_s
    free_func  zfree;   /* used to free the internal state */
    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-    int     data_type;  /* best guess about the data type: binary or text */
+    int     data_type;  /* best guess about the data type: binary or text
-    uLong   adler;      /* adler32 value of the uncompressed data */
+                           for deflate, or the decoding state for inflate */
    uLong   adler;      /* Adler-32 or CRC-32 value of the uncompressed data */
    uLong   reserved;   /* reserved for future use */
 } z_stream;
@ -135,8 +111,7 @@ typedef z_stream FAR* z_streamp;
     gzip header information passed to and from zlib routines.  See RFC 1952
  for more details on the meanings of these fields.
 */
-typedef struct gz_header_s
+typedef struct gz_header_s {
 {
    int     text;       /* true if compressed data believed to be text */
    uLong   time;       /* modification time */
    int     xflags;     /* extra flags (not used when writing a gzip file) */
@ -169,7 +144,9 @@ typedef gz_header FAR* gz_headerp;
     zalloc must return Z_NULL if there is not enough memory for the object.
   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
+   thread safe.  In that case, zlib is thread-safe.  When zalloc and zfree are
   Z_NULL on entry to the initialization function, they are set to internal
   routines that use the standard library functions malloc() and free().
     On 16-bit systems, the functions zalloc and zfree must be able to allocate
   exactly 65536 bytes, but will not be required to allocate more than this if
@ -182,7 +159,7 @@ typedef gz_header FAR* gz_headerp;
     The fields total_in and total_out can be used for statistics or progress
   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
+   uncompressed data and may be saved for use by the decompressor (particularly
   if the decompressor wants to decompress everything in a single step).
 */
@ -227,7 +204,7 @@ typedef gz_header FAR* gz_headerp;
 #define Z_TEXT     1
 #define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
+/* Possible values of the data_type field for deflate() */
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
@ -285,11 +262,11 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
    enough room in the output buffer), next_in and avail_in are updated and
    processing will resume at this point for the next call of deflate().
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
    accordingly.  This action is forced if the parameter flush is non zero.
    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
+    should be set only when necessary.  Some output may be provided even if
-    output may be provided even if flush is not set.
+    flush is zero.
    Before the call of deflate(), the application should ensure that at least
  one of the actions is possible, by providing more input and/or consuming more
@ -298,7 +275,9 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
  output when it wants, for example when the output buffer is full (avail_out
  == 0), or after each call of deflate().  If deflate returns Z_OK and with
  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
+  buffer because there might be more output pending. See deflatePending(),
  which can be used if desired to determine whether or not there is more ouput
  in that case.
    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
  decide how much data to accumulate before producing output, in order to
@ -319,8 +298,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
  This completes the current deflate block and follows it with an empty fixed
  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
+  in order for the decompressor to finish the block before the empty fixed
-  block.
+  codes block.
    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
@ -346,34 +325,38 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
    If the parameter flush is set to Z_FINISH, pending input is processed,
  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
+  enough output space.  If deflate returns with Z_OK or Z_BUF_ERROR, this
-  called again with Z_FINISH and more output space (updated avail_out) but no
+  function must be called again with Z_FINISH and more output space (updated
-  more input data, until it returns with Z_STREAM_END or an error.  After
+  avail_out) but no more input data, until it returns with Z_STREAM_END or an
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
+  error.  After deflate has returned Z_STREAM_END, the only possible operations
-  are deflateReset or deflateEnd.
+  on the stream are deflateReset or deflateEnd.
-    Z_FINISH can be used immediately after deflateInit if all the compression
+    Z_FINISH can be used in the first deflate call after deflateInit if all the
-  is to be done in a single step.  In this case, avail_out must be at least the
+  compression is to be done in a single step.  In order to complete in one
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
+  call, avail_out must be at least the value returned by deflateBound (see
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
+  below).  Then deflate is guaranteed to return Z_STREAM_END.  If not enough
-  not return Z_STREAM_END, and it must be called again as described above.
+  output space is provided, deflate will 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
+    deflate() sets strm->adler to the Adler-32 checksum of all input read
-  so far (that is, total_in bytes).
+  so far (that is, total_in bytes).  If a gzip stream is being generated, then
  strm->adler will be the CRC-32 checksum of the input read so far.  (See
  deflateInit2 below.)
    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
+  the input data type (Z_BINARY or Z_TEXT).  If in doubt, the data is
-  binary.  This field is only for information purposes and does not affect the
+  considered binary.  This field is only for information purposes and does not
-  compression algorithm in any manner.
+  affect the compression algorithm in any manner.
    deflate() returns Z_OK if some progress has been made (more input
  processed or more output produced), Z_STREAM_END if all input has been
  consumed and all output has been produced (only when flush is set to
  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+  if next_in or next_out was Z_NULL or the state was inadvertently written over
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
+  by the application), or Z_BUF_ERROR if no progress is possible (for example
-  fatal, and deflate() can be called again with more input and more output
+  avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not fatal, and
-  space to continue compressing.
+  deflate() can be called again with more input and more output space to
  continue compressing.
 */
@ -396,23 +379,21 @@ ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
     Initializes the internal stream state for decompression.  The fields
   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
+   the caller.  In the current version of inflate, the provided input is not
-   exact value depends on the compression method), inflateInit determines the
+   read or consumed.  The allocation of a sliding window will be deferred to
-   compression method from the zlib header and allocates all data structures
+   the first call of inflate (if the decompression does not complete on the
-   accordingly; otherwise the allocation will be deferred to the first call of
+   first call).  If zalloc and zfree are set to Z_NULL, inflateInit updates
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   them to use default allocation functions.
   use default allocation functions.
     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
+   there is no error message.  inflateInit does not perform any decompression.
-   apart from possibly reading the zlib header if present: actual decompression
+   Actual decompression will be done by inflate().  So next_in, and avail_in,
-   will be done by inflate().  (So next_in and avail_in may be modified, but
+   next_out, and avail_out are unused and unchanged.  The current
-   next_out and avail_out are unused and unchanged.) The current implementation
+   implementation of inflateInit() does not process any header information --
-   of inflateInit() does not process any header information -- that is deferred
+   that is deferred until inflate() is called.
   until inflate() is called.
 */
@ -428,17 +409,20 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
  - Decompress more input starting at next_in and update next_in and avail_in
    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
+    enough room in the output buffer), then next_in and avail_in are updated
-    resume at this point for the next call of inflate().
+    accordingly, and processing will resume at this point for the next call of
    inflate().
-  - Provide more output starting at next_out and update next_out and avail_out
+  - Generate more output starting at next_out and update next_out and avail_out
    accordingly.  inflate() provides as much output as possible, until there is
    no more input data or no more space in the output buffer (see below about
    the flush parameter).
    Before the call of inflate(), the application should ensure that at least
  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
+  output, and updating the next_* and avail_* values accordingly.  If the
  caller of inflate() does not provide both available input and available
  output space, it is possible that there will be no progress made.  The
  application can consume the uncompressed output when it wants, for example
  when the output buffer is full (avail_out == 0), or after each call of
  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
@ -455,7 +439,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
  gets to the end of that block, or when it runs out of data.
    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
+  To assist in this, on return inflate() always sets strm->data_type to the
  number of unused bits in the last byte taken from strm->next_in, plus 64 if
  inflate() is currently decoding the last block in the deflate stream, plus
  128 if inflate() returned immediately after decoding an end-of-block code or
@ -503,32 +487,33 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
  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,
  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
+  below.  At the end of the stream, inflate() checks that its computed Adler-32
  checksum is equal to that saved by the compressor and returns Z_STREAM_END
  only if the checksum is correct.
    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
  deflate data.  The header type is detected automatically, if requested when
  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
+  header is not retained unless inflateGetHeader() is used.  When processing
  instead use raw inflate, see inflateInit2() below, or inflateBack() and
  perform their own processing of the gzip header and trailer.  When processing
  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.
+  produced so far.  The CRC-32 is checked against the gzip trailer, as is the
  uncompressed length, modulo 2^32.
    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
  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  value, in which case strm->msg points to a string with a more specific
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+  error), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  next_in or next_out was Z_NULL, or the state was inadvertently written over
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
+  by the application), Z_MEM_ERROR if there was not enough memory, Z_BUF_ERROR
  if no progress was possible or if there was not enough room in the output
  buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
  inflate() can be called again with more input and more output space to
  continue decompressing.  If Z_DATA_ERROR is returned, the application may
  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
+  recovery of the data is to be attempted.
 */
@ -538,9 +523,8 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
   This function discards any unprocessed input and does not flush any pending
   output.
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+     inflateEnd returns Z_OK if success, or Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
+   was inconsistent.
   static string (which must not be deallocated).
 */
@ -571,16 +555,29 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
   compression at the expense of memory usage.  The default value is 15 if
   deflateInit is used instead.
     For the current implementation of deflate(), a windowBits value of 8 (a
   window size of 256 bytes) is not supported.  As a result, a request for 8
   will result in 9 (a 512-byte window).  In that case, providing 8 to
   inflateInit2() will result in an error when the zlib header with 9 is
   checked against the initialization of inflate().  The remedy is to not use 8
   with deflateInit2() with this initialization, or at least in that case use 9
   with inflateInit2().
     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
+   with no zlib header or trailer, and will not compute a check value.
     windowBits can also be greater than 15 for optional gzip encoding.  Add
   16 to windowBits to write a simple gzip header and trailer around the
   compressed data instead of a zlib wrapper.  The gzip header will have no
   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
+   header crc, and the operating system will be set to the appropriate value,
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+   if the operating system was determined at compile time.  If a gzip stream is
   being written, strm->adler is a CRC-32 instead of an Adler-32.
     For raw deflate or gzip encoding, a request for a 256-byte window is
   rejected as invalid, since only the zlib header provides a means of
   transmitting the window size to the decompressor.
     The memLevel parameter specifies how much memory should be allocated
   for the internal compression state.  memLevel=1 uses minimum memory but is
@ -641,12 +638,12 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
   addition, the current implementation of deflate will use at most the window
   size minus 262 bytes of the provided dictionary.
-     Upon return of this function, strm->adler is set to the adler32 value
+     Upon return of this function, strm->adler is set to the Adler-32 value
   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
+   which dictionary has been used by the compressor.  (The Adler-32 value
   applies to the whole dictionary even if only a subset of the dictionary is
   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
+   Adler-32 value is not computed and strm->adler is not set.
     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
@ -655,6 +652,28 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
   not perform any compression: this will be done by deflate().
 */
 ZEXTERN int ZEXPORT deflateGetDictionary OF((z_streamp strm,
                                             Bytef *dictionary,
                                             uInt  *dictLength));
 /*
     Returns the sliding dictionary being maintained by deflate.  dictLength is
   set to the number of bytes in the dictionary, and that many bytes are copied
   to dictionary.  dictionary must have enough space, where 32768 bytes is
   always enough.  If deflateGetDictionary() is called with dictionary equal to
   Z_NULL, then only the dictionary length is returned, and nothing is copied.
   Similary, if dictLength is Z_NULL, then it is not set.
     deflateGetDictionary() may return a length less than the window size, even
   when more than the window size in input has been provided. It may return up
   to 258 bytes less in that case, due to how zlib's implementation of deflate
   manages the sliding window and lookahead for matches, where matches can be
   up to 258 bytes long. If the application needs the last window-size bytes of
   input, then that would need to be saved by the application outside of zlib.
     deflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
   stream state is inconsistent.
 */
 ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
                                    z_streamp source));
 /*
@ -675,10 +694,10 @@ ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
 ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
 /*
-     This function is equivalent to deflateEnd followed by deflateInit,
+     This function is equivalent to deflateEnd followed by deflateInit, but
-   but does not free and reallocate all the internal compression state.  The
+   does not free and reallocate the internal compression state.  The stream
-   stream will keep the same compression level and any other attributes that
+   will leave the compression level and any other attributes that may have been
-   may have been set by deflateInit2.
+   set unchanged.
     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
   stream state was inconsistent (such as zalloc or state being Z_NULL).
@ -689,20 +708,36 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
                                      int strategy));
 /*
     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
+   interpretation of level and strategy is as in deflateInit2().  This can be
   used to switch between compression and straight copy of the input data, or
   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
+   If the compression approach (which is a function of the level) or the
-   compressed with the old level (and may be flushed); the new level will take
+   strategy is changed, and if any input has been consumed in a previous
-   effect only at the next call of deflate().
+   deflate() call, then the input available so far is compressed with the old
   level and strategy using deflate(strm, Z_BLOCK).  There are three approaches
   for the compression levels 0, 1..3, and 4..9 respectively.  The new level
   and strategy will take effect at the next call of deflate().
-     Before the call of deflateParams, the stream state must be set as for
+     If a deflate(strm, Z_BLOCK) is performed by deflateParams(), and it does
-   a call of deflate(), since the currently available input may have to be
+   not have enough output space to complete, then the parameter change will not
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
+   take effect.  In this case, deflateParams() can be called again with the
   same parameters and more output space to try again.
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+     In order to assure a change in the parameters on the first try, the
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+   deflate stream should be flushed using deflate() with Z_BLOCK or other flush
-   strm->avail_out was zero.
+   request until strm.avail_out is not zero, before calling deflateParams().
   Then no more input data should be provided before the deflateParams() call.
   If this is done, the old level and strategy will be applied to the data
   compressed before deflateParams(), and the new level and strategy will be
   applied to the the data compressed after deflateParams().
     deflateParams returns Z_OK on success, Z_STREAM_ERROR if the source stream
   state was inconsistent or if a parameter was invalid, or Z_BUF_ERROR if
   there was not enough output space to complete the compression of the
   available input data before a change in the strategy or approach.  Note that
   in the case of a Z_BUF_ERROR, the parameters are not changed.  A return
   value of Z_BUF_ERROR is not fatal, in which case deflateParams() can be
   retried with more output space.
 */
 ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
@ -820,7 +855,7 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
   is for use with other formats that use the deflate compressed data format
   such as zip.  Those formats provide their own check values.  If a custom
   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
+   recommended that a check value such as an Adler-32 or a CRC-32 be applied to
   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
   most applications, the zlib format should be used as is.  Note that comments
   above on the use in deflateInit2() applies to the magnitude of windowBits.
@ -829,7 +864,10 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
   32 to windowBits to enable zlib and gzip decoding with automatic header
   detection, or add 16 to decode only the gzip format (the zlib format will
   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
+   CRC-32 instead of an Adler-32.  Unlike the gunzip utility and gzread() (see
   below), inflate() will not automatically decode concatenated gzip streams.
   inflate() will return Z_STREAM_END at the end of the gzip stream.  The state
   would need to be reset to continue decoding a subsequent gzip stream.
     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
@ -850,7 +888,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
     Initializes the decompression dictionary from the given uncompressed byte
   sequence.  This function must be called immediately after a call of inflate,
   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.
+   can be determined from the Adler-32 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
   time to set the dictionary.  If the provided dictionary is smaller than the
@ -861,11 +899,26 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
     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
   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
+   expected one (incorrect Adler-32 value).  inflateSetDictionary does not
   perform any decompression: this will be done by subsequent calls of
   inflate().
 */
 ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
                                             Bytef *dictionary,
                                             uInt  *dictLength));
 /*
     Returns the sliding dictionary being maintained by inflate.  dictLength is
   set to the number of bytes in the dictionary, and that many bytes are copied
   to dictionary.  dictionary must have enough space, where 32768 bytes is
   always enough.  If inflateGetDictionary() is called with dictionary equal to
   Z_NULL, then only the dictionary length is returned, and nothing is copied.
   Similary, if dictLength is Z_NULL, then it is not set.
     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
   stream state is inconsistent.
 */
 ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
 /*
     Skips invalid compressed data until a possible full flush point (see above
@ -873,7 +926,7 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
   available input is skipped.  No output is provided.
     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurences of this
+   All full flush points have this pattern, but not all occurrences of this
   pattern are full flush points.
     inflateSync returns Z_OK if a possible full flush point has been found,
@ -904,7 +957,7 @@ ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 /*
     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
+   but does not free and reallocate the internal decompression state.  The
   stream will keep attributes that may have been set by inflateInit2.
     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
@ -916,7 +969,9 @@ ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
 /*
     This function is the same as inflateReset, but it also permits changing
   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
+   the same as it is for inflateInit2.  If the window size is changed, then the
   memory allocated for the window is freed, and the window will be reallocated
   by inflate() if needed.
     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
@ -968,7 +1023,7 @@ ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
   location in the input stream can be determined from avail_in and data_type
   as noted in the description for the Z_BLOCK flush parameter for inflate.
-     inflateMark returns the value noted above or -1 << 16 if the provided
+     inflateMark returns the value noted above, or -65536 if the provided
   source stream state was inconsistent.
 */
@ -1034,7 +1089,8 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
   the version of the header file.
 */
-typedef unsigned(*in_func) OF((void FAR*, unsigned char FAR* FAR*));
+typedef unsigned (*in_func) OF((void FAR *,
                                z_const unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
@ -1042,11 +1098,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                    out_func out, void FAR *out_desc));
 /*
     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is more efficient than inflate() for
+   interface for input and output.  This is potentially more efficient than
-   file i/o applications in that it avoids copying between the output and the
+   inflate() for file i/o applications, in that it avoids copying between the
-   sliding window by simply making the window itself the output buffer.  This
+   output and the sliding window by simply making the window itself the output
-   function trusts the application to not change the output buffer passed by
+   buffer.  inflate() can be faster on modern CPUs when used with large
-   the output function, at least until inflateBack() returns.
+   buffers.  inflateBack() trusts the application to not change the output
   buffer passed by the output function, at least until inflateBack() returns.
     inflateBackInit() must be called first to allocate the internal state
   and to initialize the state with the user-provided window buffer.
@ -1058,9 +1115,9 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
   This routine would normally be used in a utility that reads zip or gzip
   files and writes out uncompressed files.  The utility would decode the
   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
+   the raw deflate stream to decompress.  This is different from the default
-   behavior of inflate(), which expects either a zlib or gzip header and
+   behavior of inflate(), which expects a zlib header and trailer around the
-   trailer around the deflate stream.
+   deflate stream.
     inflateBack() uses two subroutines supplied by the caller that are then
   called by inflateBack() for input and output.  inflateBack() calls those
@ -1070,11 +1127,11 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
   number of bytes of provided input, and a pointer to that input in buf.  If
   there is no input available, in() must return zero -- buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   case -- and inflateBack() will return a buffer error.  inflateBack() will
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   call out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].
-   should return zero on success, or non-zero on failure.  If out() returns
+   out() should return zero on success, or non-zero on failure.  If out()
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   returns non-zero, inflateBack() will return with an error.  Neither in() nor
-   are permitted to change the contents of the window provided to
+   out() are permitted to change the contents of the window provided to
   inflateBackInit(), which is also the buffer that out() uses to write from.
   The length written by out() will be at most the window size.  Any non-zero
   amount of input may be provided by in().
@ -1124,7 +1181,7 @@ ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
     7.6: size of z_off_t
    Compiler, assembler, and debug options:
-     8: DEBUG
+     8: ZLIB_DEBUG
     9: ASMV or ASMINF -- use ASM code
     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
     11: 0 (reserved)
@ -1174,7 +1231,8 @@ ZEXTERN int ZEXPORT compress OF((Bytef* dest,   uLongf* destLen,
   the byte length of the source buffer.  Upon entry, destLen is the total size
   of the destination buffer, which must be at least the value returned by
   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.  compress() is equivalent to compress2() with a level
   parameter of Z_DEFAULT_COMPRESSION.
     compress 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
@ -1190,7 +1248,7 @@ ZEXTERN int ZEXPORT compress2 OF((Bytef* dest,   uLongf* destLen,
   length of the source buffer.  Upon entry, destLen is the total size of the
   destination buffer, which must be at least the value returned by
   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
+   compressed data.
     compress2 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,
@ -1213,7 +1271,7 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef* dest,   uLongf* destLen,
   uncompressed data.  (The size of the uncompressed data must have been saved
   previously by the compressor and transmitted to the decompressor by some
   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
+   is the actual size of the uncompressed data.
     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
@ -1222,6 +1280,14 @@ ZEXTERN int ZEXPORT uncompress OF((Bytef* dest,   uLongf* destLen,
   buffer with the uncompressed data up to that point.
 */
 ZEXTERN int ZEXPORT uncompress2 OF((Bytef *dest,   uLongf *destLen,
                                    const Bytef *source, uLong *sourceLen));
 /*
     Same as uncompress, except that sourceLen is a pointer, where the
   length of the source is *sourceLen.  On return, *sourceLen is the number of
   source bytes consumed.
 */
                        /* gzip file access functions */
 /*
@ -1300,10 +1366,9 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
   default buffer size is 8192 bytes.  This function must be called after
   gzopen() or gzdopen(), and before any other calls that read or write the
   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
+   write.  Three times that size in buffer space is allocated.  A larger buffer
-   writing, or one of the specified size and the other twice that size when
+   size of, for example, 64K or 128K bytes will noticeably increase the speed
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
+   of decompression (reading).
   noticeably increase the speed of decompression (reading).
     The new buffer size also affects the maximum length for gzprintf().
@ -1314,10 +1379,12 @@ ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
 ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
 /*
     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
+   of deflateInit2 for the meaning of these parameters.  Previously provided
   data is flushed before the parameter change.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+     gzsetparams returns Z_OK if success, Z_STREAM_ERROR if the file was not
-   opened for writing.
+   opened for writing, Z_ERRNO if there is an error writing the flushed data,
   or Z_MEM_ERROR if there is a memory allocation error.
 */
 ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
@ -1345,7 +1412,35 @@ ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
   case.
     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
+   len for end of file, or -1 for error.  If len is too large to fit in an int,
   then nothing is read, -1 is returned, and the error state is set to
   Z_STREAM_ERROR.
 */
 ZEXTERN z_size_t ZEXPORT gzfread OF((voidp buf, z_size_t size, z_size_t nitems,
                                     gzFile file));
 /*
     Read up to nitems items of size size from file to buf, otherwise operating
   as gzread() does.  This duplicates the interface of stdio's fread(), with
   size_t request and return types.  If the library defines size_t, then
   z_size_t is identical to size_t.  If not, then z_size_t is an unsigned
   integer type that can contain a pointer.
     gzfread() returns the number of full items read of size size, or zero if
   the end of the file was reached and a full item could not be read, or if
   there was an error.  gzerror() must be consulted if zero is returned in
   order to determine if there was an error.  If the multiplication of size and
   nitems overflows, i.e. the product does not fit in a z_size_t, then nothing
   is read, zero is returned, and the error state is set to Z_STREAM_ERROR.
     In the event that the end of file is reached and only a partial item is
   available at the end, i.e. the remaining uncompressed data length is not a
   multiple of size, then the final partial item is nevetheless read into buf
   and the end-of-file flag is set.  The length of the partial item read is not
   provided, but could be inferred from the result of gztell().  This behavior
   is the same as the behavior of fread() implementations in common libraries,
   but it prevents the direct use of gzfread() to read a concurrently written
   file, reseting and retrying on end-of-file, when size is not 1.
 */
 ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
@ -1356,19 +1451,33 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
   error.
 */
 ZEXTERN z_size_t ZEXPORT gzfwrite OF((voidpc buf, z_size_t size,
                                      z_size_t nitems, gzFile file));
 /*
     gzfwrite() writes nitems items of size size from buf to file, duplicating
   the interface of stdio's fwrite(), with size_t request and return types.  If
   the library defines size_t, then z_size_t is identical to size_t.  If not,
   then z_size_t is an unsigned integer type that can contain a pointer.
     gzfwrite() returns the number of full items written of size size, or zero
   if there was an error.  If the multiplication of size and nitems overflows,
   i.e. the product does not fit in a z_size_t, then nothing is written, zero
   is returned, and the error state is set to Z_STREAM_ERROR.
 */
 ZEXTERN int ZEXPORTVA gzprintf Z_ARG((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
-   uncompressed bytes actually written, or 0 in case of error.  The number of
+   uncompressed bytes actually written, or a negative zlib error code in case
-   uncompressed bytes written is limited to 8191, or one less than the buffer
+   of error.  The number of uncompressed bytes written is limited to 8191, or
-   size given to gzbuffer().  The caller should assure that this limit is not
+   one less than the buffer size given to gzbuffer().  The caller should assure
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
+   that this limit is not exceeded.  If it is exceeded, then gzprintf() will
-   nothing written.  In this case, there may also be a buffer overflow with
+   return an error (0) with nothing written.  In this case, there may also be a
-   unpredictable consequences, which is possible only if zlib was compiled with
+   buffer overflow with unpredictable consequences, which is possible only if
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
-   or vsnprintf() functions were not available.  This can be determined using
+   because the secure snprintf() or vsnprintf() functions were not available.
-   zlibCompileFlags().
+   This can be determined using zlibCompileFlags().
 */
 ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
@ -1392,11 +1501,7 @@ ZEXTERN char* ZEXPORT gzgets OF((gzFile file, char* buf, int len));
   buf are indeterminate.
 */
 #ifdef WIN32
 ZEXTERN int ZEXPORT gzputc OF((gzFile file, unsigned char c));
 #else
 ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
 #endif
 /*
     Writes c, converted to an unsigned char, into the compressed file.  gzputc
   returns the value that was written, or -1 in case of error.
@ -1411,11 +1516,7 @@ ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
   points to has been clobbered or not.
 */
 #ifdef WIN32
 ZEXTERN int ZEXPORT gzungetc OF((signed char c, gzFile file));
 #else
 ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
 #endif
 /*
     Push one character back onto the stream to be read as the first character
   on the next read.  At least one character of push-back is allowed.
@ -1436,7 +1537,7 @@ ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
     If the flush parameter is Z_FINISH, the remaining data is written and the
   gzip stream is completed in the output.  If gzwrite() is called again, a new
   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
+   concatenated gzip streams.
     gzflush should be called only when strictly necessary because it will
   degrade compression if called too often.
@ -1590,7 +1691,7 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef* buf, uInt len));
   return the updated checksum.  If buf is Z_NULL, this function returns the
   required initial value for the checksum.
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+     An Adler-32 checksum is almost as reliable as a CRC-32 but can be computed
   much faster.
   Usage example:
@ -1603,6 +1704,12 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef* buf, uInt len));
     if (adler != original_adler) error();
 */
 ZEXTERN uLong ZEXPORT adler32_z OF((uLong adler, const Bytef *buf,
                                    z_size_t len));
 /*
     Same as adler32(), but with a size_t length.
 */
 /*
 ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
                                          z_off_t len2));
@ -1632,6 +1739,12 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef* buf, uInt len));
     if (crc != original_crc) error();
 */
 ZEXTERN uLong ZEXPORT crc32_z OF((uLong adler, const Bytef *buf,
                                  z_size_t len));
 /*
     Same as crc32(), but with a size_t length.
 */
 /*
 ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
@ -1662,6 +1775,21 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                         unsigned char FAR *window,
                                         const char *version,
                                         int stream_size));
 #ifdef Z_PREFIX_SET
 #  define z_deflateInit(strm, level) \
          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define z_inflateInit(strm) \
          inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define z_deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
          deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
                        (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define z_inflateInit2(strm, windowBits) \
          inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
                        (int)sizeof(z_stream))
 #  define z_inflateBackInit(strm, windowBits, window) \
          inflateBackInit_((strm), (windowBits), (window), \
                           ZLIB_VERSION, (int)sizeof(z_stream))
 #else
 #  define deflateInit(strm, level) \
          deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
 #  define inflateInit(strm) \
@ -1675,6 +1803,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
 #  define inflateBackInit(strm, windowBits, window) \
          inflateBackInit_((strm), (windowBits), (window), \
                           ZLIB_VERSION, (int)sizeof(z_stream))
 #endif
 #ifndef Z_SOLO
@ -1685,8 +1814,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
 * 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
+struct gzFile_s {
 {
    unsigned have;
    unsigned char *next;
    z_off64_t pos;
@ -1695,10 +1823,10 @@ 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))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #else
 #  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : (gzgetc)(g))
 #endif
 /* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
@ -1756,22 +1884,26 @@ 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;};
 #endif
 /* 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 int            ZEXPORT inflateUndermine OF((z_streamp, int));
 ZEXTERN int            ZEXPORT inflateValidate OF((z_streamp, int));
 ZEXTERN unsigned long  ZEXPORT inflateCodesUsed OF ((z_streamp));
 ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
 ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(Z_SOLO)
 ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
                                            const char *mode));
 #endif
 #if defined(STDC) || defined(Z_HAVE_STDARG_H)
 #  ifndef Z_SOLO
 ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
                                                  const char *format,
                                                  va_list va));
 #  endif
 #endif
 #ifdef __cplusplus
 }
--- a/extern/zlib/zutil.c
+++ b/extern/zlib/zutil.c
@ -1,5 +1,5 @@
 /* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * Copyright (C) 1995-2017 Jean-loup Gailly
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -10,22 +10,17 @@
 #  include "gzguts.h"
 #endif
-#ifndef NO_DUMMY_DECL
+z_const char * const z_errmsg[10] = {
-struct internal_state      {int dummy;}; /* for buggy compilers */
+    (z_const char *)"need dictionary",     /* Z_NEED_DICT       2  */
-#endif
+    (z_const char *)"stream end",          /* Z_STREAM_END      1  */
-
+    (z_const char *)"",                    /* Z_OK              0  */
-const char* const z_errmsg[10] =
+    (z_const char *)"file error",          /* Z_ERRNO         (-1) */
-{
+    (z_const char *)"stream error",        /* Z_STREAM_ERROR  (-2) */
-    "need dictionary",     /* Z_NEED_DICT       2  */
+    (z_const char *)"data error",          /* Z_DATA_ERROR    (-3) */
-    "stream end",          /* Z_STREAM_END      1  */
+    (z_const char *)"insufficient memory", /* Z_MEM_ERROR     (-4) */
-    "",                    /* Z_OK              0  */
+    (z_const char *)"buffer error",        /* Z_BUF_ERROR     (-5) */
-    "file error",          /* Z_ERRNO         (-1) */
+    (z_const char *)"incompatible version",/* Z_VERSION_ERROR (-6) */
-    "stream error",        /* Z_STREAM_ERROR  (-2) */
+    (z_const char *)""
    "data error",          /* Z_DATA_ERROR    (-3) */
    "insufficient memory", /* Z_MEM_ERROR     (-4) */
    "buffer error",        /* Z_BUF_ERROR     (-5) */
    "incompatible version",/* Z_VERSION_ERROR (-6) */
    ""
 };
@ -39,76 +34,31 @@ uLong ZEXPORT zlibCompileFlags()
    uLong flags;
    flags = 0;
-
+    switch ((int)(sizeof(uInt))) {
-    switch ((int)(sizeof(uInt)))
+    case 2:     break;
-    {
+    case 4:     flags += 1;     break;
-        case 2:
+    case 8:     flags += 2;     break;
-            break;
+    default:    flags += 3;
        case 4:
            flags += 1;
            break;
        case 8:
            flags += 2;
            break;
        default:
            flags += 3;
    }
-
+    switch ((int)(sizeof(uLong))) {
-    switch ((int)(sizeof(uLong)))
+    case 2:     break;
-    {
+    case 4:     flags += 1 << 2;        break;
-        case 2:
+    case 8:     flags += 2 << 2;        break;
-            break;
+    default:    flags += 3 << 2;
        case 4:
            flags += 1 << 2;
            break;
        case 8:
            flags += 2 << 2;
            break;
        default:
            flags += 3 << 2;
    }
-
+    switch ((int)(sizeof(voidpf))) {
-    switch ((int)(sizeof(voidpf)))
+    case 2:     break;
-    {
+    case 4:     flags += 1 << 4;        break;
-        case 2:
+    case 8:     flags += 2 << 4;        break;
-            break;
+    default:    flags += 3 << 4;
        case 4:
            flags += 1 << 4;
            break;
        case 8:
            flags += 2 << 4;
            break;
        default:
            flags += 3 << 4;
    }
-
+    switch ((int)(sizeof(z_off_t))) {
-    switch ((int)(sizeof(z_off_t)))
+    case 2:     break;
-    {
+    case 4:     flags += 1 << 6;        break;
-        case 2:
+    case 8:     flags += 2 << 6;        break;
-            break;
+    default:    flags += 3 << 6;
        case 4:
            flags += 1 << 6;
            break;
        case 8:
            flags += 2 << 6;
            break;
        default:
            flags += 3 << 6;
    }
-
+#ifdef ZLIB_DEBUG
 #ifdef DEBUG
    flags += 1 << 8;
 #endif
 #if defined(ASMV) || defined(ASMINF)
@ -162,8 +112,8 @@ uLong ZEXPORT zlibCompileFlags()
    return flags;
 }
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
-
+#include <stdlib.h>
 #  ifndef verbose
 #    define verbose 0
 #  endif
@ -180,12 +130,8 @@ char* m;
 /* exported to allow conversion of error code to string for compress() and
 * uncompress()
 */
 #ifdef WIN32
 const char* ZEXPORT zError(int err)
 #else
 const char * ZEXPORT zError(err)
    int err;
 #endif
 {
    return ERR_MSG(err);
 }
@ -206,12 +152,9 @@ const Bytef* source;
    uInt  len;
 {
    if (len == 0) return;
-
+    do {
    do
    {
        *dest++ = *source++; /* ??? to be unrolled */
-    }
+    } while (--len != 0);
    while (--len != 0);
 }
 int ZLIB_INTERNAL zmemcmp(s1, s2, len)
@ -221,11 +164,9 @@ uInt  len;
 {
    uInt j;
-    for (j = 0; j < len; j++)
+    for (j = 0; j < len; j++) {
    {
        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
    }
    return 0;
 }
@ -234,12 +175,9 @@ Bytef* dest;
    uInt  len;
 {
    if (len == 0) return;
-
+    do {
    do
    {
        *dest++ = 0;  /* ??? to be unrolled */
-    }
+    } while (--len != 0);
    while (--len != 0);
 }
 #endif
@ -263,8 +201,7 @@ uInt  len;
 local int next_ptr = 0;
-typedef struct ptr_table_s
+typedef struct ptr_table_s {
 {
    voidpf org_ptr;
    voidpf new_ptr;
 } ptr_table;
@ -279,25 +216,21 @@ local ptr_table table[MAX_PTR];
 voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
 {
-    voidpf buf = opaque; /* just to make some compilers happy */
+    voidpf buf;
    ulg bsize = (ulg)items*size;
    (void)opaque;
    /* If we allocate less than 65520 bytes, we assume that farmalloc
     * will return a usable pointer which doesn't have to be normalized.
     */
-    if (bsize < 65520L)
+    if (bsize < 65520L) {
    {
        buf = farmalloc(bsize);
        if (*(ush*)&buf != 0) return buf;
-    }
+    } else {
    else
    {
        buf = farmalloc(bsize + 16L);
    }
    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
    table[next_ptr].org_ptr = buf;
    /* Normalize the pointer to seg:0 */
@ -311,29 +244,23 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 {
    int n;
-    if (*(ush*)&ptr != 0)   /* object < 64K */
+    (void)opaque;
-    {
+
    if (*(ush*)&ptr != 0) { /* object < 64K */
        farfree(ptr);
        return;
    }
    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++)
+    for (n = 0; n < next_ptr; n++) {
    {
        if (ptr != table[n].new_ptr) continue;
        farfree(table[n].org_ptr);
-
+        while (++n < next_ptr) {
        while (++n < next_ptr)
        {
            table[n-1] = table[n];
        }
        next_ptr--;
        return;
    }
    ptr = opaque; /* just to make some compilers happy */
    Assert(0, "zcfree: ptr not found");
 }
@ -352,15 +279,13 @@ void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
    return _halloc((long)items, size);
 }
 void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
 {
-    if (opaque) opaque = 0; /* to make compiler happy */
+    (void)opaque;
    _hfree(ptr);
 }
@ -377,32 +302,22 @@ extern voidp  calloc OF((uInt items, uInt size));
 extern void   free   OF((voidpf ptr));
 #endif
 #ifdef WIN32
 voidpf ZLIB_INTERNAL zcalloc(voidpf opaque, unsigned items, unsigned size)
 #else
 voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
    voidpf opaque;
    unsigned items;
    unsigned size;
 #endif
 {
-    if (opaque) items += size - size; /* make compiler happy */
+    (void)opaque;
    return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
                              (voidpf)calloc(items, size);
 }
 #ifdef WIN32
 void ZLIB_INTERNAL zcfree(voidpf opaque, voidpf ptr)
 #else
 void ZLIB_INTERNAL zcfree (opaque, ptr)
    voidpf opaque;
    voidpf ptr;
 #endif
 {
    (void)opaque;
    free(ptr);
    if (opaque) return; /* make compiler happy */
 }
 #endif /* MY_ZCALLOC */
--- a/extern/zlib/zutil.h
+++ b/extern/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-2016 Jean-loup Gailly, Mark Adler
 * For conditions of distribution and use, see copyright notice in zlib.h
 */
@ -36,7 +36,9 @@ typedef long ptrdiff_t;  /* guess -- will be caught if guess is wrong */
 #ifndef local
 #  define local static
 #endif
-/* compile with -Dlocal if your debugger can't find static symbols */
+/* since "static" is used to mean two completely different things in C, we
   define "local" for the non-static meaning of "static", for readability
   (compile with -Dlocal if your debugger can't find static symbols) */
 typedef unsigned char  uch;
 typedef uch FAR uchf;
@ -44,13 +46,13 @@ typedef unsigned short ush;
 typedef ush FAR ushf;
 typedef unsigned long  ulg;
-extern const char* const z_errmsg[10];  /* indexed by 2-zlib_error */
+extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 /* (size given to avoid silly warnings with Visual C++) */
 #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
 #define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
+  return (strm->msg = ERR_MSG(err), (err))
 /* To be used only when the state is known to be valid */
        /* common constants */
@ -98,28 +100,38 @@ void* _Cdecl farmalloc(unsigned long nbytes);
 #endif
 #ifdef AMIGA
-#  define OS_CODE  0x01
+#  define OS_CODE  1
 #endif
 #if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
+#  define OS_CODE  2
 #  define F_OPEN(name, mode) \
     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
 #endif
 #ifdef __370__
 #  if __TARGET_LIB__ < 0x20000000
 #    define OS_CODE 4
 #  elif __TARGET_LIB__ < 0x40000000
 #    define OS_CODE 11
 #  else
 #    define OS_CODE 8
 #  endif
 #endif
 #if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
+#  define OS_CODE  5
 #endif
 #ifdef OS2
-#  define OS_CODE  0x06
+#  define OS_CODE  6
 #  if defined(M_I86) && !defined(Z_SOLO)
 #    include <malloc.h>
 #  endif
 #endif
 #if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
+#  define OS_CODE  7
 #  ifndef Z_SOLO
 #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
 #      include <unix.h> /* for fdopen */
@ -131,18 +143,24 @@ void* _Cdecl farmalloc(unsigned long nbytes);
 #  endif
 #endif
-#ifdef TOPS20
+#ifdef __acorn
-#  define OS_CODE  0x0a
+#  define OS_CODE 13
 #endif
-#ifdef WIN32
+#if defined(WIN32) && !defined(__CYGWIN__)
-#  ifndef __CYGWIN__  /* Cygwin is Unix, not Win32 */
+#  define OS_CODE  10
 #    define OS_CODE  0x0b
 #  endif
 #endif
-#ifdef __50SERIES /* Prime/PRIMOS */
+#ifdef _BEOS_
-#  define OS_CODE  0x0f
+#  define OS_CODE  16
 #endif
 #ifdef __TOS_OS400__
 #  define OS_CODE 18
 #endif
 #ifdef __APPLE__
 #  define OS_CODE 19
 #endif
 #if defined(_BEOS_) || defined(RISCOS)
@ -168,7 +186,8 @@ typedef int ptrdiff_t;
 #endif
 /* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+#if !defined(_WIN32) && \
    (!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
@ -176,7 +195,7 @@ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
        /* common defaults */
 #ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
+#  define OS_CODE  3     /* assume Unix */
 #endif
 #ifndef F_OPEN
@ -215,7 +234,7 @@ void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
 #endif
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef ZLIB_DEBUG
 #  include <stdio.h>
   extern int ZLIB_INTERNAL z_verbose;
   extern void ZLIB_INTERNAL z_error OF((char *m));