libarchive 3.0.2.2 → 3.0.3.0

raw patch · 63 files changed

+13203/−934 lines, 63 filesdep ~deepseq

Dependency ranges changed: deepseq

Files

• CHANGELOG.md +6/−0
• c/archive.h +6/−2
• c/archive_disk_acl_freebsd.c +15/−5
• c/archive_disk_acl_linux.c +20/−3
• c/archive_disk_acl_sunos.c +9/−4
• c/archive_entry.h +1/−1
• c/archive_pathmatch.c +4/−0
• c/archive_private.h +7/−0
• c/archive_random.c +4/−4
• c/archive_read_disk_posix.c +39/−27
• c/archive_read_disk_windows.c +1/−1
• c/archive_read_support_filter_rpm.c +1/−1
• c/archive_read_support_filter_uu.c +1/−1
• c/archive_read_support_format_7zip.c +9/−5
• c/archive_read_support_format_cab.c +0/−1
• c/archive_read_support_format_cpio.c +18/−0
• c/archive_read_support_format_mtree.c +4/−4
• c/archive_read_support_format_rar.c +7/−7
• c/archive_read_support_format_rar5.c +1/−0
• c/archive_read_support_format_tar.c +3/−3
• c/archive_read_support_format_zip.c +52/−102
• c/archive_write.c +20/−3
• c/archive_write_disk_posix.c +57/−6
• c/archive_write_set_format.c +3/−1
• c/archive_write_set_format_7zip.c +6/−1
• c/archive_write_set_format_by_name.c +3/−1
• c/archive_write_set_format_cpio.c +2/−492
• c/archive_write_set_format_cpio_binary.c +610/−0
• c/archive_write_set_format_cpio_odc.c +500/−0
• c/autoconf-darwin/config.h +19/−8
• c/autoconf-freebsd/config.h +19/−10
• c/autoconf-linux/config.h +21/−11
• c/autoconf-windows/config.h +10/−10
• c/config_freebsd.h +1/−0
• c/xxhash.c +5/−1
• c/zlib/adler32.c +186/−0
• c/zlib/compress.c +86/−0
• c/zlib/crc32.c +442/−0
• c/zlib/crc32.h +441/−0
• c/zlib/deflate.c +2163/−0
• c/zlib/deflate.h +349/−0
• c/zlib/gzguts.h +218/−0
• c/zlib/infback.c +640/−0
• c/zlib/inffast.c +323/−0
• c/zlib/inffast.h +11/−0
• c/zlib/inffixed.h +94/−0
• c/zlib/inflate.c +1561/−0
• c/zlib/inflate.h +125/−0
• c/zlib/inftrees.c +304/−0
• c/zlib/inftrees.h +62/−0
• c/zlib/trees.c +1203/−0
• c/zlib/trees.h +128/−0
• c/zlib/uncompr.c +93/−0
• c/zlib/zconf.h +534/−0
• c/zlib/zlib.h +1912/−0
• c/zlib/zutil.c +325/−0
• c/zlib/zutil.h +271/−0
• libarchive.cabal +227/−201
• src/Codec/Archive/Foreign/Archive.chs +3/−0
• src/Codec/Archive/Types.cpphs +2/−0
• src/Codec/Archive/Types/Foreign.chs +1/−0
• test/Codec/Archive/Roundtrip.hs +2/−2
• test/Spec.cpphs +13/−16

@@ -1,5 +1,11 @@ # libarchive +# 3.0.3.0++  * Bundle zlib sources so zip archives are guaranteed to work (work by Julian+    Ospald)+  * Upgrade bundled `libarchive` to 3.5.2. This introduces several functions.+ # 3.0.2.2    * Builds on Windows (changes due to Julian Ospald)

@@ -36,7 +36,7 @@  * assert that ARCHIVE_VERSION_NUMBER >= 2012108.  */ /* Note: Compiler will complain if this does not match archive_entry.h! */-#define	ARCHIVE_VERSION_NUMBER 3005001+#define	ARCHIVE_VERSION_NUMBER 3005002  #include <sys/stat.h> #include <stddef.h>  /* for wchar_t */@@ -155,7 +155,7 @@ /*  * Textual name/version of the library, useful for version displays.  */-#define	ARCHIVE_VERSION_ONLY_STRING "3.5.1"+#define	ARCHIVE_VERSION_ONLY_STRING "3.5.2" #define	ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING __LA_DECL const char *	archive_version_string(void); @@ -319,6 +319,7 @@ #define	ARCHIVE_FORMAT_CPIO_SVR4_NOCRC		(ARCHIVE_FORMAT_CPIO | 4) #define	ARCHIVE_FORMAT_CPIO_SVR4_CRC		(ARCHIVE_FORMAT_CPIO | 5) #define	ARCHIVE_FORMAT_CPIO_AFIO_LARGE		(ARCHIVE_FORMAT_CPIO | 6)+#define	ARCHIVE_FORMAT_CPIO_PWB			(ARCHIVE_FORMAT_CPIO | 7) #define	ARCHIVE_FORMAT_SHAR			0x20000 #define	ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1) #define	ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)@@ -800,7 +801,10 @@ __LA_DECL int archive_write_set_format_ar_bsd(struct archive *); __LA_DECL int archive_write_set_format_ar_svr4(struct archive *); __LA_DECL int archive_write_set_format_cpio(struct archive *);+__LA_DECL int archive_write_set_format_cpio_bin(struct archive *); __LA_DECL int archive_write_set_format_cpio_newc(struct archive *);+__LA_DECL int archive_write_set_format_cpio_odc(struct archive *);+__LA_DECL int archive_write_set_format_cpio_pwb(struct archive *); __LA_DECL int archive_write_set_format_gnutar(struct archive *); __LA_DECL int archive_write_set_format_iso9660(struct archive *); __LA_DECL int archive_write_set_format_mtree(struct archive *);

@@ -319,7 +319,7 @@  static int set_acl(struct archive *a, int fd, const char *name,-    struct archive_acl *abstract_acl,+    struct archive_acl *abstract_acl, __LA_MODE_T mode,     int ae_requested_type, const char *tname) { 	int		 acl_type = 0;@@ -364,6 +364,13 @@ 		return (ARCHIVE_FAILED); 	} +	if (acl_type == ACL_TYPE_DEFAULT && !S_ISDIR(mode)) {+		errno = EINVAL;+		archive_set_error(a, errno,+		    "Cannot set default ACL on non-directory");+		return (ARCHIVE_WARN);+	}+ 	acl = acl_init(entries); 	if (acl == (acl_t)NULL) { 		archive_set_error(a, errno,@@ -542,7 +549,10 @@ 	else if (acl_set_link_np(name, acl_type, acl) != 0) #else 	/* FreeBSD older than 8.0 */-	else if (acl_set_file(name, acl_type, acl) != 0)+	else if (S_ISLNK(mode)) {+	    /* acl_set_file() follows symbolic links, skip */+	    ret = ARCHIVE_OK;+	} else if (acl_set_file(name, acl_type, acl) != 0) #endif 	{ 		if (errno == EOPNOTSUPP) {@@ -677,14 +687,14 @@ 	    & ARCHIVE_ENTRY_ACL_TYPE_POSIX1E) != 0) { 		if ((archive_acl_types(abstract_acl) 		    & ARCHIVE_ENTRY_ACL_TYPE_ACCESS) != 0) {-			ret = set_acl(a, fd, name, abstract_acl,+			ret = set_acl(a, fd, name, abstract_acl, mode, 			    ARCHIVE_ENTRY_ACL_TYPE_ACCESS, "access"); 			if (ret != ARCHIVE_OK) 				return (ret); 		} 		if ((archive_acl_types(abstract_acl) 		    & ARCHIVE_ENTRY_ACL_TYPE_DEFAULT) != 0)-			ret = set_acl(a, fd, name, abstract_acl,+			ret = set_acl(a, fd, name, abstract_acl, mode, 			    ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default");  		/* Simultaneous POSIX.1e and NFSv4 is not supported */@@ -693,7 +703,7 @@ #if ARCHIVE_ACL_FREEBSD_NFS4 	else if ((archive_acl_types(abstract_acl) & 	    ARCHIVE_ENTRY_ACL_TYPE_NFS4) != 0) {-		ret = set_acl(a, fd, name, abstract_acl,+		ret = set_acl(a, fd, name, abstract_acl, mode, 		    ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4"); 	} #endif

@@ -343,6 +343,11 @@ 		return (ARCHIVE_FAILED); 	} +	if (S_ISLNK(mode)) {+		/* Linux does not support RichACLs on symbolic links */+		return (ARCHIVE_OK);+	}+ 	richacl = richacl_alloc(entries); 	if (richacl == NULL) { 		archive_set_error(a, errno,@@ -455,7 +460,7 @@ #if ARCHIVE_ACL_LIBACL static int set_acl(struct archive *a, int fd, const char *name,-    struct archive_acl *abstract_acl,+    struct archive_acl *abstract_acl, __LA_MODE_T mode,     int ae_requested_type, const char *tname) { 	int		 acl_type = 0;@@ -488,6 +493,18 @@ 		return (ARCHIVE_FAILED); 	} +	if (S_ISLNK(mode)) {+		/* Linux does not support ACLs on symbolic links */+		return (ARCHIVE_OK);+	}++	if (acl_type == ACL_TYPE_DEFAULT && !S_ISDIR(mode)) {+		errno = EINVAL;+		archive_set_error(a, errno,+		    "Cannot set default ACL on non-directory");+		return (ARCHIVE_WARN);+	}+ 	acl = acl_init(entries); 	if (acl == (acl_t)NULL) { 		archive_set_error(a, errno,@@ -727,14 +744,14 @@ 	    & ARCHIVE_ENTRY_ACL_TYPE_POSIX1E) != 0) { 		if ((archive_acl_types(abstract_acl) 		    & ARCHIVE_ENTRY_ACL_TYPE_ACCESS) != 0) {-			ret = set_acl(a, fd, name, abstract_acl,+			ret = set_acl(a, fd, name, abstract_acl, mode, 			    ARCHIVE_ENTRY_ACL_TYPE_ACCESS, "access"); 			if (ret != ARCHIVE_OK) 				return (ret); 		} 		if ((archive_acl_types(abstract_acl) 		    & ARCHIVE_ENTRY_ACL_TYPE_DEFAULT) != 0)-			ret = set_acl(a, fd, name, abstract_acl,+			ret = set_acl(a, fd, name, abstract_acl, mode, 			    ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default"); 	} #endif	/* ARCHIVE_ACL_LIBACL */

@@ -443,7 +443,7 @@  static int set_acl(struct archive *a, int fd, const char *name,-    struct archive_acl *abstract_acl,+    struct archive_acl *abstract_acl, __LA_MODE_T mode,     int ae_requested_type, const char *tname) { 	aclent_t	 *aclent;@@ -467,7 +467,6 @@ 	if (entries == 0) 		return (ARCHIVE_OK); - 	switch (ae_requested_type) { 	case ARCHIVE_ENTRY_ACL_TYPE_POSIX1E: 		cmd = SETACL;@@ -492,6 +491,12 @@ 		return (ARCHIVE_FAILED); 	} +        if (S_ISLNK(mode)) {+                /* Skip ACLs on symbolic links */+		ret = ARCHIVE_OK;+		goto exit_free;+        }+ 	e = 0;  	while (archive_acl_next(a, abstract_acl, ae_requested_type, &ae_type,@@ -801,7 +806,7 @@ 	if ((archive_acl_types(abstract_acl) 	    & ARCHIVE_ENTRY_ACL_TYPE_POSIX1E) != 0) { 		/* Solaris writes POSIX.1e access and default ACLs together */-		ret = set_acl(a, fd, name, abstract_acl,+		ret = set_acl(a, fd, name, abstract_acl, mode, 		    ARCHIVE_ENTRY_ACL_TYPE_POSIX1E, "posix1e");  		/* Simultaneous POSIX.1e and NFSv4 is not supported */@@ -810,7 +815,7 @@ #if ARCHIVE_ACL_SUNOS_NFS4 	else if ((archive_acl_types(abstract_acl) & 	    ARCHIVE_ENTRY_ACL_TYPE_NFS4) != 0) {-		ret = set_acl(a, fd, name, abstract_acl,+		ret = set_acl(a, fd, name, abstract_acl, mode, 		    ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4"); 	} #endif

@@ -30,7 +30,7 @@ #define	ARCHIVE_ENTRY_H_INCLUDED  /* Note: Compiler will complain if this does not match archive.h! */-#define	ARCHIVE_VERSION_NUMBER 3005001+#define	ARCHIVE_VERSION_NUMBER 3005002  /*  * Note: archive_entry.h is for use outside of libarchive; the

@@ -384,6 +384,8 @@ 	/* Empty pattern only matches the empty string. */ 	if (p == NULL || *p == '\0') 		return (s == NULL || *s == '\0');+	else if (s == NULL)+		return (0);  	/* Leading '^' anchors the start of the pattern. */ 	if (*p == '^') {@@ -424,6 +426,8 @@ 	/* Empty pattern only matches the empty string. */ 	if (p == NULL || *p == L'\0') 		return (s == NULL || *s == L'\0');+	else if (s == NULL)+		return (0);  	/* Leading '^' anchors the start of the pattern. */ 	if (*p == L'^') {

@@ -46,6 +46,13 @@ #define	__LA_DEAD #endif +#if defined(__GNUC__) && (__GNUC__ > 2 || \+			  (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))+#define	__LA_UNUSED	__attribute__((__unused__))+#else+#define	__LA_UNUSED+#endif+ #define	ARCHIVE_WRITE_MAGIC	(0xb0c5c0deU) #define	ARCHIVE_READ_MAGIC	(0xdeb0c5U) #define	ARCHIVE_WRITE_DISK_MAGIC (0xc001b0c5U)

@@ -173,7 +173,7 @@ }  static inline void-arc4_addrandom(u_char *dat, int datlen)+arc4_addrandom(uint8_t *dat, int datlen) { 	int     n; 	uint8_t si;@@ -196,7 +196,7 @@ 	struct { 		struct timeval	tv; 		pid_t		pid;-		u_char	 	rnd[KEYSIZE];+		uint8_t		rnd[KEYSIZE]; 	} rdat;  	if (!rs_initialized) {@@ -216,7 +216,7 @@ 		/* We'll just take whatever was on the stack too... */ 	} -	arc4_addrandom((u_char *)&rdat, KEYSIZE);+	arc4_addrandom((uint8_t *)&rdat, KEYSIZE);  	/* 	 * Discard early keystream, as per recommendations in:@@ -258,7 +258,7 @@ static void arc4random_buf(void *_buf, size_t n) {-	u_char *buf = (u_char *)_buf;+	uint8_t *buf = (uint8_t *)_buf; 	_ARC4_LOCK(); 	arc4_stir_if_needed(); 	while (n--) {

@@ -1522,9 +1522,41 @@ } #endif -#if defined(HAVE_STATFS) && defined(HAVE_FSTATFS) && defined(MNT_LOCAL) \-	&& !defined(ST_LOCAL)+#if defined(HAVE_STATVFS)+static inline __LA_UNUSED void+set_statvfs_transfer_size(struct filesystem *fs, const struct statvfs *sfs)+{+	fs->xfer_align = sfs->f_frsize > 0 ? (long)sfs->f_frsize : -1;+	fs->max_xfer_size = -1;+#if defined(HAVE_STRUCT_STATVFS_F_IOSIZE)+	fs->min_xfer_size = sfs->f_iosize > 0 ? (long)sfs->f_iosize : -1;+	fs->incr_xfer_size = sfs->f_iosize > 0 ? (long)sfs->f_iosize : -1;+#else+	fs->min_xfer_size = sfs->f_bsize > 0 ? (long)sfs->f_bsize : -1;+	fs->incr_xfer_size = sfs->f_bsize > 0 ? (long)sfs->f_bsize : -1;+#endif+}+#endif +#if defined(HAVE_STRUCT_STATFS)+static inline __LA_UNUSED void+set_statfs_transfer_size(struct filesystem *fs, const struct statfs *sfs)+{+	fs->xfer_align = sfs->f_bsize > 0 ? (long)sfs->f_bsize : -1;+	fs->max_xfer_size = -1;+#if defined(HAVE_STRUCT_STATFS_F_IOSIZE)+	fs->min_xfer_size = sfs->f_iosize > 0 ? (long)sfs->f_iosize : -1;+	fs->incr_xfer_size = sfs->f_iosize > 0 ? (long)sfs->f_iosize : -1;+#else+	fs->min_xfer_size = sfs->f_bsize > 0 ? (long)sfs->f_bsize : -1;+	fs->incr_xfer_size = sfs->f_bsize > 0 ? (long)sfs->f_bsize : -1;+#endif+}+#endif++#if defined(HAVE_STRUCT_STATFS) && defined(HAVE_STATFS) && \+    defined(HAVE_FSTATFS) && defined(MNT_LOCAL) && !defined(ST_LOCAL)+ /*  * Gather current filesystem properties on FreeBSD, OpenBSD and Mac OS X.  */@@ -1593,10 +1625,7 @@ 		return (ARCHIVE_FAILED); 	} else if (xr == 1) { 		/* pathconf(_PC_REX_*) operations are not supported. */-		t->current_filesystem->xfer_align = sfs.f_bsize;-		t->current_filesystem->max_xfer_size = -1;-		t->current_filesystem->min_xfer_size = sfs.f_iosize;-		t->current_filesystem->incr_xfer_size = sfs.f_iosize;+		set_statfs_transfer_size(t->current_filesystem, &sfs); 	} 	if (sfs.f_flags & MNT_LOCAL) 		t->current_filesystem->remote = 0;@@ -1688,15 +1717,7 @@ 	} else if (xr == 1) { 		/* Usually come here unless NetBSD supports _PC_REC_XFER_ALIGN 		 * for pathconf() function. */-		t->current_filesystem->xfer_align = svfs.f_frsize;-		t->current_filesystem->max_xfer_size = -1;-#if defined(HAVE_STRUCT_STATVFS_F_IOSIZE)-		t->current_filesystem->min_xfer_size = svfs.f_iosize;-		t->current_filesystem->incr_xfer_size = svfs.f_iosize;-#else-		t->current_filesystem->min_xfer_size = svfs.f_bsize;-		t->current_filesystem->incr_xfer_size = svfs.f_bsize;-#endif+		set_statvfs_transfer_size(t->current_filesystem, &svfs); 	} 	if (svfs.f_flag & ST_LOCAL) 		t->current_filesystem->remote = 0;@@ -1803,15 +1824,9 @@ 	} else if (xr == 1) { 		/* pathconf(_PC_REX_*) operations are not supported. */ #if defined(HAVE_STATVFS)-		t->current_filesystem->xfer_align = svfs.f_frsize;-		t->current_filesystem->max_xfer_size = -1;-		t->current_filesystem->min_xfer_size = svfs.f_bsize;-		t->current_filesystem->incr_xfer_size = svfs.f_bsize;+		set_statvfs_transfer_size(t->current_filesystem, &svfs); #else-		t->current_filesystem->xfer_align = sfs.f_frsize;-		t->current_filesystem->max_xfer_size = -1;-		t->current_filesystem->min_xfer_size = sfs.f_bsize;-		t->current_filesystem->incr_xfer_size = sfs.f_bsize;+		set_statfs_transfer_size(t->current_filesystem, &sfs); #endif 	} 	switch (sfs.f_type) {@@ -1918,10 +1933,7 @@ 		return (ARCHIVE_FAILED); 	} else if (xr == 1) { 		/* pathconf(_PC_REX_*) operations are not supported. */-		t->current_filesystem->xfer_align = svfs.f_frsize;-		t->current_filesystem->max_xfer_size = -1;-		t->current_filesystem->min_xfer_size = svfs.f_bsize;-		t->current_filesystem->incr_xfer_size = svfs.f_bsize;+		set_statvfs_transfer_size(t->current_filesystem, &svfs); 	}  #if defined(ST_NOATIME)

@@ -1844,7 +1844,7 @@ 					continue; 				return (r); 			} else {-				HANDLE h = FindFirstFileW(d, &t->_findData);+				HANDLE h = FindFirstFileW(t->stack->full_path.s, &t->_findData); 				if (h == INVALID_HANDLE_VALUE) { 					la_dosmaperr(GetLastError()); 					t->tree_errno = errno;

@@ -216,7 +216,7 @@ 						archive_set_error( 						    &self->archive->archive, 						    ARCHIVE_ERRNO_FILE_FORMAT,-						    "Unrecoginized rpm header");+						    "Unrecognized rpm header"); 						return (ARCHIVE_FATAL); 					} 					rpm->state = ST_ARCHIVE;

@@ -248,7 +248,7 @@ 		*ravail = *avail; 		*b += diff; 		*avail -= diff;-		tested = len;/* Skip some bytes we already determinated. */+		tested = len;/* Skip some bytes we already determined. */ 		len = get_line(*b + tested, *avail - tested, nl); 		if (len >= 0) 			len += tested;

@@ -808,8 +808,12 @@ 	if (zip->end_of_entry) 		return (ARCHIVE_EOF); -	bytes = read_stream(a, buff,-		(size_t)zip->entry_bytes_remaining, 0);+	const uint64_t max_read_size = 16 * 1024 * 1024;  // Don't try to read more than 16 MB at a time+	size_t bytes_to_read = max_read_size;+	if ((uint64_t)bytes_to_read > zip->entry_bytes_remaining) {+		bytes_to_read = zip->entry_bytes_remaining;+	}+	bytes = read_stream(a, buff, bytes_to_read, 0); 	if (bytes < 0) 		return ((int)bytes); 	if (bytes == 0) {@@ -1493,7 +1497,7 @@ 				zip->ppmd7_stat = -1; 				archive_set_error(&a->archive, 				    ARCHIVE_ERRNO_MISC,-				    "Failed to initialize PPMd range decorder");+				    "Failed to initialize PPMd range decoder"); 				return (ARCHIVE_FAILED); 			} 			if (zip->ppstream.overconsumed) {@@ -3031,10 +3035,10 @@ 			    "Truncated 7-Zip file body"); 			return (ARCHIVE_FATAL); 		}-		if (bytes_avail > (ssize_t)zip->pack_stream_inbytes_remaining)+		if ((uint64_t)bytes_avail > zip->pack_stream_inbytes_remaining) 			bytes_avail = (ssize_t)zip->pack_stream_inbytes_remaining; 		zip->pack_stream_inbytes_remaining -= bytes_avail;-		if (bytes_avail > (ssize_t)zip->folder_outbytes_remaining)+		if ((uint64_t)bytes_avail > zip->folder_outbytes_remaining) 			bytes_avail = (ssize_t)zip->folder_outbytes_remaining; 		zip->folder_outbytes_remaining -= bytes_avail; 		zip->uncompressed_buffer_bytes_remaining = bytes_avail;

@@ -2110,7 +2110,6 @@ 		ds->pos_tbl = malloc(sizeof(ds->pos_tbl[0]) * w_slot); 		if (ds->pos_tbl == NULL) 			return (ARCHIVE_FATAL);-		lzx_huffman_free(&(ds->mt)); 	}  	for (footer = 0; footer < 18; footer++)

@@ -185,6 +185,8 @@ 	struct archive_string_conv *opt_sconv; 	struct archive_string_conv *sconv_default; 	int			  init_default_conversion;++	int			  option_pwb; };  static int64_t	atol16(const char *, unsigned);@@ -343,6 +345,10 @@ 				ret = ARCHIVE_FATAL; 		} 		return (ret);+	} else if (strcmp(key, "pwb")  == 0) {+		if (val != NULL && val[0] != 0)+			cpio->option_pwb = 1;+		return (ARCHIVE_OK); 	}  	/* Note: The "warn" return is just to inform the options@@ -891,6 +897,12 @@ 	archive_entry_set_dev(entry, header[bin_dev_offset] + header[bin_dev_offset + 1] * 256); 	archive_entry_set_ino(entry, header[bin_ino_offset] + header[bin_ino_offset + 1] * 256); 	archive_entry_set_mode(entry, header[bin_mode_offset] + header[bin_mode_offset + 1] * 256);+	if (cpio->option_pwb) {+		/* turn off random bits left over from V6 inode */+		archive_entry_set_mode(entry, archive_entry_mode(entry) & 067777);+		if ((archive_entry_mode(entry) & AE_IFMT) == 0)+			archive_entry_set_mode(entry, archive_entry_mode(entry) | AE_IFREG);+	} 	archive_entry_set_uid(entry, header[bin_uid_offset] + header[bin_uid_offset + 1] * 256); 	archive_entry_set_gid(entry, header[bin_gid_offset] + header[bin_gid_offset + 1] * 256); 	archive_entry_set_nlink(entry, header[bin_nlink_offset] + header[bin_nlink_offset + 1] * 256);@@ -930,6 +942,12 @@ 	archive_entry_set_dev(entry, header[bin_dev_offset] * 256 + header[bin_dev_offset + 1]); 	archive_entry_set_ino(entry, header[bin_ino_offset] * 256 + header[bin_ino_offset + 1]); 	archive_entry_set_mode(entry, header[bin_mode_offset] * 256 + header[bin_mode_offset + 1]);+	if (cpio->option_pwb) {+		/* turn off random bits left over from V6 inode */+		archive_entry_set_mode(entry, archive_entry_mode(entry) & 067777);+		if ((archive_entry_mode(entry) & AE_IFMT) == 0)+			archive_entry_set_mode(entry, archive_entry_mode(entry) | AE_IFREG);+	} 	archive_entry_set_uid(entry, header[bin_uid_offset] * 256 + header[bin_uid_offset + 1]); 	archive_entry_set_gid(entry, header[bin_gid_offset] * 256 + header[bin_gid_offset + 1]); 	archive_entry_set_nlink(entry, header[bin_nlink_offset] * 256 + header[bin_nlink_offset + 1]);

@@ -408,7 +408,7 @@ 		*ravail = *avail; 		*b += diff; 		*avail -= diff;-		tested = len;/* Skip some bytes we already determinated. */+		tested = len;/* Skip some bytes we already determined. */ 		len = get_line_size(*b + len, *avail - len, nl); 		if (len >= 0) 			len += tested;@@ -1074,7 +1074,7 @@ 			continue; 		/* Non-printable characters are not allowed */ 		for (s = p;s < p + len - 1; s++) {-			if (!isprint(*s)) {+			if (!isprint((unsigned char)*s)) { 				r = ARCHIVE_FATAL; 				break; 			}@@ -2035,13 +2035,13 @@  	if (**p == '-') { 		limit = INT64_MIN / base;-		last_digit_limit = INT64_MIN % base;+		last_digit_limit = -(INT64_MIN % base); 		++(*p);  		l = 0; 		digit = parsedigit(**p); 		while (digit >= 0 && digit < base) {-			if (l < limit || (l == limit && digit > last_digit_limit))+			if (l < limit || (l == limit && digit >= last_digit_limit)) 				return INT64_MIN; 			l = (l * base) - digit; 			digit = parsedigit(*++(*p));

@@ -958,17 +958,17 @@       crc32_val = 0;       while (skip > 0) { 	      size_t to_read = skip;-	      ssize_t did_read;-	      if (to_read > 32 * 1024) {+	      if (to_read > 32 * 1024) 		      to_read = 32 * 1024;-	      }-	      if ((h = __archive_read_ahead(a, to_read, &did_read)) == NULL) {+	      if ((h = __archive_read_ahead(a, to_read, NULL)) == NULL) {+		      archive_set_error(&a->archive,  ARCHIVE_ERRNO_FILE_FORMAT,+			  "Bad RAR file"); 		      return (ARCHIVE_FATAL); 	      } 	      p = h;-	      crc32_val = crc32(crc32_val, (const unsigned char *)p, (unsigned)did_read);-	      __archive_read_consume(a, did_read);-	      skip -= did_read;+	      crc32_val = crc32(crc32_val, (const unsigned char *)p, to_read);+	      __archive_read_consume(a, to_read);+	      skip -= to_read;       }       if ((crc32_val & 0xffff) != crc32_expected) { 	      archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,

@@ -4076,6 +4076,7 @@ 	if(ARCHIVE_OK != rar5_init(rar)) { 		archive_set_error(&ar->archive, ENOMEM, 		    "Can't allocate rar5 filter buffer");+		free(rar); 		return ARCHIVE_FATAL; 	} 

@@ -1906,7 +1906,7 @@ 		} 		if (strcmp(key, "GNU.sparse.numbytes") == 0) { 			tar->sparse_numbytes = tar_atol10(value, strlen(value));-			if (tar->sparse_numbytes != -1) {+			if (tar->sparse_offset != -1) { 				if (gnu_add_sparse_entry(a, tar, 				    tar->sparse_offset, tar->sparse_numbytes) 				    != ARCHIVE_OK)@@ -2643,14 +2643,14 @@  		maxval = INT64_MIN; 		limit = -(INT64_MIN / base);-		last_digit_limit = INT64_MIN % base;+		last_digit_limit = -(INT64_MIN % base); 	}  	l = 0; 	if (char_cnt != 0) { 		digit = *p - '0'; 		while (digit >= 0 && digit < base  && char_cnt != 0) {-			if (l>limit || (l == limit && digit > last_digit_limit)) {+			if (l>limit || (l == limit && digit >= last_digit_limit)) { 				return maxval; /* Truncate on overflow. */ 			} 			l = (l * base) + digit;

@@ -142,6 +142,7 @@ 	/* Structural information about the archive. */ 	struct archive_string	format_name; 	int64_t			central_directory_offset;+	int64_t			central_directory_offset_adjusted; 	size_t			central_directory_entries_total; 	size_t			central_directory_entries_on_this_disk; 	int			has_encrypted_entries;@@ -246,6 +247,17 @@ /* Many systems define min or MIN, but not all. */ #define	zipmin(a,b) ((a) < (b) ? (a) : (b)) +#ifdef HAVE_ZLIB_H+static int+zip_read_data_deflate(struct archive_read *a, const void **buff,+	size_t *size, int64_t *offset);+#endif+#if HAVE_LZMA_H && HAVE_LIBLZMA+static int+zip_read_data_zipx_lzma_alone(struct archive_read *a, const void **buff,+	size_t *size, int64_t *offset);+#endif+ /* This function is used by Ppmd8_DecodeSymbol during decompression of Ppmd8  * streams inside ZIP files. It has 2 purposes: one is to fetch the next  * compressed byte from the stream, second one is to increase the counter how@@ -899,82 +911,7 @@ 	return ARCHIVE_OK; } -#if HAVE_LZMA_H && HAVE_LIBLZMA /*- * Auxiliary function to uncompress data chunk from zipx archive- * (zip with lzma compression).- */-static int-zipx_lzma_uncompress_buffer(const char *compressed_buffer,-	size_t compressed_buffer_size,-	char *uncompressed_buffer,-	size_t uncompressed_buffer_size)-{-	int status = ARCHIVE_FATAL;-	// length of 'lzma properties data' in lzma compressed-	// data segment (stream) inside zip archive-	const size_t lzma_params_length = 5;-	// offset of 'lzma properties data' from the beginning of lzma stream-	const size_t lzma_params_offset = 4;-	// end position of 'lzma properties data' in lzma stream-	const size_t lzma_params_end = lzma_params_offset + lzma_params_length;-	if (compressed_buffer == NULL ||-			compressed_buffer_size < lzma_params_end ||-			uncompressed_buffer == NULL)-		return status;--	// prepare header for lzma_alone_decoder to replace zipx header-	// (see comments in 'zipx_lzma_alone_init' for justification)-#pragma pack(push)-#pragma pack(1)-	struct _alone_header-	{-		uint8_t bytes[5]; // lzma_params_length-		uint64_t uncompressed_size;-	} alone_header;-#pragma pack(pop)-	// copy 'lzma properties data' blob-	memcpy(&alone_header.bytes[0], compressed_buffer + lzma_params_offset,-		lzma_params_length);-	alone_header.uncompressed_size = UINT64_MAX;--	// prepare new compressed buffer, see 'zipx_lzma_alone_init' for details-	const size_t lzma_alone_buffer_size =-		compressed_buffer_size - lzma_params_end + sizeof(alone_header);-	unsigned char *lzma_alone_compressed_buffer =-		(unsigned char*) malloc(lzma_alone_buffer_size);-	if (lzma_alone_compressed_buffer == NULL)-		return status;-	// copy lzma_alone header into new buffer-	memcpy(lzma_alone_compressed_buffer, (void*) &alone_header,-		sizeof(alone_header));-	// copy compressed data into new buffer-	memcpy(lzma_alone_compressed_buffer + sizeof(alone_header),-		compressed_buffer + lzma_params_end,-		compressed_buffer_size - lzma_params_end);--	// create and fill in lzma_alone_decoder stream-	lzma_stream stream = LZMA_STREAM_INIT;-	lzma_ret ret = lzma_alone_decoder(&stream, UINT64_MAX);-	if (ret == LZMA_OK)-	{-		stream.next_in = lzma_alone_compressed_buffer;-		stream.avail_in = lzma_alone_buffer_size;-		stream.total_in = 0;-		stream.next_out = (unsigned char*)uncompressed_buffer;-		stream.avail_out = uncompressed_buffer_size;-		stream.total_out = 0;-		ret = lzma_code(&stream, LZMA_RUN);-		if (ret == LZMA_OK || ret == LZMA_STREAM_END)-			status = ARCHIVE_OK;-	}-	lzma_end(&stream);-	free(lzma_alone_compressed_buffer);-	return status;-}-#endif--/*  * Assumes file pointer is at beginning of local file header.  */ static int@@ -1242,36 +1179,30 @@ 		linkname_length = (size_t)zip_entry->compressed_size;  		archive_entry_set_size(entry, 0);-		p = __archive_read_ahead(a, linkname_length, NULL);-		if (p == NULL) {-			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,-			    "Truncated Zip file");-			return ARCHIVE_FATAL;-		}+ 		// take into account link compression if any 		size_t linkname_full_length = linkname_length; 		if (zip->entry->compression != 0) 		{ 			// symlink target string appeared to be compressed 			int status = ARCHIVE_FATAL;-			char *uncompressed_buffer =-				(char*) malloc(zip_entry->uncompressed_size);-			if (uncompressed_buffer == NULL)-			{-				archive_set_error(&a->archive, ENOMEM,-					"No memory for lzma decompression");-				return status;-			}+			const void *uncompressed_buffer;  			switch (zip->entry->compression) 			{+#if HAVE_ZLIB_H+				case 8: /* Deflate compression. */+					zip->entry_bytes_remaining = zip_entry->compressed_size;+					status = zip_read_data_deflate(a, &uncompressed_buffer,+						&linkname_full_length, NULL);+					break;+#endif #if HAVE_LZMA_H && HAVE_LIBLZMA 				case 14: /* ZIPx LZMA compression. */ 					/*(see zip file format specification, section 4.4.5)*/-					status = zipx_lzma_uncompress_buffer(p,-						linkname_length,-						uncompressed_buffer,-						(size_t)zip_entry->uncompressed_size);+					zip->entry_bytes_remaining = zip_entry->compressed_size;+					status = zip_read_data_zipx_lzma_alone(a, &uncompressed_buffer,+						&linkname_full_length, NULL); 					break; #endif 				default: /* Unsupported compression. */@@ -1280,8 +1211,6 @@ 			if (status == ARCHIVE_OK) 			{ 				p = uncompressed_buffer;-				linkname_full_length =-					(size_t)zip_entry->uncompressed_size; 			} 			else 			{@@ -1294,7 +1223,17 @@ 				return ARCHIVE_FAILED; 			} 		}+		else+		{+			p = __archive_read_ahead(a, linkname_length, NULL);+		} +		if (p == NULL) {+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,+			    "Truncated Zip file");+			return ARCHIVE_FATAL;+		}+ 		sconv = zip->sconv; 		if (sconv == NULL && (zip->entry->zip_flags & ZIP_UTF8_NAME)) 			sconv = zip->sconv_utf8;@@ -1663,7 +1602,8 @@ 	/* To unpack ZIPX's "LZMA" (id 14) stream we can use standard liblzma 	 * that is a part of XZ Utils. The stream format stored inside ZIPX 	 * file is a modified "lzma alone" file format, that was used by the-	 * `lzma` utility which was later deprecated in favour of `xz` utility. 	 * Since those formats are nearly the same, we can use a standard+	 * `lzma` utility which was later deprecated in favour of `xz` utility.+ 	 * Since those formats are nearly the same, we can use a standard 	 * "lzma alone" decoder from XZ Utils. */  	memset(&zip->zipx_lzma_stream, 0, sizeof(zip->zipx_lzma_stream));@@ -3415,24 +3355,31 @@ static int read_eocd(struct zip *zip, const char *p, int64_t current_offset) {+	uint16_t disk_num;+	uint32_t cd_size, cd_offset;+	+	disk_num = archive_le16dec(p + 4);+	cd_size = archive_le32dec(p + 12);+	cd_offset = archive_le32dec(p + 16);+ 	/* Sanity-check the EOCD we've found. */  	/* This must be the first volume. */-	if (archive_le16dec(p + 4) != 0)+	if (disk_num != 0) 		return 0; 	/* Central directory must be on this volume. */-	if (archive_le16dec(p + 4) != archive_le16dec(p + 6))+	if (disk_num != archive_le16dec(p + 6)) 		return 0; 	/* All central directory entries must be on this volume. */ 	if (archive_le16dec(p + 10) != archive_le16dec(p + 8)) 		return 0; 	/* Central directory can't extend beyond start of EOCD record. */-	if (archive_le32dec(p + 16) + archive_le32dec(p + 12)-	    > current_offset)+	if (cd_offset + cd_size > current_offset) 		return 0;  	/* Save the central directory location for later use. */-	zip->central_directory_offset = archive_le32dec(p + 16);+	zip->central_directory_offset = cd_offset;+	zip->central_directory_offset_adjusted = current_offset - cd_size;  	/* This is just a tiny bit higher than the maximum 	   returned by the streaming Zip bidder.  This ensures@@ -3484,6 +3431,8 @@  	/* Save the central directory offset for later use. */ 	zip->central_directory_offset = archive_le64dec(p + 48);+	/* TODO: Needs scanning backwards to find the eocd64 instead of assuming */+	zip->central_directory_offset_adjusted = zip->central_directory_offset;  	return 32; }@@ -3655,7 +3604,8 @@ 	 * know the correction we need to apply to account for leading 	 * padding. 	 */-	if (__archive_read_seek(a, zip->central_directory_offset, SEEK_SET) < 0)+	if (__archive_read_seek(a, zip->central_directory_offset_adjusted, SEEK_SET)+		< 0) 		return ARCHIVE_FATAL;  	found = 0;

@@ -482,6 +482,8 @@ 	ssize_t block_length; 	ssize_t target_block_length; 	ssize_t bytes_written;+	size_t to_write;+	char *p; 	int ret = ARCHIVE_OK;  	/* If there's pending data, pad and write the last block */@@ -504,9 +506,24 @@ 			    target_block_length - block_length); 			block_length = target_block_length; 		}-		bytes_written = (a->client_writer)(&a->archive,-		    a->client_data, state->buffer, block_length);-		ret = bytes_written <= 0 ? ARCHIVE_FATAL : ARCHIVE_OK;+		p = state->buffer;+		to_write = block_length;+		while (to_write > 0) {+			bytes_written = (a->client_writer)(&a->archive,+			    a->client_data, p, to_write);+			if (bytes_written <= 0) {+				ret = ARCHIVE_FATAL;+				break;+			}+			if ((size_t)bytes_written > to_write) {+				archive_set_error(&(a->archive),+						  -1, "write overrun");+				ret = ARCHIVE_FATAL;+				break;+			}+			p += bytes_written;+			to_write -= bytes_written;+		} 	} 	if (a->client_closer) 		(*a->client_closer)(&a->archive, a->client_data);

@@ -360,7 +360,7 @@ static void	fsobj_error(int *, struct archive_string *, int, const char *, 		    const char *); static int	check_symlinks_fsobj(char *, int *, struct archive_string *,-		    int);+		    int, int); static int	check_symlinks(struct archive_write_disk *); static int	create_filesystem_object(struct archive_write_disk *); static struct fixup_entry *current_fixup(struct archive_write_disk *,@@ -2263,7 +2263,7 @@ 			return (EPERM); 		} 		r = check_symlinks_fsobj(linkname_copy, &error_number,-		    &error_string, a->flags);+		    &error_string, a->flags, 1); 		if (r != ARCHIVE_OK) { 			archive_set_error(&a->archive, error_number, "%s", 			    error_string.s);@@ -2284,7 +2284,12 @@ 		 */ 		if (a->flags & ARCHIVE_EXTRACT_SAFE_WRITES) 			unlink(a->name);+#ifdef HAVE_LINKAT+		r = linkat(AT_FDCWD, linkname, AT_FDCWD, a->name,+		    0) ? errno : 0;+#else 		r = link(linkname, a->name) ? errno : 0;+#endif 		/* 		 * New cpio and pax formats allow hardlink entries 		 * to carry data, so we may have to open the file@@ -2456,6 +2461,7 @@ { 	struct archive_write_disk *a = (struct archive_write_disk *)_a; 	struct fixup_entry *next, *p;+	struct stat st; 	int fd, ret;  	archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,@@ -2473,6 +2479,20 @@ 		    (TODO_TIMES | TODO_MODE_BASE | TODO_ACLS | TODO_FFLAGS)) { 			fd = open(p->name, 			    O_WRONLY | O_BINARY | O_NOFOLLOW | O_CLOEXEC);+			if (fd == -1) {+				/* If we cannot lstat, skip entry */+				if (lstat(p->name, &st) != 0)+					goto skip_fixup_entry;+				/*+				 * If we deal with a symbolic link, mark+				 * it in the fixup mode to ensure no+				 * modifications are made to its target.+				 */+				if (S_ISLNK(st.st_mode)) {+					p->mode &= ~S_IFMT;+					p->mode |= S_IFLNK;+				}+			} 		} 		if (p->fixup & TODO_TIMES) { 			set_times(a, fd, p->mode, p->name,@@ -2487,7 +2507,12 @@ 				fchmod(fd, p->mode); 			else #endif-			chmod(p->name, p->mode);+#ifdef HAVE_LCHMOD+			lchmod(p->name, p->mode);+#else+			if (!S_ISLNK(p->mode))+				chmod(p->name, p->mode);+#endif 		} 		if (p->fixup & TODO_ACLS) 			archive_write_disk_set_acls(&a->archive, fd,@@ -2498,6 +2523,7 @@ 		if (p->fixup & TODO_MAC_METADATA) 			set_mac_metadata(a, p->name, p->mac_metadata, 					 p->mac_metadata_size);+skip_fixup_entry: 		next = p->next; 		archive_acl_clear(&p->acl); 		free(p->mac_metadata);@@ -2638,6 +2664,7 @@ 	fe->next = a->fixup_list; 	a->fixup_list = fe; 	fe->fixup = 0;+	fe->mode = 0; 	fe->name = strdup(pathname); 	return (fe); }@@ -2675,7 +2702,7 @@  */ static int check_symlinks_fsobj(char *path, int *a_eno, struct archive_string *a_estr,-    int flags)+    int flags, int checking_linkname) { #if !defined(HAVE_LSTAT) && \     !(defined(HAVE_OPENAT) && defined(HAVE_FSTATAT) && defined(HAVE_UNLINKAT))@@ -2684,6 +2711,7 @@ 	(void)error_number; /* UNUSED */ 	(void)error_string; /* UNUSED */ 	(void)flags; /* UNUSED */+	(void)checking_linkname; /* UNUSED */ 	return (ARCHIVE_OK); #else 	int res = ARCHIVE_OK;@@ -2805,6 +2833,28 @@ 				head = tail + 1; 			} 		} else if (S_ISLNK(st.st_mode)) {+			if (last && checking_linkname) {+#ifdef HAVE_LINKAT+				/*+				 * Hardlinks to symlinks are safe to write+				 * if linkat() is supported as it does not+				 * follow symlinks.+				 */+				res = ARCHIVE_OK;+#else+				/*+				 * We return ARCHIVE_FAILED here as we are+				 * not able to safely write hardlinks+				 * to symlinks.+				 */+				tail[0] = c;+				fsobj_error(a_eno, a_estr, errno,+				    "Cannot write hardlink to symlink ",+				    path);+				res = ARCHIVE_FAILED;+#endif+				break;+			} else 			if (last) { 				/* 				 * Last element is symlink; remove it@@ -2971,7 +3021,7 @@ 	int rc; 	archive_string_init(&error_string); 	rc = check_symlinks_fsobj(a->name, &error_number, &error_string,-	    a->flags);+	    a->flags, 0); 	if (rc != ARCHIVE_OK) { 		archive_set_error(&a->archive, error_number, "%s", 		    error_string.s);@@ -3899,7 +3949,8 @@  	/* If we weren't given an fd, open it ourselves. */ 	if (myfd < 0) {-		myfd = open(name, O_RDONLY | O_NONBLOCK | O_BINARY | O_CLOEXEC);+		myfd = open(name, O_RDONLY | O_NONBLOCK | O_BINARY |+		    O_CLOEXEC | O_NOFOLLOW); 		__archive_ensure_cloexec_flag(myfd); 	} 	if (myfd < 0)

@@ -44,7 +44,9 @@ { 	{ ARCHIVE_FORMAT_7ZIP,		archive_write_set_format_7zip }, 	{ ARCHIVE_FORMAT_CPIO,		archive_write_set_format_cpio },-	{ ARCHIVE_FORMAT_CPIO_POSIX,	archive_write_set_format_cpio },+	{ ARCHIVE_FORMAT_CPIO_BIN_LE,	archive_write_set_format_cpio_bin },+	{ ARCHIVE_FORMAT_CPIO_PWB,	archive_write_set_format_cpio_pwb },+	{ ARCHIVE_FORMAT_CPIO_POSIX,	archive_write_set_format_cpio_odc }, 	{ ARCHIVE_FORMAT_CPIO_SVR4_NOCRC,	archive_write_set_format_cpio_newc }, 	{ ARCHIVE_FORMAT_ISO9660,	archive_write_set_format_iso9660 }, 	{ ARCHIVE_FORMAT_MTREE,		archive_write_set_format_mtree },

@@ -755,6 +755,10 @@ 		 */ #if HAVE_LZMA_H 		header_compression = _7Z_LZMA1;+		if(zip->opt_compression == _7Z_LZMA2 ||+		   zip->opt_compression == _7Z_COPY)+			header_compression = zip->opt_compression;+ 		/* If the stored file is only one, do not encode the header. 		 * This is the same way 7z command does. */ 		if (zip->total_number_entry == 1)@@ -762,7 +766,8 @@ #else 		header_compression = _7Z_COPY; #endif-		r = _7z_compression_init_encoder(a, header_compression, 6);+		r = _7z_compression_init_encoder(a, header_compression,+		                                 zip->opt_compression_level); 		if (r < 0) 			return (r); 		zip->crc32flg = PRECODE_CRC32;

@@ -49,6 +49,7 @@ 	{ "arbsd",	archive_write_set_format_ar_bsd }, 	{ "argnu",	archive_write_set_format_ar_svr4 }, 	{ "arsvr4",	archive_write_set_format_ar_svr4 },+	{ "bin",	archive_write_set_format_cpio_bin }, 	{ "bsdtar",	archive_write_set_format_pax_restricted }, 	{ "cd9660",	archive_write_set_format_iso9660 }, 	{ "cpio",	archive_write_set_format_cpio },@@ -58,11 +59,12 @@ 	{ "mtree",	archive_write_set_format_mtree }, 	{ "mtree-classic",	archive_write_set_format_mtree_classic }, 	{ "newc",	archive_write_set_format_cpio_newc },-	{ "odc",	archive_write_set_format_cpio },+	{ "odc",	archive_write_set_format_cpio_odc }, 	{ "oldtar",	archive_write_set_format_v7tar }, 	{ "pax",	archive_write_set_format_pax }, 	{ "paxr",	archive_write_set_format_pax_restricted }, 	{ "posix",	archive_write_set_format_pax },+	{ "pwb",	archive_write_set_format_cpio_pwb }, 	{ "raw",	archive_write_set_format_raw }, 	{ "rpax",	archive_write_set_format_pax_restricted }, 	{ "shar",	archive_write_set_format_shar },

@@ -1,500 +1,10 @@-/*-- * Copyright (c) 2003-2007 Tim Kientzle- * Copyright (c) 2011-2012 Michihiro NAKAJIMA- * All rights reserved.- *- * Redistribution and use in source and binary forms, with or without- * modification, are permitted provided that the following conditions- * are met:- * 1. Redistributions of source code must retain the above copyright- *    notice, this list of conditions and the following disclaimer.- * 2. Redistributions in binary form must reproduce the above copyright- *    notice, this list of conditions and the following disclaimer in the- *    documentation and/or other materials provided with the distribution.- *- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.- */--#include "archive_platform.h"-__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2009-12-29 06:34:23Z kientzle $");--#ifdef HAVE_ERRNO_H-#include <errno.h>-#endif-#include <stdio.h>-#ifdef HAVE_STDLIB_H-#include <stdlib.h>-#endif-#ifdef HAVE_STRING_H-#include <string.h>-#endif- #include "archive.h"-#include "archive_entry.h"-#include "archive_entry_locale.h"-#include "archive_private.h"-#include "archive_write_private.h"-#include "archive_write_set_format_private.h" -static ssize_t	archive_write_cpio_data(struct archive_write *,-		    const void *buff, size_t s);-static int	archive_write_cpio_close(struct archive_write *);-static int	archive_write_cpio_free(struct archive_write *);-static int	archive_write_cpio_finish_entry(struct archive_write *);-static int	archive_write_cpio_header(struct archive_write *,-		    struct archive_entry *);-static int	archive_write_cpio_options(struct archive_write *,-		    const char *, const char *);-static int	format_octal(int64_t, void *, int);-static int64_t	format_octal_recursive(int64_t, char *, int);-static int	write_header(struct archive_write *, struct archive_entry *);--struct cpio {-	uint64_t	  entry_bytes_remaining;--	int64_t		  ino_next;--	struct		 { int64_t old; int new;} *ino_list;-	size_t		  ino_list_size;-	size_t		  ino_list_next;--	struct archive_string_conv *opt_sconv;-	struct archive_string_conv *sconv_default;-	int		  init_default_conversion;-};--#define	c_magic_offset 0-#define	c_magic_size 6-#define	c_dev_offset 6-#define	c_dev_size 6-#define	c_ino_offset 12-#define	c_ino_size 6-#define	c_mode_offset 18-#define	c_mode_size 6-#define	c_uid_offset 24-#define	c_uid_size 6-#define	c_gid_offset 30-#define	c_gid_size 6-#define	c_nlink_offset 36-#define	c_nlink_size 6-#define	c_rdev_offset 42-#define	c_rdev_size 6-#define	c_mtime_offset 48-#define	c_mtime_size 11-#define	c_namesize_offset 59-#define	c_namesize_size 6-#define	c_filesize_offset 65-#define	c_filesize_size 11- /*- * Set output format to 'cpio' format.+ * Set output format to the default 'cpio' format.  */ int archive_write_set_format_cpio(struct archive *_a) {-	struct archive_write *a = (struct archive_write *)_a;-	struct cpio *cpio;--	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,-	    ARCHIVE_STATE_NEW, "archive_write_set_format_cpio");--	/* If someone else was already registered, unregister them. */-	if (a->format_free != NULL)-		(a->format_free)(a);--	cpio = (struct cpio *)calloc(1, sizeof(*cpio));-	if (cpio == NULL) {-		archive_set_error(&a->archive, ENOMEM, "Can't allocate cpio data");-		return (ARCHIVE_FATAL);-	}-	a->format_data = cpio;-	a->format_name = "cpio";-	a->format_options = archive_write_cpio_options;-	a->format_write_header = archive_write_cpio_header;-	a->format_write_data = archive_write_cpio_data;-	a->format_finish_entry = archive_write_cpio_finish_entry;-	a->format_close = archive_write_cpio_close;-	a->format_free = archive_write_cpio_free;-	a->archive.archive_format = ARCHIVE_FORMAT_CPIO_POSIX;-	a->archive.archive_format_name = "POSIX cpio";-	return (ARCHIVE_OK);-}--static int-archive_write_cpio_options(struct archive_write *a, const char *key,-    const char *val)-{-	struct cpio *cpio = (struct cpio *)a->format_data;-	int ret = ARCHIVE_FAILED;--	if (strcmp(key, "hdrcharset")  == 0) {-		if (val == NULL || val[0] == 0)-			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,-			    "%s: hdrcharset option needs a character-set name",-			    a->format_name);-		else {-			cpio->opt_sconv = archive_string_conversion_to_charset(-			    &a->archive, val, 0);-			if (cpio->opt_sconv != NULL)-				ret = ARCHIVE_OK;-			else-				ret = ARCHIVE_FATAL;-		}-		return (ret);-	}--	/* Note: The "warn" return is just to inform the options-	 * supervisor that we didn't handle it.  It will generate-	 * a suitable error if no one used this option. */-	return (ARCHIVE_WARN);-}--/*- * Ino values are as long as 64 bits on some systems; cpio format- * only allows 18 bits and relies on the ino values to identify hardlinked- * files.  So, we can't merely "hash" the ino numbers since collisions- * would corrupt the archive.  Instead, we generate synthetic ino values- * to store in the archive and maintain a map of original ino values to- * synthetic ones so we can preserve hardlink information.- *- * TODO: Make this more efficient.  It's not as bad as it looks (most- * files don't have any hardlinks and we don't do any work here for those),- * but it wouldn't be hard to do better.- *- * TODO: Work with dev/ino pairs here instead of just ino values.- */-static int-synthesize_ino_value(struct cpio *cpio, struct archive_entry *entry)-{-	int64_t ino = archive_entry_ino64(entry);-	int ino_new;-	size_t i;--	/*-	 * If no index number was given, don't assign one.  In-	 * particular, this handles the end-of-archive marker-	 * correctly by giving it a zero index value.  (This is also-	 * why we start our synthetic index numbers with one below.)-	 */-	if (ino == 0)-		return (0);--	/* Don't store a mapping if we don't need to. */-	if (archive_entry_nlink(entry) < 2) {-		return (int)(++cpio->ino_next);-	}--	/* Look up old ino; if we have it, this is a hardlink-	 * and we reuse the same value. */-	for (i = 0; i < cpio->ino_list_next; ++i) {-		if (cpio->ino_list[i].old == ino)-			return (cpio->ino_list[i].new);-	}--	/* Assign a new index number. */-	ino_new = (int)(++cpio->ino_next);--	/* Ensure space for the new mapping. */-	if (cpio->ino_list_size <= cpio->ino_list_next) {-		size_t newsize = cpio->ino_list_size < 512-		    ? 512 : cpio->ino_list_size * 2;-		void *newlist = realloc(cpio->ino_list,-		    sizeof(cpio->ino_list[0]) * newsize);-		if (newlist == NULL)-			return (-1);--		cpio->ino_list_size = newsize;-		cpio->ino_list = newlist;-	}--	/* Record and return the new value. */-	cpio->ino_list[cpio->ino_list_next].old = ino;-	cpio->ino_list[cpio->ino_list_next].new = ino_new;-	++cpio->ino_list_next;-	return (ino_new);-}---static struct archive_string_conv *-get_sconv(struct archive_write *a)-{-	struct cpio *cpio;-	struct archive_string_conv *sconv;--	cpio = (struct cpio *)a->format_data;-	sconv = cpio->opt_sconv;-	if (sconv == NULL) {-		if (!cpio->init_default_conversion) {-			cpio->sconv_default =-			    archive_string_default_conversion_for_write(-			      &(a->archive));-			cpio->init_default_conversion = 1;-		}-		sconv = cpio->sconv_default;-	}-	return (sconv);-}--static int-archive_write_cpio_header(struct archive_write *a, struct archive_entry *entry)-{-	const char *path;-	size_t len;--	if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {-		archive_set_error(&a->archive, -1, "Filetype required");-		return (ARCHIVE_FAILED);-	}--	if (archive_entry_pathname_l(entry, &path, &len, get_sconv(a)) != 0-	    && errno == ENOMEM) {-		archive_set_error(&a->archive, ENOMEM,-		    "Can't allocate memory for Pathname");-		return (ARCHIVE_FATAL);-	}-	if (len == 0 || path == NULL || path[0] == '\0') {-		archive_set_error(&a->archive, -1, "Pathname required");-		return (ARCHIVE_FAILED);-	}--	if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) < 0) {-		archive_set_error(&a->archive, -1, "Size required");-		return (ARCHIVE_FAILED);-	}-	return write_header(a, entry);-}--static int-write_header(struct archive_write *a, struct archive_entry *entry)-{-	struct cpio *cpio;-	const char *p, *path;-	int pathlength, ret, ret_final;-	int64_t	ino;-	char h[76];-	struct archive_string_conv *sconv;-	struct archive_entry *entry_main;-	size_t len;--	cpio = (struct cpio *)a->format_data;-	ret_final = ARCHIVE_OK;-	sconv = get_sconv(a);--#if defined(_WIN32) && !defined(__CYGWIN__)-	/* Make sure the path separators in pathname, hardlink and symlink-	 * are all slash '/', not the Windows path separator '\'. */-	entry_main = __la_win_entry_in_posix_pathseparator(entry);-	if (entry_main == NULL) {-		archive_set_error(&a->archive, ENOMEM,-		    "Can't allocate ustar data");-		return(ARCHIVE_FATAL);-	}-	if (entry != entry_main)-		entry = entry_main;-	else-		entry_main = NULL;-#else-	entry_main = NULL;-#endif--	ret = archive_entry_pathname_l(entry, &path, &len, sconv);-	if (ret != 0) {-		if (errno == ENOMEM) {-			archive_set_error(&a->archive, ENOMEM,-			    "Can't allocate memory for Pathname");-			ret_final = ARCHIVE_FATAL;-			goto exit_write_header;-		}-		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,-		    "Can't translate pathname '%s' to %s",-		    archive_entry_pathname(entry),-		    archive_string_conversion_charset_name(sconv));-		ret_final = ARCHIVE_WARN;-	}-	/* Include trailing null. */-	pathlength = (int)len + 1;--	memset(h, 0, sizeof(h));-	format_octal(070707, h + c_magic_offset, c_magic_size);-	format_octal(archive_entry_dev(entry), h + c_dev_offset, c_dev_size);--	ino = synthesize_ino_value(cpio, entry);-	if (ino < 0) {-		archive_set_error(&a->archive, ENOMEM,-		    "No memory for ino translation table");-		ret_final = ARCHIVE_FATAL;-		goto exit_write_header;-	} else if (ino > 0777777) {-		archive_set_error(&a->archive, ERANGE,-		    "Too many files for this cpio format");-		ret_final = ARCHIVE_FATAL;-		goto exit_write_header;-	}-	format_octal(ino & 0777777, h + c_ino_offset, c_ino_size);--	/* TODO: Set ret_final to ARCHIVE_WARN if any of these overflow. */-	format_octal(archive_entry_mode(entry), h + c_mode_offset, c_mode_size);-	format_octal(archive_entry_uid(entry), h + c_uid_offset, c_uid_size);-	format_octal(archive_entry_gid(entry), h + c_gid_offset, c_gid_size);-	format_octal(archive_entry_nlink(entry), h + c_nlink_offset, c_nlink_size);-	if (archive_entry_filetype(entry) == AE_IFBLK-	    || archive_entry_filetype(entry) == AE_IFCHR)-	    format_octal(archive_entry_rdev(entry), h + c_rdev_offset, c_rdev_size);-	else-	    format_octal(0, h + c_rdev_offset, c_rdev_size);-	format_octal(archive_entry_mtime(entry), h + c_mtime_offset, c_mtime_size);-	format_octal(pathlength, h + c_namesize_offset, c_namesize_size);--	/* Non-regular files don't store bodies. */-	if (archive_entry_filetype(entry) != AE_IFREG)-		archive_entry_set_size(entry, 0);--	/* Symlinks get the link written as the body of the entry. */-	ret = archive_entry_symlink_l(entry, &p, &len, sconv);-	if (ret != 0) {-		if (errno == ENOMEM) {-			archive_set_error(&a->archive, ENOMEM,-			    "Can't allocate memory for Linkname");-			ret_final = ARCHIVE_FATAL;-			goto exit_write_header;-		}-		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,-		    "Can't translate linkname '%s' to %s",-		    archive_entry_symlink(entry),-		    archive_string_conversion_charset_name(sconv));-		ret_final = ARCHIVE_WARN;-	}-	if (len > 0 && p != NULL  &&  *p != '\0')-		ret = format_octal(strlen(p), h + c_filesize_offset,-		    c_filesize_size);-	else-		ret = format_octal(archive_entry_size(entry),-		    h + c_filesize_offset, c_filesize_size);-	if (ret) {-		archive_set_error(&a->archive, ERANGE,-		    "File is too large for cpio format.");-		ret_final = ARCHIVE_FAILED;-		goto exit_write_header;-	}--	ret = __archive_write_output(a, h, sizeof(h));-	if (ret != ARCHIVE_OK) {-		ret_final = ARCHIVE_FATAL;-		goto exit_write_header;-	}--	ret = __archive_write_output(a, path, pathlength);-	if (ret != ARCHIVE_OK) {-		ret_final = ARCHIVE_FATAL;-		goto exit_write_header;-	}--	cpio->entry_bytes_remaining = archive_entry_size(entry);--	/* Write the symlink now. */-	if (p != NULL  &&  *p != '\0') {-		ret = __archive_write_output(a, p, strlen(p));-		if (ret != ARCHIVE_OK) {-			ret_final = ARCHIVE_FATAL;-			goto exit_write_header;-		}-	}-exit_write_header:-	archive_entry_free(entry_main);-	return (ret_final);-}--static ssize_t-archive_write_cpio_data(struct archive_write *a, const void *buff, size_t s)-{-	struct cpio *cpio;-	int ret;--	cpio = (struct cpio *)a->format_data;-	if (s > cpio->entry_bytes_remaining)-		s = (size_t)cpio->entry_bytes_remaining;--	ret = __archive_write_output(a, buff, s);-	cpio->entry_bytes_remaining -= s;-	if (ret >= 0)-		return (s);-	else-		return (ret);-}--/*- * Format a number into the specified field.- */-static int-format_octal(int64_t v, void *p, int digits)-{-	int64_t	max;-	int	ret;--	max = (((int64_t)1) << (digits * 3)) - 1;-	if (v >= 0  &&  v <= max) {-	    format_octal_recursive(v, (char *)p, digits);-	    ret = 0;-	} else {-	    format_octal_recursive(max, (char *)p, digits);-	    ret = -1;-	}-	return (ret);-}--static int64_t-format_octal_recursive(int64_t v, char *p, int s)-{-	if (s == 0)-		return (v);-	v = format_octal_recursive(v, p+1, s-1);-	*p = '0' + ((char)v & 7);-	return (v >> 3);-}--static int-archive_write_cpio_close(struct archive_write *a)-{-	int er;-	struct archive_entry *trailer;--	trailer = archive_entry_new2(NULL);-	/* nlink = 1 here for GNU cpio compat. */-	archive_entry_set_nlink(trailer, 1);-	archive_entry_set_size(trailer, 0);-	archive_entry_set_pathname(trailer, "TRAILER!!!");-	er = write_header(a, trailer);-	archive_entry_free(trailer);-	return (er);-}--static int-archive_write_cpio_free(struct archive_write *a)-{-	struct cpio *cpio;--	cpio = (struct cpio *)a->format_data;-	free(cpio->ino_list);-	free(cpio);-	a->format_data = NULL;-	return (ARCHIVE_OK);-}--static int-archive_write_cpio_finish_entry(struct archive_write *a)-{-	struct cpio *cpio;--	cpio = (struct cpio *)a->format_data;-	return (__archive_write_nulls(a,-		(size_t)cpio->entry_bytes_remaining));+	return archive_write_set_format_cpio_odc(_a); }

@@ -0,0 +1,610 @@+/*-+ * Copyright (c) 2003-2007 Tim Kientzle+ * Copyright (c) 2011-2012 Michihiro NAKAJIMA+ * All rights reserved.+ *+ * Redistribution and use in source and binary forms, with or without+ * modification, are permitted provided that the following conditions+ * are met:+ * 1. Redistributions of source code must retain the above copyright+ *    notice, this list of conditions and the following disclaimer.+ * 2. Redistributions in binary form must reproduce the above copyright+ *    notice, this list of conditions and the following disclaimer in the+ *    documentation and/or other materials provided with the distribution.+ *+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+ */++#include "archive_platform.h"+__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2009-12-29 06:34:23Z kientzle $");++#ifdef HAVE_ERRNO_H+#include <errno.h>+#endif+#include <stdio.h>+#ifdef HAVE_STDLIB_H+#include <stdlib.h>+#endif+#ifdef HAVE_STRING_H+#include <string.h>+#endif++#include "archive.h"+#include "archive_entry.h"+#include "archive_entry_locale.h"+#include "archive_private.h"+#include "archive_write_private.h"+#include "archive_write_set_format_private.h"++static ssize_t	archive_write_binary_data(struct archive_write *,+		    const void *buff, size_t s);+static int	archive_write_binary_close(struct archive_write *);+static int	archive_write_binary_free(struct archive_write *);+static int	archive_write_binary_finish_entry(struct archive_write *);+static int	archive_write_binary_header(struct archive_write *,+		    struct archive_entry *);+static int	archive_write_binary_options(struct archive_write *,+		    const char *, const char *);+static int	write_header(struct archive_write *, struct archive_entry *);++struct cpio {+	uint64_t	  entry_bytes_remaining;++	int64_t		  ino_next;++	struct		 { int64_t old; int new;} *ino_list;+	size_t		  ino_list_size;+	size_t		  ino_list_next;++	struct archive_string_conv *opt_sconv;+	struct archive_string_conv *sconv_default;+	int		  init_default_conversion;+};++/* This struct needs to be packed to get the header right */++#if defined(__GNUC__)+#define PACKED(x) x __attribute__((packed))+#elif defined(_MSC_VER)+#define PACKED(x) __pragma(pack(push, 1)) x __pragma(pack(pop))+#else+#define PACKED(x) x+#endif++#define HSIZE 26++PACKED(struct cpio_binary_header {+	uint16_t	h_magic;+	uint16_t	h_dev;+	uint16_t	h_ino;+	uint16_t	h_mode;+	uint16_t	h_uid;+	uint16_t	h_gid;+	uint16_t	h_nlink;+	uint16_t	h_majmin;+	uint32_t	h_mtime;+	uint16_t	h_namesize;+	uint32_t	h_filesize;+});++/* Back in the day, the 7th Edition cpio.c had this, to+ * adapt to, as the comment said, "VAX, Interdata, ...":+ *+ * union { long l; short s[2]; char c[4]; } U;+ * #define MKSHORT(v,lv) {U.l=1L;if(U.c[0]) U.l=lv,v[0]=U.s[1],v[1]=U.s[0]; else U.l=lv,v[0]=U.s[0],v[1]=U.s[1];}+ * long mklong(v)+ * short v[];+ * {+ *         U.l = 1;+ *         if(U.c[0])+ *                 U.s[0] = v[1], U.s[1] = v[0];+ *         else+ *                 U.s[0] = v[0], U.s[1] = v[1];+ *         return U.l;+ * }+ *+ * Of course, that assumes that all machines have little-endian shorts,+ * and just adapts the others to the special endianness of the PDP-11.+ *+ * Now, we could do this:+ *+ * union { uint32_t l; uint16_t s[2]; uint8_t c[4]; } U;+ * #define PUTI16(v,sv) {U.s[0]=1;if(U.c[0]) v=sv; else U.s[0]=sv,U.c[2]=U.c[1],U.c[3]=U.c[0],v=U.s[1];}+ * #define PUTI32(v,lv) {char_t Ut;U.l=1;if(U.c[0]) U.l=lv,v[0]=U.s[1],v[1]=U.s[0]; else U.l=lv,Ut=U.c[0],U.c[0]=U.c[1],U.c[1]=Ut,Ut=U.c[2],U.c[2]=U.c[3],U.c[3]=Ut,v[0]=U.s[0],v[1]=U.s[1];}+ *+ * ...but it feels a little better to do it like this:+ */++static uint16_t swap16(uint16_t in) {+	union {+		uint16_t s[2];+		uint8_t c[4];+	} U;+	U.s[0] = 1;+	if (U.c[0])+		return in;+	else {+		U.s[0] = in;+		U.c[2] = U.c[1];+		U.c[3] = U.c[0];+		return U.s[1];+	}+	/* NOTREACHED */+}++static uint32_t swap32(uint32_t in) {+	union {+		uint32_t l;+		uint16_t s[2];+		uint8_t c[4];+	} U;+	U.l = 1;+	if (U.c[0]) {		/* Little-endian */+		uint16_t t;+		U.l = in;+		t = U.s[0];+		U.s[0] = U.s[1];+		U.s[1] = t;+	} else if (U.c[3]) {	/* Big-endian */+		U.l = in;+		U.s[0] = swap16(U.s[0]);+		U.s[1] = swap16(U.s[1]);+	} else {		/* PDP-endian */+		U.l = in;+	}+	return U.l;+}++/*+ * Set output format to the selected binary variant+ */+static int+archive_write_set_format_cpio_binary(struct archive *_a, int format)+{+	struct archive_write *a = (struct archive_write *)_a;+	struct cpio *cpio;++	if (sizeof(struct cpio_binary_header) != HSIZE) {+		archive_set_error(&a->archive, EINVAL,+				  "Binary cpio format not supported on this platform");+		return (ARCHIVE_FATAL);+	}++	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,+	    ARCHIVE_STATE_NEW, "archive_write_set_format_cpio_binary");++	/* If someone else was already registered, unregister them. */+	if (a->format_free != NULL)+		(a->format_free)(a);++	cpio = (struct cpio *)calloc(1, sizeof(*cpio));+	if (cpio == NULL) {+		archive_set_error(&a->archive, ENOMEM, "Can't allocate cpio data");+		return (ARCHIVE_FATAL);+	}+	a->format_data = cpio;+	a->format_name = "cpio";+	a->format_options = archive_write_binary_options;+	a->format_write_header = archive_write_binary_header;+	a->format_write_data = archive_write_binary_data;+	a->format_finish_entry = archive_write_binary_finish_entry;+	a->format_close = archive_write_binary_close;+	a->format_free = archive_write_binary_free;+	a->archive.archive_format = format;+	switch (format) {+	case ARCHIVE_FORMAT_CPIO_PWB:+		a->archive.archive_format_name = "PWB cpio";+		break;+	case ARCHIVE_FORMAT_CPIO_BIN_LE:+		a->archive.archive_format_name = "7th Edition cpio";+		break;+	default:+		archive_set_error(&a->archive, EINVAL, "binary format must be 'pwb' or 'bin'");+		return (ARCHIVE_FATAL);+	}+	return (ARCHIVE_OK);+}++/*+ * Set output format to PWB (6th Edition) binary format+ */+int+archive_write_set_format_cpio_pwb(struct archive *_a)+{+	return archive_write_set_format_cpio_binary(_a, ARCHIVE_FORMAT_CPIO_PWB);+}++/*+ * Set output format to 7th Edition binary format+ */+int+archive_write_set_format_cpio_bin(struct archive *_a)+{+	return archive_write_set_format_cpio_binary(_a, ARCHIVE_FORMAT_CPIO_BIN_LE);+}++static int+archive_write_binary_options(struct archive_write *a, const char *key,+    const char *val)+{+	struct cpio *cpio = (struct cpio *)a->format_data;+	int ret = ARCHIVE_FAILED;++	if (strcmp(key, "hdrcharset")  == 0) {+		if (val == NULL || val[0] == 0)+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,+			    "%s: hdrcharset option needs a character-set name",+			    a->format_name);+		else {+			cpio->opt_sconv = archive_string_conversion_to_charset(+			    &a->archive, val, 0);+			if (cpio->opt_sconv != NULL)+				ret = ARCHIVE_OK;+			else+				ret = ARCHIVE_FATAL;+		}+		return (ret);+	}++	/* Note: The "warn" return is just to inform the options+	 * supervisor that we didn't handle it.  It will generate+	 * a suitable error if no one used this option. */+	return (ARCHIVE_WARN);+}++/*+ * Ino values are as long as 64 bits on some systems; cpio format+ * only allows 16 bits and relies on the ino values to identify hardlinked+ * files.  So, we can't merely "hash" the ino numbers since collisions+ * would corrupt the archive.  Instead, we generate synthetic ino values+ * to store in the archive and maintain a map of original ino values to+ * synthetic ones so we can preserve hardlink information.+ *+ * TODO: Make this more efficient.  It's not as bad as it looks (most+ * files don't have any hardlinks and we don't do any work here for those),+ * but it wouldn't be hard to do better.+ *+ * TODO: Work with dev/ino pairs here instead of just ino values.+ */+static int+synthesize_ino_value(struct cpio *cpio, struct archive_entry *entry)+{+	int64_t ino = archive_entry_ino64(entry);+	int ino_new;+	size_t i;++	/*+	 * If no index number was given, don't assign one.  In+	 * particular, this handles the end-of-archive marker+	 * correctly by giving it a zero index value.  (This is also+	 * why we start our synthetic index numbers with one below.)+	 */+	if (ino == 0)+		return (0);++	/* Don't store a mapping if we don't need to. */+	if (archive_entry_nlink(entry) < 2) {+		return (int)(++cpio->ino_next);+	}++	/* Look up old ino; if we have it, this is a hardlink+	 * and we reuse the same value. */+	for (i = 0; i < cpio->ino_list_next; ++i) {+		if (cpio->ino_list[i].old == ino)+			return (cpio->ino_list[i].new);+	}++	/* Assign a new index number. */+	ino_new = (int)(++cpio->ino_next);++	/* Ensure space for the new mapping. */+	if (cpio->ino_list_size <= cpio->ino_list_next) {+		size_t newsize = cpio->ino_list_size < 512+		    ? 512 : cpio->ino_list_size * 2;+		void *newlist = realloc(cpio->ino_list,+		    sizeof(cpio->ino_list[0]) * newsize);+		if (newlist == NULL)+			return (-1);++		cpio->ino_list_size = newsize;+		cpio->ino_list = newlist;+	}++	/* Record and return the new value. */+	cpio->ino_list[cpio->ino_list_next].old = ino;+	cpio->ino_list[cpio->ino_list_next].new = ino_new;+	++cpio->ino_list_next;+	return (ino_new);+}+++static struct archive_string_conv *+get_sconv(struct archive_write *a)+{+	struct cpio *cpio;+	struct archive_string_conv *sconv;++	cpio = (struct cpio *)a->format_data;+	sconv = cpio->opt_sconv;+	if (sconv == NULL) {+		if (!cpio->init_default_conversion) {+			cpio->sconv_default =+			    archive_string_default_conversion_for_write(+			      &(a->archive));+			cpio->init_default_conversion = 1;+		}+		sconv = cpio->sconv_default;+	}+	return (sconv);+}++static int+archive_write_binary_header(struct archive_write *a, struct archive_entry *entry)+{+	const char *path;+	size_t len;++	if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {+		archive_set_error(&a->archive, -1, "Filetype required");+		return (ARCHIVE_FAILED);+	}++	if (archive_entry_pathname_l(entry, &path, &len, get_sconv(a)) != 0+	    && errno == ENOMEM) {+		archive_set_error(&a->archive, ENOMEM,+		    "Can't allocate memory for Pathname");+		return (ARCHIVE_FATAL);+	}+	if (len == 0 || path == NULL || path[0] == '\0') {+		archive_set_error(&a->archive, -1, "Pathname required");+		return (ARCHIVE_FAILED);+	}++	if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) < 0) {+		archive_set_error(&a->archive, -1, "Size required");+		return (ARCHIVE_FAILED);+	}+	return write_header(a, entry);+}++static int+write_header(struct archive_write *a, struct archive_entry *entry)+{+	struct cpio *cpio;+	const char *p, *path;+	int pathlength, ret, ret_final;+	int64_t	ino;+	struct cpio_binary_header h;+	struct archive_string_conv *sconv;+	struct archive_entry *entry_main;+	size_t len;++	cpio = (struct cpio *)a->format_data;+	ret_final = ARCHIVE_OK;+	sconv = get_sconv(a);++#if defined(_WIN32) && !defined(__CYGWIN__)+	/* Make sure the path separators in pathname, hardlink and symlink+	 * are all slash '/', not the Windows path separator '\'. */+	entry_main = __la_win_entry_in_posix_pathseparator(entry);+	if (entry_main == NULL) {+		archive_set_error(&a->archive, ENOMEM,+		    "Can't allocate ustar data");+		return(ARCHIVE_FATAL);+	}+	if (entry != entry_main)+		entry = entry_main;+	else+		entry_main = NULL;+#else+	entry_main = NULL;+#endif++	ret = archive_entry_pathname_l(entry, &path, &len, sconv);+	if (ret != 0) {+		if (errno == ENOMEM) {+			archive_set_error(&a->archive, ENOMEM,+			    "Can't allocate memory for Pathname");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,+		    "Can't translate pathname '%s' to %s",+		    archive_entry_pathname(entry),+		    archive_string_conversion_charset_name(sconv));+		ret_final = ARCHIVE_WARN;+	}+	/* Include trailing null */+	pathlength = (int)len + 1;++	h.h_magic = swap16(070707);+	h.h_dev = swap16(archive_entry_dev(entry));++	ino = synthesize_ino_value(cpio, entry);+	if (ino < 0) {+		archive_set_error(&a->archive, ENOMEM,+		    "No memory for ino translation table");+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	} else if (ino > 077777) {+		archive_set_error(&a->archive, ERANGE,+		    "Too many files for this cpio format");+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}+	h.h_ino = swap16(ino);++	h.h_mode = archive_entry_mode(entry);+	if (((h.h_mode & AE_IFMT) == AE_IFSOCK) || ((h.h_mode & AE_IFMT) == AE_IFIFO)) {+		archive_set_error(&a->archive, EINVAL,+				  "sockets and fifos cannot be represented in the binary cpio formats");+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}+	if (a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) {+		if ((h.h_mode & AE_IFMT) == AE_IFLNK) {+			archive_set_error(&a->archive, EINVAL,+					  "symbolic links cannot be represented in the PWB cpio format");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		/* we could turn off AE_IFREG here, but it does no harm, */+		/* and allows v7 cpio to read the entry without confusion */+	}+	h.h_mode = swap16(h.h_mode);++	h.h_uid = swap16(archive_entry_uid(entry));+	h.h_gid = swap16(archive_entry_gid(entry));+	h.h_nlink = swap16(archive_entry_nlink(entry));++	if (archive_entry_filetype(entry) == AE_IFBLK+	    || archive_entry_filetype(entry) == AE_IFCHR)+		h.h_majmin = swap16(archive_entry_rdev(entry));+	else+		h.h_majmin = 0;++	h.h_mtime = swap32(archive_entry_mtime(entry));+	h.h_namesize = swap16(pathlength);++	/* Non-regular files don't store bodies. */+	if (archive_entry_filetype(entry) != AE_IFREG)+		archive_entry_set_size(entry, 0);++	/* Symlinks get the link written as the body of the entry. */+	ret = archive_entry_symlink_l(entry, &p, &len, sconv);+	if (ret != 0) {+		if (errno == ENOMEM) {+			archive_set_error(&a->archive, ENOMEM,+			    "Can't allocate memory for Linkname");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,+		    "Can't translate linkname '%s' to %s",+		    archive_entry_symlink(entry),+		    archive_string_conversion_charset_name(sconv));+		ret_final = ARCHIVE_WARN;+	}++	if (len > 0 && p != NULL  &&  *p != '\0') {+		if (a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) {+			archive_set_error(&a->archive, EINVAL,+					  "symlinks are not supported by UNIX V6 or by PWB cpio");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		h.h_filesize = swap32(strlen(p)); /* symlink */+	} else {+		if ((a->archive.archive_format == ARCHIVE_FORMAT_CPIO_PWB) &&+		    (archive_entry_size(entry) > 256*256*256-1)) {+			archive_set_error(&a->archive, ERANGE,+					  "File is too large for PWB binary cpio format.");+			ret_final = ARCHIVE_FAILED;+			goto exit_write_header;+		} else if (archive_entry_size(entry) > INT32_MAX) {+			archive_set_error(&a->archive, ERANGE,+					  "File is too large for binary cpio format.");+			ret_final = ARCHIVE_FAILED;+			goto exit_write_header;+		}+		h.h_filesize = swap32(archive_entry_size(entry)); /* file */+	}++	ret = __archive_write_output(a, &h, HSIZE);+	if (ret != ARCHIVE_OK) {+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}++	ret = __archive_write_output(a, path, pathlength);+	if ((ret == ARCHIVE_OK) && ((pathlength % 2) != 0))+		ret = __archive_write_nulls(a, 1);+	if (ret != ARCHIVE_OK) {+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}++	cpio->entry_bytes_remaining = archive_entry_size(entry);+	if ((cpio->entry_bytes_remaining % 2) != 0)+		cpio->entry_bytes_remaining++;++	/* Write the symlink now. */+	if (p != NULL  &&  *p != '\0') {+		ret = __archive_write_output(a, p, strlen(p));+		if ((ret == ARCHIVE_OK) && ((strlen(p) % 2) != 0))+			ret = __archive_write_nulls(a, 1);+		if (ret != ARCHIVE_OK) {+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+	}++exit_write_header:+	archive_entry_free(entry_main);+	return (ret_final);+}++static ssize_t+archive_write_binary_data(struct archive_write *a, const void *buff, size_t s)+{+	struct cpio *cpio;+	int ret;++	cpio = (struct cpio *)a->format_data;+	if (s > cpio->entry_bytes_remaining)+		s = (size_t)cpio->entry_bytes_remaining;++	ret = __archive_write_output(a, buff, s);+	cpio->entry_bytes_remaining -= s;+	if (ret >= 0)+		return (s);+	else+		return (ret);+}++static int+archive_write_binary_close(struct archive_write *a)+{+	int er;+	struct archive_entry *trailer;++	trailer = archive_entry_new2(NULL);+	/* nlink = 1 here for GNU cpio compat. */+	archive_entry_set_nlink(trailer, 1);+	archive_entry_set_size(trailer, 0);+	archive_entry_set_pathname(trailer, "TRAILER!!!");+	er = write_header(a, trailer);+	archive_entry_free(trailer);+	return (er);+}++static int+archive_write_binary_free(struct archive_write *a)+{+	struct cpio *cpio;++	cpio = (struct cpio *)a->format_data;+	free(cpio->ino_list);+	free(cpio);+	a->format_data = NULL;+	return (ARCHIVE_OK);+}++static int+archive_write_binary_finish_entry(struct archive_write *a)+{+	struct cpio *cpio;++	cpio = (struct cpio *)a->format_data;+	return (__archive_write_nulls(a,+		(size_t)cpio->entry_bytes_remaining));+}

@@ -0,0 +1,500 @@+/*-+ * Copyright (c) 2003-2007 Tim Kientzle+ * Copyright (c) 2011-2012 Michihiro NAKAJIMA+ * All rights reserved.+ *+ * Redistribution and use in source and binary forms, with or without+ * modification, are permitted provided that the following conditions+ * are met:+ * 1. Redistributions of source code must retain the above copyright+ *    notice, this list of conditions and the following disclaimer.+ * 2. Redistributions in binary form must reproduce the above copyright+ *    notice, this list of conditions and the following disclaimer in the+ *    documentation and/or other materials provided with the distribution.+ *+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.+ */++#include "archive_platform.h"+__FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_format_cpio.c 201170 2009-12-29 06:34:23Z kientzle $");++#ifdef HAVE_ERRNO_H+#include <errno.h>+#endif+#include <stdio.h>+#ifdef HAVE_STDLIB_H+#include <stdlib.h>+#endif+#ifdef HAVE_STRING_H+#include <string.h>+#endif++#include "archive.h"+#include "archive_entry.h"+#include "archive_entry_locale.h"+#include "archive_private.h"+#include "archive_write_private.h"+#include "archive_write_set_format_private.h"++static ssize_t	archive_write_odc_data(struct archive_write *,+		    const void *buff, size_t s);+static int	archive_write_odc_close(struct archive_write *);+static int	archive_write_odc_free(struct archive_write *);+static int	archive_write_odc_finish_entry(struct archive_write *);+static int	archive_write_odc_header(struct archive_write *,+		    struct archive_entry *);+static int	archive_write_odc_options(struct archive_write *,+		    const char *, const char *);+static int	format_octal(int64_t, void *, int);+static int64_t	format_octal_recursive(int64_t, char *, int);+static int	write_header(struct archive_write *, struct archive_entry *);++struct cpio {+	uint64_t	  entry_bytes_remaining;++	int64_t		  ino_next;++	struct		 { int64_t old; int new;} *ino_list;+	size_t		  ino_list_size;+	size_t		  ino_list_next;++	struct archive_string_conv *opt_sconv;+	struct archive_string_conv *sconv_default;+	int		  init_default_conversion;+};++#define	c_magic_offset 0+#define	c_magic_size 6+#define	c_dev_offset 6+#define	c_dev_size 6+#define	c_ino_offset 12+#define	c_ino_size 6+#define	c_mode_offset 18+#define	c_mode_size 6+#define	c_uid_offset 24+#define	c_uid_size 6+#define	c_gid_offset 30+#define	c_gid_size 6+#define	c_nlink_offset 36+#define	c_nlink_size 6+#define	c_rdev_offset 42+#define	c_rdev_size 6+#define	c_mtime_offset 48+#define	c_mtime_size 11+#define	c_namesize_offset 59+#define	c_namesize_size 6+#define	c_filesize_offset 65+#define	c_filesize_size 11++/*+ * Set output format to 'cpio' format.+ */+int+archive_write_set_format_cpio_odc(struct archive *_a)+{+	struct archive_write *a = (struct archive_write *)_a;+	struct cpio *cpio;++	archive_check_magic(_a, ARCHIVE_WRITE_MAGIC,+	    ARCHIVE_STATE_NEW, "archive_write_set_format_cpio_odc");++	/* If someone else was already registered, unregister them. */+	if (a->format_free != NULL)+		(a->format_free)(a);++	cpio = (struct cpio *)calloc(1, sizeof(*cpio));+	if (cpio == NULL) {+		archive_set_error(&a->archive, ENOMEM, "Can't allocate cpio data");+		return (ARCHIVE_FATAL);+	}+	a->format_data = cpio;+	a->format_name = "cpio";+	a->format_options = archive_write_odc_options;+	a->format_write_header = archive_write_odc_header;+	a->format_write_data = archive_write_odc_data;+	a->format_finish_entry = archive_write_odc_finish_entry;+	a->format_close = archive_write_odc_close;+	a->format_free = archive_write_odc_free;+	a->archive.archive_format = ARCHIVE_FORMAT_CPIO_POSIX;+	a->archive.archive_format_name = "POSIX cpio";+	return (ARCHIVE_OK);+}++static int+archive_write_odc_options(struct archive_write *a, const char *key,+    const char *val)+{+	struct cpio *cpio = (struct cpio *)a->format_data;+	int ret = ARCHIVE_FAILED;++	if (strcmp(key, "hdrcharset")  == 0) {+		if (val == NULL || val[0] == 0)+			archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,+			    "%s: hdrcharset option needs a character-set name",+			    a->format_name);+		else {+			cpio->opt_sconv = archive_string_conversion_to_charset(+			    &a->archive, val, 0);+			if (cpio->opt_sconv != NULL)+				ret = ARCHIVE_OK;+			else+				ret = ARCHIVE_FATAL;+		}+		return (ret);+	}++	/* Note: The "warn" return is just to inform the options+	 * supervisor that we didn't handle it.  It will generate+	 * a suitable error if no one used this option. */+	return (ARCHIVE_WARN);+}++/*+ * Ino values are as long as 64 bits on some systems; cpio format+ * only allows 18 bits and relies on the ino values to identify hardlinked+ * files.  So, we can't merely "hash" the ino numbers since collisions+ * would corrupt the archive.  Instead, we generate synthetic ino values+ * to store in the archive and maintain a map of original ino values to+ * synthetic ones so we can preserve hardlink information.+ *+ * TODO: Make this more efficient.  It's not as bad as it looks (most+ * files don't have any hardlinks and we don't do any work here for those),+ * but it wouldn't be hard to do better.+ *+ * TODO: Work with dev/ino pairs here instead of just ino values.+ */+static int+synthesize_ino_value(struct cpio *cpio, struct archive_entry *entry)+{+	int64_t ino = archive_entry_ino64(entry);+	int ino_new;+	size_t i;++	/*+	 * If no index number was given, don't assign one.  In+	 * particular, this handles the end-of-archive marker+	 * correctly by giving it a zero index value.  (This is also+	 * why we start our synthetic index numbers with one below.)+	 */+	if (ino == 0)+		return (0);++	/* Don't store a mapping if we don't need to. */+	if (archive_entry_nlink(entry) < 2) {+		return (int)(++cpio->ino_next);+	}++	/* Look up old ino; if we have it, this is a hardlink+	 * and we reuse the same value. */+	for (i = 0; i < cpio->ino_list_next; ++i) {+		if (cpio->ino_list[i].old == ino)+			return (cpio->ino_list[i].new);+	}++	/* Assign a new index number. */+	ino_new = (int)(++cpio->ino_next);++	/* Ensure space for the new mapping. */+	if (cpio->ino_list_size <= cpio->ino_list_next) {+		size_t newsize = cpio->ino_list_size < 512+		    ? 512 : cpio->ino_list_size * 2;+		void *newlist = realloc(cpio->ino_list,+		    sizeof(cpio->ino_list[0]) * newsize);+		if (newlist == NULL)+			return (-1);++		cpio->ino_list_size = newsize;+		cpio->ino_list = newlist;+	}++	/* Record and return the new value. */+	cpio->ino_list[cpio->ino_list_next].old = ino;+	cpio->ino_list[cpio->ino_list_next].new = ino_new;+	++cpio->ino_list_next;+	return (ino_new);+}+++static struct archive_string_conv *+get_sconv(struct archive_write *a)+{+	struct cpio *cpio;+	struct archive_string_conv *sconv;++	cpio = (struct cpio *)a->format_data;+	sconv = cpio->opt_sconv;+	if (sconv == NULL) {+		if (!cpio->init_default_conversion) {+			cpio->sconv_default =+			    archive_string_default_conversion_for_write(+			      &(a->archive));+			cpio->init_default_conversion = 1;+		}+		sconv = cpio->sconv_default;+	}+	return (sconv);+}++static int+archive_write_odc_header(struct archive_write *a, struct archive_entry *entry)+{+	const char *path;+	size_t len;++	if (archive_entry_filetype(entry) == 0 && archive_entry_hardlink(entry) == NULL) {+		archive_set_error(&a->archive, -1, "Filetype required");+		return (ARCHIVE_FAILED);+	}++	if (archive_entry_pathname_l(entry, &path, &len, get_sconv(a)) != 0+	    && errno == ENOMEM) {+		archive_set_error(&a->archive, ENOMEM,+		    "Can't allocate memory for Pathname");+		return (ARCHIVE_FATAL);+	}+	if (len == 0 || path == NULL || path[0] == '\0') {+		archive_set_error(&a->archive, -1, "Pathname required");+		return (ARCHIVE_FAILED);+	}++	if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) < 0) {+		archive_set_error(&a->archive, -1, "Size required");+		return (ARCHIVE_FAILED);+	}+	return write_header(a, entry);+}++static int+write_header(struct archive_write *a, struct archive_entry *entry)+{+	struct cpio *cpio;+	const char *p, *path;+	int pathlength, ret, ret_final;+	int64_t	ino;+	char h[76];+	struct archive_string_conv *sconv;+	struct archive_entry *entry_main;+	size_t len;++	cpio = (struct cpio *)a->format_data;+	ret_final = ARCHIVE_OK;+	sconv = get_sconv(a);++#if defined(_WIN32) && !defined(__CYGWIN__)+	/* Make sure the path separators in pathname, hardlink and symlink+	 * are all slash '/', not the Windows path separator '\'. */+	entry_main = __la_win_entry_in_posix_pathseparator(entry);+	if (entry_main == NULL) {+		archive_set_error(&a->archive, ENOMEM,+		    "Can't allocate ustar data");+		return(ARCHIVE_FATAL);+	}+	if (entry != entry_main)+		entry = entry_main;+	else+		entry_main = NULL;+#else+	entry_main = NULL;+#endif++	ret = archive_entry_pathname_l(entry, &path, &len, sconv);+	if (ret != 0) {+		if (errno == ENOMEM) {+			archive_set_error(&a->archive, ENOMEM,+			    "Can't allocate memory for Pathname");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,+		    "Can't translate pathname '%s' to %s",+		    archive_entry_pathname(entry),+		    archive_string_conversion_charset_name(sconv));+		ret_final = ARCHIVE_WARN;+	}+	/* Include trailing null. */+	pathlength = (int)len + 1;++	memset(h, 0, sizeof(h));+	format_octal(070707, h + c_magic_offset, c_magic_size);+	format_octal(archive_entry_dev(entry), h + c_dev_offset, c_dev_size);++	ino = synthesize_ino_value(cpio, entry);+	if (ino < 0) {+		archive_set_error(&a->archive, ENOMEM,+		    "No memory for ino translation table");+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	} else if (ino > 0777777) {+		archive_set_error(&a->archive, ERANGE,+		    "Too many files for this cpio format");+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}+	format_octal(ino & 0777777, h + c_ino_offset, c_ino_size);++	/* TODO: Set ret_final to ARCHIVE_WARN if any of these overflow. */+	format_octal(archive_entry_mode(entry), h + c_mode_offset, c_mode_size);+	format_octal(archive_entry_uid(entry), h + c_uid_offset, c_uid_size);+	format_octal(archive_entry_gid(entry), h + c_gid_offset, c_gid_size);+	format_octal(archive_entry_nlink(entry), h + c_nlink_offset, c_nlink_size);+	if (archive_entry_filetype(entry) == AE_IFBLK+	    || archive_entry_filetype(entry) == AE_IFCHR)+	    format_octal(archive_entry_rdev(entry), h + c_rdev_offset, c_rdev_size);+	else+	    format_octal(0, h + c_rdev_offset, c_rdev_size);+	format_octal(archive_entry_mtime(entry), h + c_mtime_offset, c_mtime_size);+	format_octal(pathlength, h + c_namesize_offset, c_namesize_size);++	/* Non-regular files don't store bodies. */+	if (archive_entry_filetype(entry) != AE_IFREG)+		archive_entry_set_size(entry, 0);++	/* Symlinks get the link written as the body of the entry. */+	ret = archive_entry_symlink_l(entry, &p, &len, sconv);+	if (ret != 0) {+		if (errno == ENOMEM) {+			archive_set_error(&a->archive, ENOMEM,+			    "Can't allocate memory for Linkname");+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+		archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT,+		    "Can't translate linkname '%s' to %s",+		    archive_entry_symlink(entry),+		    archive_string_conversion_charset_name(sconv));+		ret_final = ARCHIVE_WARN;+	}+	if (len > 0 && p != NULL  &&  *p != '\0')+		ret = format_octal(strlen(p), h + c_filesize_offset,+		    c_filesize_size);+	else+		ret = format_octal(archive_entry_size(entry),+		    h + c_filesize_offset, c_filesize_size);+	if (ret) {+		archive_set_error(&a->archive, ERANGE,+		    "File is too large for cpio format.");+		ret_final = ARCHIVE_FAILED;+		goto exit_write_header;+	}++	ret = __archive_write_output(a, h, sizeof(h));+	if (ret != ARCHIVE_OK) {+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}++	ret = __archive_write_output(a, path, pathlength);+	if (ret != ARCHIVE_OK) {+		ret_final = ARCHIVE_FATAL;+		goto exit_write_header;+	}++	cpio->entry_bytes_remaining = archive_entry_size(entry);++	/* Write the symlink now. */+	if (p != NULL  &&  *p != '\0') {+		ret = __archive_write_output(a, p, strlen(p));+		if (ret != ARCHIVE_OK) {+			ret_final = ARCHIVE_FATAL;+			goto exit_write_header;+		}+	}+exit_write_header:+	archive_entry_free(entry_main);+	return (ret_final);+}++static ssize_t+archive_write_odc_data(struct archive_write *a, const void *buff, size_t s)+{+	struct cpio *cpio;+	int ret;++	cpio = (struct cpio *)a->format_data;+	if (s > cpio->entry_bytes_remaining)+		s = (size_t)cpio->entry_bytes_remaining;++	ret = __archive_write_output(a, buff, s);+	cpio->entry_bytes_remaining -= s;+	if (ret >= 0)+		return (s);+	else+		return (ret);+}++/*+ * Format a number into the specified field.+ */+static int+format_octal(int64_t v, void *p, int digits)+{+	int64_t	max;+	int	ret;++	max = (((int64_t)1) << (digits * 3)) - 1;+	if (v >= 0  &&  v <= max) {+	    format_octal_recursive(v, (char *)p, digits);+	    ret = 0;+	} else {+	    format_octal_recursive(max, (char *)p, digits);+	    ret = -1;+	}+	return (ret);+}++static int64_t+format_octal_recursive(int64_t v, char *p, int s)+{+	if (s == 0)+		return (v);+	v = format_octal_recursive(v, p+1, s-1);+	*p = '0' + ((char)v & 7);+	return (v >> 3);+}++static int+archive_write_odc_close(struct archive_write *a)+{+	int er;+	struct archive_entry *trailer;++	trailer = archive_entry_new2(NULL);+	/* nlink = 1 here for GNU cpio compat. */+	archive_entry_set_nlink(trailer, 1);+	archive_entry_set_size(trailer, 0);+	archive_entry_set_pathname(trailer, "TRAILER!!!");+	er = write_header(a, trailer);+	archive_entry_free(trailer);+	return (er);+}++static int+archive_write_odc_free(struct archive_write *a)+{+	struct cpio *cpio;++	cpio = (struct cpio *)a->format_data;+	free(cpio->ino_list);+	free(cpio);+	a->format_data = NULL;+	return (ARCHIVE_OK);+}++static int+archive_write_odc_finish_entry(struct archive_write *a)+{+	struct cpio *cpio;++	cpio = (struct cpio *)a->format_data;+	return (__archive_write_nulls(a,+		(size_t)cpio->entry_bytes_remaining));+}

@@ -170,13 +170,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.1"+#define BSDCAT_VERSION_STRING "3.5.2"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.1"+#define BSDCPIO_VERSION_STRING "3.5.2"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.1"+#define BSDTAR_VERSION_STRING "3.5.2"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -692,6 +692,9 @@ /* Define to 1 if you have the `link' function. */ #define HAVE_LINK 1 +/* Define to 1 if you have the `linkat' function. */+#define HAVE_LINKAT 1+ /* Define to 1 if you have the <linux/fiemap.h> header file. */ /* #undef HAVE_LINUX_FIEMAP_H */ @@ -997,6 +1000,12 @@ /* Define to 1 if the system has the type `struct richacl'. */ /* #undef HAVE_STRUCT_RICHACL */ +/* Define to 1 if the system has the type `struct statfs'. */+#define HAVE_STRUCT_STATFS 1++/* Define to 1 if `f_iosize' is a member of `struct statfs'. */+#define HAVE_STRUCT_STATFS_F_IOSIZE 1+ /* Define to 1 if `f_namemax' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */ @@ -1239,10 +1248,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005001"+#define LIBARCHIVE_VERSION_NUMBER "3005002"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.1"+#define LIBARCHIVE_VERSION_STRING "3.5.2"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1272,7 +1281,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.1"+#define PACKAGE_STRING "libarchive 3.5.2"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1281,7 +1290,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.1"+#define PACKAGE_VERSION "3.5.2"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1321,7 +1330,7 @@   /* Version number of package */-#define VERSION "3.5.1"+#define VERSION "3.5.2"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */@@ -1432,3 +1441,5 @@  /* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef uintptr_t */+#define HAVE_LIBZ 1+#define HAVE_ZLIB_H 1

@@ -165,13 +165,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.1"+#define BSDCAT_VERSION_STRING "3.5.2"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.1"+#define BSDCPIO_VERSION_STRING "3.5.2"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.1"+#define BSDTAR_VERSION_STRING "3.5.2"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -675,7 +675,7 @@ /* #undef HAVE_LIBXML_XMLWRITER_H */  /* Define to 1 if you have the `z' library (-lz). */-/* #undef HAVE_LIBZ */+#define HAVE_LIBZ 1  /* Define to 1 if you have the `zstd' library (-lzstd). */ /* #undef HAVE_LIBZSTD */@@ -686,6 +686,9 @@ /* Define to 1 if you have the `link' function. */ #define HAVE_LINK 1 +/* Define to 1 if you have the `linkat' function. */+#define HAVE_LINKAT 1+ /* Define to 1 if you have the <linux/fiemap.h> header file. */ /* #undef HAVE_LINUX_FIEMAP_H */ @@ -986,6 +989,12 @@ /* Define to 1 if the system has the type `struct richacl'. */ /* #undef HAVE_STRUCT_RICHACL */ +/* Define to 1 if the system has the type `struct statfs'. */+#define HAVE_STRUCT_STATFS 1++/* Define to 1 if `f_iosize' is a member of `struct statfs'. */+#define HAVE_STRUCT_STATFS_F_IOSIZE 1+ /* Define to 1 if `f_namemax' is a member of `struct statfs'. */ #define HAVE_STRUCT_STATFS_F_NAMEMAX 1 @@ -1201,7 +1210,7 @@ /* #undef HAVE_WORKING_FS_IOC_GETFLAGS */  /* Define to 1 if you have the <zlib.h> header file. */-/* #undef HAVE_ZLIB_H */+#define HAVE_ZLIB_H 1  /* Define to 1 if you have the <zstd.h> header file. */ /* #undef HAVE_ZSTD_H */@@ -1228,10 +1237,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005001"+#define LIBARCHIVE_VERSION_NUMBER "3005002"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.1"+#define LIBARCHIVE_VERSION_STRING "3.5.2"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1261,7 +1270,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.1"+#define PACKAGE_STRING "libarchive 3.5.2"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1270,7 +1279,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.1"+#define PACKAGE_VERSION "3.5.2"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1310,7 +1319,7 @@   /* Version number of package */-#define VERSION "3.5.1"+#define VERSION "3.5.2"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */

@@ -170,13 +170,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.1"+#define BSDCAT_VERSION_STRING "3.5.2"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.1"+#define BSDCPIO_VERSION_STRING "3.5.2"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.1"+#define BSDTAR_VERSION_STRING "3.5.2"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -453,7 +453,6 @@ /* #undef HAVE_EXPAT_H */  /* Define to 1 if you have the <ext2fs/ext2_fs.h> header file. */-/* #undef HAVE_EXT2FS_EXT2_FS_H */  /* Define to 1 if you have the `extattr_get_fd' function. */ /* #undef HAVE_EXTATTR_GET_FD */@@ -692,6 +691,9 @@ /* Define to 1 if you have the `link' function. */ #define HAVE_LINK 1 +/* Define to 1 if you have the `linkat' function. */+#define HAVE_LINKAT 1+ /* Define to 1 if you have the <linux/fiemap.h> header file. */ #define HAVE_LINUX_FIEMAP_H 1 @@ -997,6 +999,12 @@ /* Define to 1 if the system has the type `struct richacl'. */ /* #undef HAVE_STRUCT_RICHACL */ +/* Define to 1 if the system has the type `struct statfs'. */+/* #undef HAVE_STRUCT_STATFS */++/* Define to 1 if `f_iosize' is a member of `struct statfs'. */+/* #undef HAVE_STRUCT_STATFS_F_IOSIZE */+ /* Define to 1 if `f_namemax' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_NAMEMAX */ @@ -1207,7 +1215,7 @@ #define HAVE_WMEMMOVE 1  /* Define to 1 if you have a working EXT2_IOC_GETFLAGS */-/* #undef HAVE_WORKING_EXT2_IOC_GETFLAGS */+#define HAVE_WORKING_EXT2_IOC_GETFLAGS 1  /* Define to 1 if you have a working FS_IOC_GETFLAGS */ #define HAVE_WORKING_FS_IOC_GETFLAGS 1@@ -1240,10 +1248,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005001"+#define LIBARCHIVE_VERSION_NUMBER "3005002"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.1"+#define LIBARCHIVE_VERSION_STRING "3.5.2"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1258,7 +1266,7 @@  /* Define to 1 if `major', `minor', and `makedev' are declared in    <sysmacros.h>. */-/* #undef MAJOR_IN_SYSMACROS */+#define MAJOR_IN_SYSMACROS 1  /* Define to '0x05020000' for Windows Server 2003 APIs. */ /* #undef NTDDI_VERSION */@@ -1273,7 +1281,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.1"+#define PACKAGE_STRING "libarchive 3.5.2"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1282,7 +1290,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.1"+#define PACKAGE_VERSION "3.5.2"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1322,7 +1330,7 @@   /* Version number of package */-#define VERSION "3.5.1"+#define VERSION "3.5.2"  /* Define to '0x0502' for Windows Server 2003 APIs. */ /* #undef WINVER */@@ -1433,3 +1441,5 @@  /* Define to `unsigned int' if <sys/types.h> does not define. */ /* #undef uintptr_t */+#define HAVE_LIBZ 1+#define HAVE_ZLIB_H 1

@@ -170,13 +170,13 @@ /* #undef ARCHIVE_XATTR_LINUX */  /* Version number of bsdcat */-#define BSDCAT_VERSION_STRING "3.5.1"+#define BSDCAT_VERSION_STRING "3.5.2"  /* Version number of bsdcpio */-#define BSDCPIO_VERSION_STRING "3.5.1"+#define BSDCPIO_VERSION_STRING "3.5.2"  /* Version number of bsdtar */-#define BSDTAR_VERSION_STRING "3.5.1"+#define BSDTAR_VERSION_STRING "3.5.2"  /* Define to 1 if the system has the type `ace_t'. */ /* #undef HAVE_ACE_T */@@ -681,7 +681,7 @@ /* #undef HAVE_LIBXML_XMLWRITER_H */  /* Define to 1 if you have the `z' library (-lz). */-/* #undef HAVE_LIBZ */+#define HAVE_LIBZ  /* Define to 1 if you have the `zstd' library (-lzstd). */ /* #undef HAVE_LIBZSTD */@@ -1213,7 +1213,7 @@ /* #undef HAVE_WORKING_FS_IOC_GETFLAGS */  /* Define to 1 if you have the <zlib.h> header file. */-/* #undef HAVE_ZLIB_H */+#define HAVE_ZLIB_H 1  /* Define to 1 if you have the <zstd.h> header file. */ /* #undef HAVE_ZSTD_H */@@ -1240,10 +1240,10 @@ /* #undef ICONV_CONST */  /* Version number of libarchive as a single integer */-#define LIBARCHIVE_VERSION_NUMBER "3005001"+#define LIBARCHIVE_VERSION_NUMBER "3005002"  /* Version number of libarchive */-#define LIBARCHIVE_VERSION_STRING "3.5.1"+#define LIBARCHIVE_VERSION_STRING "3.5.2"  /* Define to 1 if `lstat' dereferences a symlink specified with a trailing    slash. */@@ -1273,7 +1273,7 @@ #define PACKAGE_NAME "libarchive"  /* Define to the full name and version of this package. */-#define PACKAGE_STRING "libarchive 3.5.1"+#define PACKAGE_STRING "libarchive 3.5.2"  /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libarchive"@@ -1282,7 +1282,7 @@ #define PACKAGE_URL ""  /* Define to the version of this package. */-#define PACKAGE_VERSION "3.5.1"+#define PACKAGE_VERSION "3.5.2"  /* Define to 1 if PCRE_STATIC needs to be defined. */ /* #undef PCRE_STATIC */@@ -1322,7 +1322,7 @@   /* Version number of package */-#define VERSION "3.5.1"+#define VERSION "3.5.2"  /* Define to '0x0502' for Windows Server 2003 APIs. */ #define WINVER 0x0502

@@ -138,6 +138,7 @@ #define HAVE_LIBZ 1 #define HAVE_LIMITS_H 1 #define HAVE_LINK 1+#define HAVE_LINKAT 1 #define HAVE_LOCALE_H 1 #define HAVE_LOCALTIME_R 1 #define HAVE_LONG_LONG_INT 1

@@ -150,7 +150,11 @@ #if GCC_VERSION >= 409 __attribute__((__no_sanitize_undefined__)) #endif-static inline U32 A32(const void * x)+#if defined(_MSC_VER)+static __inline U32 A32(const void * x)+#else+static inline U32 A32(const void* x)+#endif {     return (((const U32_S *)(x))->v); }

@@ -0,0 +1,186 @@+/* adler32.c -- compute the Adler-32 checksum of a data stream+ * Copyright (C) 1995-2011, 2016 Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++/* @(#) $Id$ */++#include "zutil.h"++local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));++#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 */++#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);+#define DO16(buf)   DO8(buf,0); DO8(buf,8);++/* use NO_DIVIDE if your processor does not do division in hardware --+   try it both ways to see which is faster */+#ifdef NO_DIVIDE+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15+   (thank you to John Reiser for pointing this out) */+#  define CHOP(a) \+    do { \+        unsigned long tmp = a >> 16; \+        a &= 0xffffUL; \+        a += (tmp << 4) - tmp; \+    } while (0)+#  define MOD28(a) \+    do { \+        CHOP(a); \+        if (a >= BASE) a -= BASE; \+    } while (0)+#  define MOD(a) \+    do { \+        CHOP(a); \+        MOD28(a); \+    } while (0)+#  define MOD63(a) \+    do { /* this assumes a is not negative */ \+        z_off64_t tmp = a >> 32; \+        a &= 0xffffffffL; \+        a += (tmp << 8) - (tmp << 5) + tmp; \+        tmp = a >> 16; \+        a &= 0xffffL; \+        a += (tmp << 4) - tmp; \+        tmp = a >> 16; \+        a &= 0xffffL; \+        a += (tmp << 4) - tmp; \+        if (a >= BASE) a -= BASE; \+    } while (0)+#else+#  define MOD(a) a %= BASE+#  define MOD28(a) a %= BASE+#  define MOD63(a) a %= BASE+#endif++/* ========================================================================= */+uLong ZEXPORT adler32_z(adler, buf, len)+    uLong adler;+    const Bytef *buf;+    z_size_t len;+{+    unsigned long sum2;+    unsigned n;++    /* split Adler-32 into component sums */+    sum2 = (adler >> 16) & 0xffff;+    adler &= 0xffff;++    /* in case user likes doing a byte at a time, keep it fast */+    if (len == 1) {+        adler += buf[0];+        if (adler >= BASE)+            adler -= BASE;+        sum2 += adler;+        if (sum2 >= BASE)+            sum2 -= BASE;+        return adler | (sum2 << 16);+    }++    /* initial Adler-32 value (deferred check for len == 1 speed) */+    if (buf == Z_NULL)+        return 1L;++    /* in case short lengths are provided, keep it somewhat fast */+    if (len < 16) {+        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) {+        len -= NMAX;+        n = NMAX / 16;          /* NMAX is divisible by 16 */+        do {+            DO16(buf);          /* 16 sums unrolled */+            buf += 16;+        } while (--n);+        MOD(adler);+        MOD(sum2);+    }++    /* do remaining bytes (less than NMAX, still just one modulo) */+    if (len) {                  /* avoid modulos if none remaining */+        while (len >= 16) {+            len -= 16;+            DO16(buf);+            buf += 16;+        }+        while (len--) {+            adler += *buf++;+            sum2 += adler;+        }+        MOD(adler);+        MOD(sum2);+    }++    /* return recombined sums */+    return adler | (sum2 << 16);+}++/* ========================================================================= */+uLong ZEXPORT adler32(adler, buf, len)+    uLong adler;+    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;+{+    unsigned long sum1;+    unsigned long sum2;+    unsigned rem;++    /* for negative len, return invalid adler32 as a clue for debugging */+    if (len2 < 0)+        return 0xffffffffUL;++    /* the derivation of this formula is left as an exercise for the reader */+    MOD63(len2);                /* assumes len2 >= 0 */+    rem = (unsigned)len2;+    sum1 = adler1 & 0xffff;+    sum2 = rem * sum1;+    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) sum2 -= BASE;+    return sum1 | (sum2 << 16);+}++/* ========================================================================= */+uLong ZEXPORT adler32_combine(adler1, adler2, len2)+    uLong adler1;+    uLong adler2;+    z_off_t len2;+{+    return adler32_combine_(adler1, adler2, len2);+}++uLong ZEXPORT adler32_combine64(adler1, adler2, len2)+    uLong adler1;+    uLong adler2;+    z_off64_t len2;+{+    return adler32_combine_(adler1, adler2, len2);+}

@@ -0,0 +1,86 @@+/* compress.c -- compress a memory buffer+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++/* @(#) $Id$ */++#define ZLIB_INTERNAL+#include "zlib.h"++/* ===========================================================================+     Compresses the source buffer into the destination buffer. The level+   parameter has the same meaning as in deflateInit.  sourceLen is the byte+   length of the source buffer. Upon entry, destLen is the total size of the+   destination buffer, which must be at least 0.1% larger than sourceLen plus+   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.++     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,+   Z_STREAM_ERROR if the level parameter is invalid.+*/+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)+    Bytef *dest;+    uLongf *destLen;+    const Bytef *source;+    uLong sourceLen;+    int level;+{+    z_stream stream;+    int err;+    const uInt max = (uInt)-1;+    uLong left;++    left = *destLen;+    *destLen = 0;++    stream.zalloc = (alloc_func)0;+    stream.zfree = (free_func)0;+    stream.opaque = (voidpf)0;++    err = deflateInit(&stream, level);+    if (err != Z_OK) return err;++    stream.next_out = dest;+    stream.avail_out = 0;+    stream.next_in = (z_const Bytef *)source;+    stream.avail_in = 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 = 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);+    return err == Z_STREAM_END ? Z_OK : err;+}++/* ===========================================================================+ */+int ZEXPORT compress (dest, destLen, source, sourceLen)+    Bytef *dest;+    uLongf *destLen;+    const Bytef *source;+    uLong sourceLen;+{+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);+}++/* ===========================================================================+     If the default memLevel or windowBits for deflateInit() is changed, then+   this function needs to be updated.+ */+uLong ZEXPORT compressBound (sourceLen)+    uLong sourceLen;+{+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) ++           (sourceLen >> 25) + 13;+}

@@ -0,0 +1,442 @@+/* crc32.c -- compute the CRC-32 of a data stream+ * 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+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing+ * tables for updating the shift register in one step with three exclusive-ors+ * instead of four steps with four exclusive-ors.  This results in about a+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.+ */++/* @(#) $Id$ */++/*+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore+  protection on the static variables used to control the first-use generation+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should+  first call get_crc_table() to initialize the tables before allowing more than+  one thread to use crc32().++  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.+ */++#ifdef MAKECRCH+#  include <stdio.h>+#  ifndef DYNAMIC_CRC_TABLE+#    define DYNAMIC_CRC_TABLE+#  endif /* !DYNAMIC_CRC_TABLE */+#endif /* MAKECRCH */++#include "zutil.h"      /* for STDC and FAR definitions */++/* 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 *, z_size_t));+   local unsigned long crc32_big OF((unsigned long,+                        const unsigned char FAR *, z_size_t));+#  define TBLS 8+#else+#  define TBLS 1+#endif /* BYFOUR */++/* Local functions for crc concatenation */+local unsigned long gf2_matrix_times OF((unsigned long *mat,+                                         unsigned long vec));+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));+++#ifdef DYNAMIC_CRC_TABLE++local volatile int crc_table_empty = 1;+local z_crc_t FAR crc_table[TBLS][256];+local void make_crc_table OF((void));+#ifdef MAKECRCH+   local void write_table OF((FILE *, const z_crc_t FAR *));+#endif /* MAKECRCH */+/*+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.++  Polynomials over GF(2) are represented in binary, one bit per coefficient,+  with the lowest powers in the most significant bit.  Then adding polynomials+  is just exclusive-or, and multiplying a polynomial by x is a right shift by+  one.  If we call the above polynomial p, and represent a byte as the+  polynomial q, also with the lowest power in the most significant bit (so the+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,+  where a mod b means the remainder after dividing a by b.++  This calculation is done using the shift-register method of multiplying and+  taking the remainder.  The register is initialized to zero, and for each+  incoming bit, x^32 is added mod p to the register if the bit is a one (where+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by+  x (which is shifting right by one and adding x^32 mod p if the bit shifted+  out is a one).  We start with the highest power (least significant bit) of+  q and repeat for all eight bits of q.++  The first table is simply the CRC of all possible eight bit values.  This is+  all the information needed to generate CRCs on data a byte at a time for all+  combinations of CRC register values and incoming bytes.  The remaining tables+  allow for word-at-a-time CRC calculation for both big-endian and little-+  endian machines, where a word is four bytes.+*/+local void make_crc_table()+{+    z_crc_t c;+    int n, k;+    z_crc_t poly;                       /* polynomial exclusive-or pattern */+    /* terms of polynomial defining this crc (except x^32): */+    static volatile int first = 1;      /* flag to limit concurrent making */+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};++    /* 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) {+        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++) {+            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++) {+            c = crc_table[0][n];+            crc_table[4][n] = ZSWAP32(c);+            for (k = 1; k < 4; k++) {+                c = crc_table[0][c & 0xff] ^ (c >> 8);+                crc_table[k][n] = c;+                crc_table[k + 4][n] = ZSWAP32(c);+            }+        }+#endif /* BYFOUR */++        crc_table_empty = 0;+    }+    else {      /* not first */+        /* wait for the other guy to finish (not efficient, but rare) */+        while (crc_table_empty)+            ;+    }++#ifdef MAKECRCH+    /* write out CRC tables to crc32.h */+    {+        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 ");+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");+        write_table(out, crc_table[0]);+#  ifdef BYFOUR+        fprintf(out, "#ifdef BYFOUR\n");+        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");+        fclose(out);+    }+#endif /* MAKECRCH */+}++#ifdef MAKECRCH+local void write_table(out, table)+    FILE *out;+    const z_crc_t FAR *table;+{+    int n;++    for (n = 0; n < 256; n++)+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",+                (unsigned long)(table[n]),+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));+}+#endif /* MAKECRCH */++#else /* !DYNAMIC_CRC_TABLE */+/* ========================================================================+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().+ */+#include "crc32.h"+#endif /* DYNAMIC_CRC_TABLE */++/* =========================================================================+ * This function can be used by asm versions of crc32()+ */+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;+}++/* ========================================================================= */+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1++/* ========================================================================= */+unsigned long ZEXPORT crc32_z(crc, buf, len)+    unsigned long crc;+    const unsigned char FAR *buf;+    z_size_t len;+{+    if (buf == Z_NULL) return 0UL;++#ifdef DYNAMIC_CRC_TABLE+    if (crc_table_empty)+        make_crc_table();+#endif /* DYNAMIC_CRC_TABLE */++#ifdef BYFOUR+    if (sizeof(void *) == sizeof(ptrdiff_t)) {+        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) {+        DO8;+        len -= 8;+    }+    if (len) do {+        DO1;+    } 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] ^ \+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4++/* ========================================================================= */+local unsigned long crc32_little(crc, buf, len)+    unsigned long crc;+    const unsigned char FAR *buf;+    z_size_t len;+{+    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)) {+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);+        len--;+    }++    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;+    while (len >= 32) {+        DOLIT32;+        len -= 32;+    }+    while (len >= 4) {+        DOLIT4;+        len -= 4;+    }+    buf = (const unsigned char FAR *)buf4;++    if (len) do {+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);+    } while (--len);+    c = ~c;+    return (unsigned long)c;+}++/* ========================================================================= */+#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++/* ========================================================================= */+local unsigned long crc32_big(crc, buf, len)+    unsigned long crc;+    const unsigned char FAR *buf;+    z_size_t len;+{+    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)) {+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);+        len--;+    }++    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;+    while (len >= 32) {+        DOBIG32;+        len -= 32;+    }+    while (len >= 4) {+        DOBIG4;+        len -= 4;+    }+    buf = (const unsigned char FAR *)buf4;++    if (len) do {+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);+    } while (--len);+    c = ~c;+    return (unsigned long)(ZSWAP32(c));+}++#endif /* BYFOUR */++#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */++/* ========================================================================= */+local unsigned long gf2_matrix_times(mat, vec)+    unsigned long *mat;+    unsigned long vec;+{+    unsigned long sum;++    sum = 0;+    while (vec) {+        if (vec & 1)+            sum ^= *mat;+        vec >>= 1;+        mat++;+    }+    return sum;+}++/* ========================================================================= */+local void gf2_matrix_square(square, mat)+    unsigned long *square;+    unsigned long *mat;+{+    int n;++    for (n = 0; n < GF2_DIM; n++)+        square[n] = gf2_matrix_times(mat, mat[n]);+}++/* ========================================================================= */+local uLong crc32_combine_(crc1, crc2, len2)+    uLong crc1;+    uLong crc2;+    z_off64_t len2;+{+    int n;+    unsigned long row;+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */++    /* degenerate case (also disallow negative lengths) */+    if (len2 <= 0)+        return crc1;++    /* put operator for one zero bit in odd */+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */+    row = 1;+    for (n = 1; n < GF2_DIM; n++) {+        odd[n] = row;+        row <<= 1;+    }++    /* put operator for two zero bits in even */+    gf2_matrix_square(even, odd);++    /* put operator for four zero bits in odd */+    gf2_matrix_square(odd, even);++    /* apply len2 zeros to crc1 (first square will put the operator for one+       zero byte, eight zero bits, in even) */+    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 */+        if (len2 == 0)+            break;++        /* 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);++    /* return combined crc */+    crc1 ^= crc2;+    return crc1;+}++/* ========================================================================= */+uLong ZEXPORT crc32_combine(crc1, crc2, len2)+    uLong crc1;+    uLong crc2;+    z_off_t len2;+{+    return crc32_combine_(crc1, crc2, len2);+}++uLong ZEXPORT crc32_combine64(crc1, crc2, len2)+    uLong crc1;+    uLong crc2;+    z_off64_t len2;+{+    return crc32_combine_(crc1, crc2, len2);+}

@@ -0,0 +1,441 @@+/* crc32.h -- tables for rapid CRC calculation+ * Generated automatically by crc32.c+ */++local const z_crc_t FAR crc_table[TBLS][256] =+{+  {+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,+    0x2d02ef8dUL+#ifdef BYFOUR+  },+  {+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,+    0x9324fd72UL+  },+  {+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,+    0xbe9834edUL+  },+  {+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,+    0xde0506f1UL+  },+  {+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,+    0x8def022dUL+  },+  {+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,+    0x72fd2493UL+  },+  {+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,+    0xed3498beUL+  },+  {+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,+    0xf10605deUL+#endif+  }+};

@@ -0,0 +1,2163 @@+/* deflate.c -- compress data using the deflation algorithm+ * Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++/*+ *  ALGORITHM+ *+ *      The "deflation" process depends on being able to identify portions+ *      of the input text which are identical to earlier input (within a+ *      sliding window trailing behind the input currently being processed).+ *+ *      The most straightforward technique turns out to be the fastest for+ *      most input files: try all possible matches and select the longest.+ *      The key feature of this algorithm is that insertions into the string+ *      dictionary are very simple and thus fast, and deletions are avoided+ *      completely. Insertions are performed at each input character, whereas+ *      string matches are performed only when the previous match ends. So it+ *      is preferable to spend more time in matches to allow very fast string+ *      insertions and avoid deletions. The matching algorithm for small+ *      strings is inspired from that of Rabin & Karp. A brute force approach+ *      is used to find longer strings when a small match has been found.+ *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze+ *      (by Leonid Broukhis).+ *         A previous version of this file used a more sophisticated algorithm+ *      (by Fiala and Greene) which is guaranteed to run in linear amortized+ *      time, but has a larger average cost, uses more memory and is patented.+ *      However the F&G algorithm may be faster for some highly redundant+ *      files if the parameter max_chain_length (described below) is too large.+ *+ *  ACKNOWLEDGEMENTS+ *+ *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and+ *      I found it in 'freeze' written by Leonid Broukhis.+ *      Thanks to many people for bug reports and testing.+ *+ *  REFERENCES+ *+ *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".+ *      Available in http://tools.ietf.org/html/rfc1951+ *+ *      A description of the Rabin and Karp algorithm is given in the book+ *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.+ *+ *      Fiala,E.R., and Greene,D.H.+ *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595+ *+ */++/* @(#) $Id$ */++#include "deflate.h"++const char deflate_copyright[] =+   " deflate 1.2.11 Copyright 1995-2017 Jean-loup Gailly and Mark Adler ";+/*+  If you use the zlib library in a product, an acknowledgment is welcome+  in the documentation of your product. If for some reason you cannot+  include such an acknowledgment, I would appreciate that you keep this+  copyright string in the executable of your product.+ */++/* ===========================================================================+ *  Function prototypes.+ */+typedef enum {+    need_more,      /* block not completed, need more input or more output */+    block_done,     /* block flush performed */+    finish_started, /* finish started, need only more output at next deflate */+    finish_done     /* finish done, accept no more input or output */+} block_state;++typedef block_state (*compress_func) OF((deflate_state *s, int flush));+/* Compression function. Returns the block state after the call. */++local int deflateStateCheck      OF((z_streamp strm));+local void slide_hash     OF((deflate_state *s));+local void fill_window    OF((deflate_state *s));+local block_state deflate_stored OF((deflate_state *s, int flush));+local block_state deflate_fast   OF((deflate_state *s, int flush));+#ifndef FASTEST+local block_state deflate_slow   OF((deflate_state *s, int flush));+#endif+local block_state deflate_rle    OF((deflate_state *s, int flush));+local block_state deflate_huff   OF((deflate_state *s, int flush));+local void lm_init        OF((deflate_state *s));+local void putShortMSB    OF((deflate_state *s, uInt b));+local void flush_pending  OF((z_streamp strm));+local unsigned read_buf   OF((z_streamp strm, Bytef *buf, unsigned size));+#ifdef ASMV+#  pragma message("Assembler code may have bugs -- use at your own risk")+      void match_init OF((void)); /* asm code initialization */+      uInt longest_match  OF((deflate_state *s, IPos cur_match));+#else+local uInt longest_match  OF((deflate_state *s, IPos cur_match));+#endif++#ifdef ZLIB_DEBUG+local  void check_match OF((deflate_state *s, IPos start, IPos match,+                            int length));+#endif++/* ===========================================================================+ * Local data+ */++#define NIL 0+/* Tail of hash chains */++#ifndef TOO_FAR+#  define TOO_FAR 4096+#endif+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */++/* Values for max_lazy_match, good_match and max_chain_length, depending on+ * the desired pack level (0..9). The values given below have been tuned to+ * exclude worst case performance for pathological files. Better values may be+ * found for specific files.+ */+typedef struct config_s {+   ush good_length; /* reduce lazy search above this match length */+   ush max_lazy;    /* do not perform lazy search above this match length */+   ush nice_length; /* quit search above this match length */+   ush max_chain;+   compress_func func;+} config;++#ifdef FASTEST+local const config configuration_table[2] = {+/*      good lazy nice chain */+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */+/* 1 */ {4,    4,  8,    4, deflate_fast}}; /* max speed, no lazy matches */+#else+local const config configuration_table[10] = {+/*      good lazy nice chain */+/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */+/* 1 */ {4,    4,  8,    4, deflate_fast}, /* max speed, no lazy matches */+/* 2 */ {4,    5, 16,    8, deflate_fast},+/* 3 */ {4,    6, 32,   32, deflate_fast},++/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */+/* 5 */ {8,   16, 32,   32, deflate_slow},+/* 6 */ {8,   16, 128, 128, deflate_slow},+/* 7 */ {8,   32, 128, 256, deflate_slow},+/* 8 */ {32, 128, 258, 1024, deflate_slow},+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */+#endif++/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different+ * meaning.+ */++/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */+#define RANK(f) (((f) * 2) - ((f) > 4 ? 9 : 0))++/* ===========================================================================+ * Update a hash value with the given input byte+ * IN  assertion: all calls to UPDATE_HASH are made with consecutive input+ *    characters, so that a running hash key can be computed from the previous+ *    key instead of complete recalculation each time.+ */+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)+++/* ===========================================================================+ * Insert string str in the dictionary and set match_head to the previous head+ * of the hash chain (the most recent string with same hash key). Return+ * the previous length of the hash chain.+ * If this file is compiled with -DFASTEST, the compression level is forced+ * to 1, and no hash chains are maintained.+ * IN  assertion: all calls to INSERT_STRING are made with consecutive input+ *    characters and the first MIN_MATCH bytes of str are valid (except for+ *    the last MIN_MATCH-1 bytes of the input file).+ */+#ifdef FASTEST+#define INSERT_STRING(s, str, match_head) \+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \+    match_head = s->head[s->ins_h], \+    s->head[s->ins_h] = (Pos)(str))+#else+#define INSERT_STRING(s, str, match_head) \+   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \+    match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \+    s->head[s->ins_h] = (Pos)(str))+#endif++/* ===========================================================================+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).+ * prev[] will be initialized on the fly.+ */+#define CLEAR_HASH(s) \+    s->head[s->hash_size-1] = NIL; \+    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));++/* ===========================================================================+ * Slide the hash table when sliding the window down (could be avoided with 32+ * bit values at the expense of memory usage). We slide even when level == 0 to+ * keep the hash table consistent if we switch back to level > 0 later.+ */+local void slide_hash(s)+    deflate_state *s;+{+    unsigned n, m;+    Posf *p;+    uInt wsize = s->w_size;++    n = s->hash_size;+    p = &s->head[n];+    do {+        m = *--p;+        *p = (Pos)(m >= wsize ? m - wsize : NIL);+    } while (--n);+    n = wsize;+#ifndef FASTEST+    p = &s->prev[n];+    do {+        m = *--p;+        *p = (Pos)(m >= wsize ? m - wsize : NIL);+        /* If n is not on any hash chain, prev[n] is garbage but+         * its value will never be used.+         */+    } while (--n);+#endif+}++/* ========================================================================= */+int ZEXPORT deflateInit_(strm, level, version, stream_size)+    z_streamp strm;+    int level;+    const char *version;+    int stream_size;+{+    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,+                         Z_DEFAULT_STRATEGY, version, stream_size);+    /* To do: ignore strm->next_in if we use it as window */+}++/* ========================================================================= */+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,+                  version, stream_size)+    z_streamp strm;+    int  level;+    int  method;+    int  windowBits;+    int  memLevel;+    int  strategy;+    const char *version;+    int stream_size;+{+    deflate_state *s;+    int wrap = 1;+    static const char my_version[] = ZLIB_VERSION;++    ushf *overlay;+    /* We overlay pending_buf and d_buf+l_buf. This works since the average+     * output size for (length,distance) codes is <= 24 bits.+     */++    if (version == Z_NULL || version[0] != my_version[0] ||+        stream_size != sizeof(z_stream)) {+        return Z_VERSION_ERROR;+    }+    if (strm == Z_NULL) return Z_STREAM_ERROR;++    strm->msg = Z_NULL;+    if (strm->zalloc == (alloc_func)0) {+#ifdef Z_SOLO+        return Z_STREAM_ERROR;+#else+        strm->zalloc = zcalloc;+        strm->opaque = (voidpf)0;+#endif+    }+    if (strm->zfree == (free_func)0)+#ifdef Z_SOLO+        return Z_STREAM_ERROR;+#else+        strm->zfree = zcfree;+#endif++#ifdef FASTEST+    if (level != 0) level = 1;+#else+    if (level == Z_DEFAULT_COMPRESSION) level = 6;+#endif++    if (windowBits < 0) { /* suppress zlib wrapper */+        wrap = 0;+        windowBits = -windowBits;+    }+#ifdef GZIP+    else if (windowBits > 15) {+        wrap = 2;       /* write gzip wrapper instead */+        windowBits -= 16;+    }+#endif+    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||+        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||+        strategy < 0 || strategy > Z_FIXED || (windowBits == 8 && wrap != 1)) {+        return Z_STREAM_ERROR;+    }+    if (windowBits == 8) windowBits = 9;  /* until 256-byte window bug fixed */+    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));+    if (s == Z_NULL) return Z_MEM_ERROR;+    strm->state = (struct internal_state FAR *)s;+    s->strm = strm;+    s->status = INIT_STATE;     /* to pass state test in deflateReset() */++    s->wrap = wrap;+    s->gzhead = Z_NULL;+    s->w_bits = (uInt)windowBits;+    s->w_size = 1 << s->w_bits;+    s->w_mask = s->w_size - 1;++    s->hash_bits = (uInt)memLevel + 7;+    s->hash_size = 1 << s->hash_bits;+    s->hash_mask = s->hash_size - 1;+    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);++    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));+    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));+    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));++    s->high_water = 0;      /* nothing written to s->window yet */++    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */++    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);+    s->pending_buf = (uchf *) overlay;+    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);++    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||+        s->pending_buf == Z_NULL) {+        s->status = FINISH_STATE;+        strm->msg = ERR_MSG(Z_MEM_ERROR);+        deflateEnd (strm);+        return Z_MEM_ERROR;+    }+    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);+    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;++    s->level = level;+    s->strategy = strategy;+    s->method = (Byte)method;++    return deflateReset(strm);+}++/* =========================================================================+ * Check for a valid deflate stream state. Return 0 if ok, 1 if not.+ */+local int deflateStateCheck (strm)+    z_streamp strm;+{+    deflate_state *s;+    if (strm == Z_NULL ||+        strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0)+        return 1;+    s = strm->state;+    if (s == Z_NULL || s->strm != strm || (s->status != INIT_STATE &&+#ifdef GZIP+                                           s->status != GZIP_STATE &&+#endif+                                           s->status != EXTRA_STATE &&+                                           s->status != NAME_STATE &&+                                           s->status != COMMENT_STATE &&+                                           s->status != HCRC_STATE &&+                                           s->status != BUSY_STATE &&+                                           s->status != FINISH_STATE))+        return 1;+    return 0;+}++/* ========================================================================= */+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)+    z_streamp strm;+    const Bytef *dictionary;+    uInt  dictLength;+{+    deflate_state *s;+    uInt str, n;+    int wrap;+    unsigned avail;+    z_const unsigned char *next;++    if (deflateStateCheck(strm) || dictionary == Z_NULL)+        return Z_STREAM_ERROR;+    s = strm->state;+    wrap = s->wrap;+    if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)+        return Z_STREAM_ERROR;++    /* when using zlib wrappers, compute Adler-32 for provided dictionary */+    if (wrap == 1)+        strm->adler = adler32(strm->adler, dictionary, dictLength);+    s->wrap = 0;                    /* avoid computing Adler-32 in read_buf */++    /* if dictionary would fill window, just replace the history */+    if (dictLength >= s->w_size) {+        if (wrap == 0) {            /* already empty otherwise */+            CLEAR_HASH(s);+            s->strstart = 0;+            s->block_start = 0L;+            s->insert = 0;+        }+        dictionary += dictLength - s->w_size;  /* use the tail */+        dictLength = s->w_size;+    }++    /* insert dictionary into window and hash */+    avail = strm->avail_in;+    next = strm->next_in;+    strm->avail_in = dictLength;+    strm->next_in = (z_const Bytef *)dictionary;+    fill_window(s);+    while (s->lookahead >= MIN_MATCH) {+        str = s->strstart;+        n = s->lookahead - (MIN_MATCH-1);+        do {+            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);+#ifndef FASTEST+            s->prev[str & s->w_mask] = s->head[s->ins_h];+#endif+            s->head[s->ins_h] = (Pos)str;+            str++;+        } while (--n);+        s->strstart = str;+        s->lookahead = MIN_MATCH-1;+        fill_window(s);+    }+    s->strstart += s->lookahead;+    s->block_start = (long)s->strstart;+    s->insert = s->lookahead;+    s->lookahead = 0;+    s->match_length = s->prev_length = MIN_MATCH-1;+    s->match_available = 0;+    strm->next_in = next;+    strm->avail_in = avail;+    s->wrap = wrap;+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflateGetDictionary (strm, dictionary, dictLength)+    z_streamp strm;+    Bytef *dictionary;+    uInt  *dictLength;+{+    deflate_state *s;+    uInt len;++    if (deflateStateCheck(strm))+        return Z_STREAM_ERROR;+    s = strm->state;+    len = s->strstart + s->lookahead;+    if (len > s->w_size)+        len = s->w_size;+    if (dictionary != Z_NULL && len)+        zmemcpy(dictionary, s->window + s->strstart + s->lookahead - len, len);+    if (dictLength != Z_NULL)+        *dictLength = len;+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflateResetKeep (strm)+    z_streamp strm;+{+    deflate_state *s;++    if (deflateStateCheck(strm)) {+        return Z_STREAM_ERROR;+    }++    strm->total_in = strm->total_out = 0;+    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */+    strm->data_type = Z_UNKNOWN;++    s = (deflate_state *)strm->state;+    s->pending = 0;+    s->pending_out = s->pending_buf;++    if (s->wrap < 0) {+        s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */+    }+    s->status =+#ifdef GZIP+        s->wrap == 2 ? GZIP_STATE :+#endif+        s->wrap ? INIT_STATE : BUSY_STATE;+    strm->adler =+#ifdef GZIP+        s->wrap == 2 ? crc32(0L, Z_NULL, 0) :+#endif+        adler32(0L, Z_NULL, 0);+    s->last_flush = Z_NO_FLUSH;++    _tr_init(s);++    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflateReset (strm)+    z_streamp strm;+{+    int ret;++    ret = deflateResetKeep(strm);+    if (ret == Z_OK)+        lm_init(strm->state);+    return ret;+}++/* ========================================================================= */+int ZEXPORT deflateSetHeader (strm, head)+    z_streamp strm;+    gz_headerp head;+{+    if (deflateStateCheck(strm) || strm->state->wrap != 2)+        return Z_STREAM_ERROR;+    strm->state->gzhead = head;+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflatePending (strm, pending, bits)+    unsigned *pending;+    int *bits;+    z_streamp strm;+{+    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;+    if (pending != Z_NULL)+        *pending = strm->state->pending;+    if (bits != Z_NULL)+        *bits = strm->state->bi_valid;+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflatePrime (strm, bits, value)+    z_streamp strm;+    int bits;+    int value;+{+    deflate_state *s;+    int put;++    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;+    s = strm->state;+    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))+        return Z_BUF_ERROR;+    do {+        put = Buf_size - s->bi_valid;+        if (put > bits)+            put = bits;+        s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);+        s->bi_valid += put;+        _tr_flush_bits(s);+        value >>= put;+        bits -= put;+    } while (bits);+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflateParams(strm, level, strategy)+    z_streamp strm;+    int level;+    int strategy;+{+    deflate_state *s;+    compress_func func;++    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;+    s = strm->state;++#ifdef FASTEST+    if (level != 0) level = 1;+#else+    if (level == Z_DEFAULT_COMPRESSION) level = 6;+#endif+    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {+        return Z_STREAM_ERROR;+    }+    func = configuration_table[s->level].func;++    if ((strategy != s->strategy || func != configuration_table[level].func) &&+        s->high_water) {+        /* Flush the last buffer: */+        int err = deflate(strm, Z_BLOCK);+        if (err == Z_STREAM_ERROR)+            return err;+        if (strm->avail_out == 0)+            return Z_BUF_ERROR;+    }+    if (s->level != level) {+        if (s->level == 0 && s->matches != 0) {+            if (s->matches == 1)+                slide_hash(s);+            else+                CLEAR_HASH(s);+            s->matches = 0;+        }+        s->level = level;+        s->max_lazy_match   = configuration_table[level].max_lazy;+        s->good_match       = configuration_table[level].good_length;+        s->nice_match       = configuration_table[level].nice_length;+        s->max_chain_length = configuration_table[level].max_chain;+    }+    s->strategy = strategy;+    return Z_OK;+}++/* ========================================================================= */+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)+    z_streamp strm;+    int good_length;+    int max_lazy;+    int nice_length;+    int max_chain;+{+    deflate_state *s;++    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;+    s = strm->state;+    s->good_match = (uInt)good_length;+    s->max_lazy_match = (uInt)max_lazy;+    s->nice_match = nice_length;+    s->max_chain_length = (uInt)max_chain;+    return Z_OK;+}++/* =========================================================================+ * For the default windowBits of 15 and memLevel of 8, this function returns+ * a close to exact, as well as small, upper bound on the compressed size.+ * They are coded as constants here for a reason--if the #define's are+ * changed, then this function needs to be changed as well.  The return+ * value for 15 and 8 only works for those exact settings.+ *+ * For any setting other than those defaults for windowBits and memLevel,+ * the value returned is a conservative worst case for the maximum expansion+ * resulting from using fixed blocks instead of stored blocks, which deflate+ * can emit on compressed data for some combinations of the parameters.+ *+ * This function could be more sophisticated to provide closer upper bounds for+ * every combination of windowBits and memLevel.  But even the conservative+ * upper bound of about 14% expansion does not seem onerous for output buffer+ * allocation.+ */+uLong ZEXPORT deflateBound(strm, sourceLen)+    z_streamp strm;+    uLong sourceLen;+{+    deflate_state *s;+    uLong complen, wraplen;++    /* conservative upper bound for compressed data */+    complen = sourceLen ++              ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;++    /* if can't get parameters, return conservative bound plus zlib wrapper */+    if (deflateStateCheck(strm))+        return complen + 6;++    /* compute wrapper length */+    s = strm->state;+    switch (s->wrap) {+    case 0:                                 /* raw deflate */+        wraplen = 0;+        break;+    case 1:                                 /* zlib wrapper */+        wraplen = 6 + (s->strstart ? 4 : 0);+        break;+#ifdef GZIP+    case 2:                                 /* gzip wrapper */+        wraplen = 18;+        if (s->gzhead != Z_NULL) {          /* user-supplied gzip header */+            Bytef *str;+            if (s->gzhead->extra != Z_NULL)+                wraplen += 2 + s->gzhead->extra_len;+            str = s->gzhead->name;+            if (str != Z_NULL)+                do {+                    wraplen++;+                } while (*str++);+            str = s->gzhead->comment;+            if (str != Z_NULL)+                do {+                    wraplen++;+                } while (*str++);+            if (s->gzhead->hcrc)+                wraplen += 2;+        }+        break;+#endif+    default:                                /* for compiler happiness */+        wraplen = 6;+    }++    /* if not default parameters, return conservative bound */+    if (s->w_bits != 15 || s->hash_bits != 8 + 7)+        return complen + wraplen;++    /* default settings: return tight bound for that case */+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) ++           (sourceLen >> 25) + 13 - 6 + wraplen;+}++/* =========================================================================+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.+ * IN assertion: the stream state is correct and there is enough room in+ * pending_buf.+ */+local void putShortMSB (s, b)+    deflate_state *s;+    uInt b;+{+    put_byte(s, (Byte)(b >> 8));+    put_byte(s, (Byte)(b & 0xff));+}++/* =========================================================================+ * Flush as much pending output as possible. All deflate() output, except for+ * some deflate_stored() output, goes through this function so some+ * applications may wish to modify it to avoid allocating a large+ * strm->next_out buffer and copying into it. (See also read_buf()).+ */+local void flush_pending(strm)+    z_streamp strm;+{+    unsigned len;+    deflate_state *s = strm->state;++    _tr_flush_bits(s);+    len = s->pending;+    if (len > strm->avail_out) len = strm->avail_out;+    if (len == 0) return;++    zmemcpy(strm->next_out, s->pending_out, len);+    strm->next_out  += len;+    s->pending_out  += len;+    strm->total_out += len;+    strm->avail_out -= len;+    s->pending      -= len;+    if (s->pending == 0) {+        s->pending_out = s->pending_buf;+    }+}++/* ===========================================================================+ * Update the header CRC with the bytes s->pending_buf[beg..s->pending - 1].+ */+#define HCRC_UPDATE(beg) \+    do { \+        if (s->gzhead->hcrc && s->pending > (beg)) \+            strm->adler = crc32(strm->adler, s->pending_buf + (beg), \+                                s->pending - (beg)); \+    } while (0)++/* ========================================================================= */+int ZEXPORT deflate (strm, flush)+    z_streamp strm;+    int flush;+{+    int old_flush; /* value of flush param for previous deflate call */+    deflate_state *s;++    if (deflateStateCheck(strm) || flush > Z_BLOCK || flush < 0) {+        return Z_STREAM_ERROR;+    }+    s = strm->state;++    if (strm->next_out == Z_NULL ||+        (strm->avail_in != 0 && strm->next_in == Z_NULL) ||+        (s->status == FINISH_STATE && flush != Z_FINISH)) {+        ERR_RETURN(strm, Z_STREAM_ERROR);+    }+    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);++    old_flush = s->last_flush;+    s->last_flush = flush;++    /* Flush as much pending output as possible */+    if (s->pending != 0) {+        flush_pending(strm);+        if (strm->avail_out == 0) {+            /* Since avail_out is 0, deflate will be called again with+             * more output space, but possibly with both pending and+             * avail_in equal to zero. There won't be anything to do,+             * but this is not an error situation so make sure we+             * return OK instead of BUF_ERROR at next call of deflate:+             */+            s->last_flush = -1;+            return Z_OK;+        }++    /* Make sure there is something to do and avoid duplicate consecutive+     * flushes. For repeated and useless calls with Z_FINISH, we keep+     * returning Z_STREAM_END instead of Z_BUF_ERROR.+     */+    } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&+               flush != Z_FINISH) {+        ERR_RETURN(strm, Z_BUF_ERROR);+    }++    /* User must not provide more input after the first FINISH: */+    if (s->status == FINISH_STATE && strm->avail_in != 0) {+        ERR_RETURN(strm, Z_BUF_ERROR);+    }++    /* Write the header */+    if (s->status == INIT_STATE) {+        /* zlib header */+        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;+        uInt level_flags;++        if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)+            level_flags = 0;+        else if (s->level < 6)+            level_flags = 1;+        else if (s->level == 6)+            level_flags = 2;+        else+            level_flags = 3;+        header |= (level_flags << 6);+        if (s->strstart != 0) header |= PRESET_DICT;+        header += 31 - (header % 31);++        putShortMSB(s, header);++        /* Save the adler32 of the preset dictionary: */+        if (s->strstart != 0) {+            putShortMSB(s, (uInt)(strm->adler >> 16));+            putShortMSB(s, (uInt)(strm->adler & 0xffff));+        }+        strm->adler = adler32(0L, Z_NULL, 0);+        s->status = BUSY_STATE;++        /* Compression must start with an empty pending buffer */+        flush_pending(strm);+        if (s->pending != 0) {+            s->last_flush = -1;+            return Z_OK;+        }+    }+#ifdef GZIP+    if (s->status == GZIP_STATE) {+        /* gzip header */+        strm->adler = crc32(0L, Z_NULL, 0);+        put_byte(s, 31);+        put_byte(s, 139);+        put_byte(s, 8);+        if (s->gzhead == Z_NULL) {+            put_byte(s, 0);+            put_byte(s, 0);+            put_byte(s, 0);+            put_byte(s, 0);+            put_byte(s, 0);+            put_byte(s, s->level == 9 ? 2 :+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?+                      4 : 0));+            put_byte(s, OS_CODE);+            s->status = BUSY_STATE;++            /* Compression must start with an empty pending buffer */+            flush_pending(strm);+            if (s->pending != 0) {+                s->last_flush = -1;+                return Z_OK;+            }+        }+        else {+            put_byte(s, (s->gzhead->text ? 1 : 0) ++                     (s->gzhead->hcrc ? 2 : 0) ++                     (s->gzhead->extra == Z_NULL ? 0 : 4) ++                     (s->gzhead->name == Z_NULL ? 0 : 8) ++                     (s->gzhead->comment == Z_NULL ? 0 : 16)+                     );+            put_byte(s, (Byte)(s->gzhead->time & 0xff));+            put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));+            put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));+            put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));+            put_byte(s, s->level == 9 ? 2 :+                     (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?+                      4 : 0));+            put_byte(s, s->gzhead->os & 0xff);+            if (s->gzhead->extra != Z_NULL) {+                put_byte(s, s->gzhead->extra_len & 0xff);+                put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);+            }+            if (s->gzhead->hcrc)+                strm->adler = crc32(strm->adler, s->pending_buf,+                                    s->pending);+            s->gzindex = 0;+            s->status = EXTRA_STATE;+        }+    }+    if (s->status == EXTRA_STATE) {+        if (s->gzhead->extra != Z_NULL) {+            ulg beg = s->pending;   /* start of bytes to update crc */+            uInt left = (s->gzhead->extra_len & 0xffff) - s->gzindex;+            while (s->pending + left > s->pending_buf_size) {+                uInt copy = s->pending_buf_size - s->pending;+                zmemcpy(s->pending_buf + s->pending,+                        s->gzhead->extra + s->gzindex, copy);+                s->pending = s->pending_buf_size;+                HCRC_UPDATE(beg);+                s->gzindex += copy;+                flush_pending(strm);+                if (s->pending != 0) {+                    s->last_flush = -1;+                    return Z_OK;+                }+                beg = 0;+                left -= copy;+            }+            zmemcpy(s->pending_buf + s->pending,+                    s->gzhead->extra + s->gzindex, left);+            s->pending += left;+            HCRC_UPDATE(beg);+            s->gzindex = 0;+        }+        s->status = NAME_STATE;+    }+    if (s->status == NAME_STATE) {+        if (s->gzhead->name != Z_NULL) {+            ulg beg = s->pending;   /* start of bytes to update crc */+            int val;+            do {+                if (s->pending == s->pending_buf_size) {+                    HCRC_UPDATE(beg);+                    flush_pending(strm);+                    if (s->pending != 0) {+                        s->last_flush = -1;+                        return Z_OK;+                    }+                    beg = 0;+                }+                val = s->gzhead->name[s->gzindex++];+                put_byte(s, val);+            } while (val != 0);+            HCRC_UPDATE(beg);+            s->gzindex = 0;+        }+        s->status = COMMENT_STATE;+    }+    if (s->status == COMMENT_STATE) {+        if (s->gzhead->comment != Z_NULL) {+            ulg beg = s->pending;   /* start of bytes to update crc */+            int val;+            do {+                if (s->pending == s->pending_buf_size) {+                    HCRC_UPDATE(beg);+                    flush_pending(strm);+                    if (s->pending != 0) {+                        s->last_flush = -1;+                        return Z_OK;+                    }+                    beg = 0;+                }+                val = s->gzhead->comment[s->gzindex++];+                put_byte(s, val);+            } while (val != 0);+            HCRC_UPDATE(beg);+        }+        s->status = HCRC_STATE;+    }+    if (s->status == HCRC_STATE) {+        if (s->gzhead->hcrc) {+            if (s->pending + 2 > s->pending_buf_size) {+                flush_pending(strm);+                if (s->pending != 0) {+                    s->last_flush = -1;+                    return Z_OK;+                }+            }+            put_byte(s, (Byte)(strm->adler & 0xff));+            put_byte(s, (Byte)((strm->adler >> 8) & 0xff));+            strm->adler = crc32(0L, Z_NULL, 0);+        }+        s->status = BUSY_STATE;++        /* Compression must start with an empty pending buffer */+        flush_pending(strm);+        if (s->pending != 0) {+            s->last_flush = -1;+            return Z_OK;+        }+    }+#endif++    /* Start a new block or continue the current one.+     */+    if (strm->avail_in != 0 || s->lookahead != 0 ||+        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {+        block_state bstate;++        bstate = s->level == 0 ? deflate_stored(s, flush) :+                 s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :+                 s->strategy == Z_RLE ? deflate_rle(s, flush) :+                 (*(configuration_table[s->level].func))(s, flush);++        if (bstate == finish_started || bstate == finish_done) {+            s->status = FINISH_STATE;+        }+        if (bstate == need_more || bstate == finish_started) {+            if (strm->avail_out == 0) {+                s->last_flush = -1; /* avoid BUF_ERROR next call, see above */+            }+            return Z_OK;+            /* If flush != Z_NO_FLUSH && avail_out == 0, the next call+             * of deflate should use the same flush parameter to make sure+             * that the flush is complete. So we don't have to output an+             * empty block here, this will be done at next call. This also+             * ensures that for a very small output buffer, we emit at most+             * one empty block.+             */+        }+        if (bstate == block_done) {+            if (flush == Z_PARTIAL_FLUSH) {+                _tr_align(s);+            } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */+                _tr_stored_block(s, (char*)0, 0L, 0);+                /* For a full flush, this empty block will be recognized+                 * as a special marker by inflate_sync().+                 */+                if (flush == Z_FULL_FLUSH) {+                    CLEAR_HASH(s);             /* forget history */+                    if (s->lookahead == 0) {+                        s->strstart = 0;+                        s->block_start = 0L;+                        s->insert = 0;+                    }+                }+            }+            flush_pending(strm);+            if (strm->avail_out == 0) {+              s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */+              return Z_OK;+            }+        }+    }++    if (flush != Z_FINISH) return Z_OK;+    if (s->wrap <= 0) return Z_STREAM_END;++    /* Write the trailer */+#ifdef GZIP+    if (s->wrap == 2) {+        put_byte(s, (Byte)(strm->adler & 0xff));+        put_byte(s, (Byte)((strm->adler >> 8) & 0xff));+        put_byte(s, (Byte)((strm->adler >> 16) & 0xff));+        put_byte(s, (Byte)((strm->adler >> 24) & 0xff));+        put_byte(s, (Byte)(strm->total_in & 0xff));+        put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));+        put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));+        put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));+    }+    else+#endif+    {+        putShortMSB(s, (uInt)(strm->adler >> 16));+        putShortMSB(s, (uInt)(strm->adler & 0xffff));+    }+    flush_pending(strm);+    /* If avail_out is zero, the application will call deflate again+     * to flush the rest.+     */+    if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */+    return s->pending != 0 ? Z_OK : Z_STREAM_END;+}++/* ========================================================================= */+int ZEXPORT deflateEnd (strm)+    z_streamp strm;+{+    int status;++    if (deflateStateCheck(strm)) return Z_STREAM_ERROR;++    status = strm->state->status;++    /* Deallocate in reverse order of allocations: */+    TRY_FREE(strm, strm->state->pending_buf);+    TRY_FREE(strm, strm->state->head);+    TRY_FREE(strm, strm->state->prev);+    TRY_FREE(strm, strm->state->window);++    ZFREE(strm, strm->state);+    strm->state = Z_NULL;++    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;+}++/* =========================================================================+ * Copy the source state to the destination state.+ * To simplify the source, this is not supported for 16-bit MSDOS (which+ * doesn't have enough memory anyway to duplicate compression states).+ */+int ZEXPORT deflateCopy (dest, source)+    z_streamp dest;+    z_streamp source;+{+#ifdef MAXSEG_64K+    return Z_STREAM_ERROR;+#else+    deflate_state *ds;+    deflate_state *ss;+    ushf *overlay;+++    if (deflateStateCheck(source) || dest == Z_NULL) {+        return Z_STREAM_ERROR;+    }++    ss = source->state;++    zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));++    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));+    if (ds == Z_NULL) return Z_MEM_ERROR;+    dest->state = (struct internal_state FAR *) ds;+    zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));+    ds->strm = dest;++    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));+    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));+    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));+    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);+    ds->pending_buf = (uchf *) overlay;++    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||+        ds->pending_buf == Z_NULL) {+        deflateEnd (dest);+        return Z_MEM_ERROR;+    }+    /* following zmemcpy do not work for 16-bit MSDOS */+    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));+    zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));+    zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));+    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);++    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);+    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);+    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;++    ds->l_desc.dyn_tree = ds->dyn_ltree;+    ds->d_desc.dyn_tree = ds->dyn_dtree;+    ds->bl_desc.dyn_tree = ds->bl_tree;++    return Z_OK;+#endif /* MAXSEG_64K */+}++/* ===========================================================================+ * Read a new buffer from the current input stream, update the adler32+ * and total number of bytes read.  All deflate() input goes through+ * this function so some applications may wish to modify it to avoid+ * allocating a large strm->next_in buffer and copying from it.+ * (See also flush_pending()).+ */+local unsigned read_buf(strm, buf, size)+    z_streamp strm;+    Bytef *buf;+    unsigned size;+{+    unsigned len = strm->avail_in;++    if (len > size) len = size;+    if (len == 0) return 0;++    strm->avail_in  -= len;++    zmemcpy(buf, strm->next_in, len);+    if (strm->state->wrap == 1) {+        strm->adler = adler32(strm->adler, buf, len);+    }+#ifdef GZIP+    else if (strm->state->wrap == 2) {+        strm->adler = crc32(strm->adler, buf, len);+    }+#endif+    strm->next_in  += len;+    strm->total_in += len;++    return len;+}++/* ===========================================================================+ * Initialize the "longest match" routines for a new zlib stream+ */+local void lm_init (s)+    deflate_state *s;+{+    s->window_size = (ulg)2L*s->w_size;++    CLEAR_HASH(s);++    /* Set the default configuration parameters:+     */+    s->max_lazy_match   = configuration_table[s->level].max_lazy;+    s->good_match       = configuration_table[s->level].good_length;+    s->nice_match       = configuration_table[s->level].nice_length;+    s->max_chain_length = configuration_table[s->level].max_chain;++    s->strstart = 0;+    s->block_start = 0L;+    s->lookahead = 0;+    s->insert = 0;+    s->match_length = s->prev_length = MIN_MATCH-1;+    s->match_available = 0;+    s->ins_h = 0;+#ifndef FASTEST+#ifdef ASMV+    match_init(); /* initialize the asm code */+#endif+#endif+}++#ifndef FASTEST+/* ===========================================================================+ * Set match_start to the longest match starting at the given string and+ * return its length. Matches shorter or equal to prev_length are discarded,+ * in which case the result is equal to prev_length and match_start is+ * garbage.+ * IN assertions: cur_match is the head of the hash chain for the current+ *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1+ * OUT assertion: the match length is not greater than s->lookahead.+ */+#ifndef ASMV+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or+ * match.S. The code will be functionally equivalent.+ */+local uInt longest_match(s, cur_match)+    deflate_state *s;+    IPos cur_match;                             /* current match */+{+    unsigned chain_length = s->max_chain_length;/* max hash chain length */+    register Bytef *scan = s->window + s->strstart; /* current string */+    register Bytef *match;                      /* matched string */+    register int len;                           /* length of current match */+    int best_len = (int)s->prev_length;         /* best match length so far */+    int nice_match = s->nice_match;             /* stop if match long enough */+    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?+        s->strstart - (IPos)MAX_DIST(s) : NIL;+    /* Stop when cur_match becomes <= limit. To simplify the code,+     * we prevent matches with the string of window index 0.+     */+    Posf *prev = s->prev;+    uInt wmask = s->w_mask;++#ifdef UNALIGNED_OK+    /* Compare two bytes at a time. Note: this is not always beneficial.+     * Try with and without -DUNALIGNED_OK to check.+     */+    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;+    register ush scan_start = *(ushf*)scan;+    register ush scan_end   = *(ushf*)(scan+best_len-1);+#else+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;+    register Byte scan_end1  = scan[best_len-1];+    register Byte scan_end   = scan[best_len];+#endif++    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.+     * It is easy to get rid of this optimization if necessary.+     */+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");++    /* Do not waste too much time if we already have a good match: */+    if (s->prev_length >= s->good_match) {+        chain_length >>= 2;+    }+    /* Do not look for matches beyond the end of the input. This is necessary+     * to make deflate deterministic.+     */+    if ((uInt)nice_match > s->lookahead) nice_match = (int)s->lookahead;++    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");++    do {+        Assert(cur_match < s->strstart, "no future");+        match = s->window + cur_match;++        /* Skip to next match if the match length cannot increase+         * or if the match length is less than 2.  Note that the checks below+         * for insufficient lookahead only occur occasionally for performance+         * reasons.  Therefore uninitialized memory will be accessed, and+         * conditional jumps will be made that depend on those values.+         * However the length of the match is limited to the lookahead, so+         * the output of deflate is not affected by the uninitialized values.+         */+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)+        /* This code assumes sizeof(unsigned short) == 2. Do not use+         * UNALIGNED_OK if your compiler uses a different size.+         */+        if (*(ushf*)(match+best_len-1) != scan_end ||+            *(ushf*)match != scan_start) continue;++        /* It is not necessary to compare scan[2] and match[2] since they are+         * always equal when the other bytes match, given that the hash keys+         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at+         * strstart+3, +5, ... up to strstart+257. We check for insufficient+         * lookahead only every 4th comparison; the 128th check will be made+         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is+         * necessary to put more guard bytes at the end of the window, or+         * to check more often for insufficient lookahead.+         */+        Assert(scan[2] == match[2], "scan[2]?");+        scan++, match++;+        do {+        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&+                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&+                 scan < strend);+        /* The funny "do {}" generates better code on most compilers */++        /* Here, scan <= window+strstart+257 */+        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");+        if (*scan == *match) scan++;++        len = (MAX_MATCH - 1) - (int)(strend-scan);+        scan = strend - (MAX_MATCH-1);++#else /* UNALIGNED_OK */++        if (match[best_len]   != scan_end  ||+            match[best_len-1] != scan_end1 ||+            *match            != *scan     ||+            *++match          != scan[1])      continue;++        /* The check at best_len-1 can be removed because it will be made+         * again later. (This heuristic is not always a win.)+         * It is not necessary to compare scan[2] and match[2] since they+         * are always equal when the other bytes match, given that+         * the hash keys are equal and that HASH_BITS >= 8.+         */+        scan += 2, match++;+        Assert(*scan == *match, "match[2]?");++        /* We check for insufficient lookahead only every 8th comparison;+         * the 256th check will be made at strstart+258.+         */+        do {+        } while (*++scan == *++match && *++scan == *++match &&+                 *++scan == *++match && *++scan == *++match &&+                 *++scan == *++match && *++scan == *++match &&+                 *++scan == *++match && *++scan == *++match &&+                 scan < strend);++        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");++        len = MAX_MATCH - (int)(strend - scan);+        scan = strend - MAX_MATCH;++#endif /* UNALIGNED_OK */++        if (len > best_len) {+            s->match_start = cur_match;+            best_len = len;+            if (len >= nice_match) break;+#ifdef UNALIGNED_OK+            scan_end = *(ushf*)(scan+best_len-1);+#else+            scan_end1  = scan[best_len-1];+            scan_end   = scan[best_len];+#endif+        }+    } while ((cur_match = prev[cur_match & wmask]) > limit+             && --chain_length != 0);++    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;+    return s->lookahead;+}+#endif /* ASMV */++#else /* FASTEST */++/* ---------------------------------------------------------------------------+ * Optimized version for FASTEST only+ */+local uInt longest_match(s, cur_match)+    deflate_state *s;+    IPos cur_match;                             /* current match */+{+    register Bytef *scan = s->window + s->strstart; /* current string */+    register Bytef *match;                       /* matched string */+    register int len;                           /* length of current match */+    register Bytef *strend = s->window + s->strstart + MAX_MATCH;++    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.+     * It is easy to get rid of this optimization if necessary.+     */+    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");++    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");++    Assert(cur_match < s->strstart, "no future");++    match = s->window + cur_match;++    /* Return failure if the match length is less than 2:+     */+    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;++    /* The check at best_len-1 can be removed because it will be made+     * again later. (This heuristic is not always a win.)+     * It is not necessary to compare scan[2] and match[2] since they+     * are always equal when the other bytes match, given that+     * the hash keys are equal and that HASH_BITS >= 8.+     */+    scan += 2, match += 2;+    Assert(*scan == *match, "match[2]?");++    /* We check for insufficient lookahead only every 8th comparison;+     * the 256th check will be made at strstart+258.+     */+    do {+    } while (*++scan == *++match && *++scan == *++match &&+             *++scan == *++match && *++scan == *++match &&+             *++scan == *++match && *++scan == *++match &&+             *++scan == *++match && *++scan == *++match &&+             scan < strend);++    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");++    len = MAX_MATCH - (int)(strend - scan);++    if (len < MIN_MATCH) return MIN_MATCH - 1;++    s->match_start = cur_match;+    return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;+}++#endif /* FASTEST */++#ifdef ZLIB_DEBUG++#define EQUAL 0+/* result of memcmp for equal strings */++/* ===========================================================================+ * Check that the match at match_start is indeed a match.+ */+local void check_match(s, start, match, length)+    deflate_state *s;+    IPos start, match;+    int length;+{+    /* check that the match is indeed a match */+    if (zmemcmp(s->window + match,+                s->window + start, length) != EQUAL) {+        fprintf(stderr, " start %u, match %u, length %d\n",+                start, match, length);+        do {+            fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);+        } while (--length != 0);+        z_error("invalid match");+    }+    if (z_verbose > 1) {+        fprintf(stderr,"\\[%d,%d]", start-match, length);+        do { putc(s->window[start++], stderr); } while (--length != 0);+    }+}+#else+#  define check_match(s, start, match, length)+#endif /* ZLIB_DEBUG */++/* ===========================================================================+ * Fill the window when the lookahead becomes insufficient.+ * Updates strstart and lookahead.+ *+ * IN assertion: lookahead < MIN_LOOKAHEAD+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD+ *    At least one byte has been read, or avail_in == 0; reads are+ *    performed for at least two bytes (required for the zip translate_eol+ *    option -- not supported here).+ */+local void fill_window(s)+    deflate_state *s;+{+    unsigned n;+    unsigned more;    /* Amount of free space at the end of the window. */+    uInt wsize = s->w_size;++    Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");++    do {+        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);++        /* Deal with !@#$% 64K limit: */+        if (sizeof(int) <= 2) {+            if (more == 0 && s->strstart == 0 && s->lookahead == 0) {+                more = wsize;++            } else if (more == (unsigned)(-1)) {+                /* Very unlikely, but possible on 16 bit machine if+                 * strstart == 0 && lookahead == 1 (input done a byte at time)+                 */+                more--;+            }+        }++        /* If the window is almost full and there is insufficient lookahead,+         * move the upper half to the lower one to make room in the upper half.+         */+        if (s->strstart >= wsize+MAX_DIST(s)) {++            zmemcpy(s->window, s->window+wsize, (unsigned)wsize - more);+            s->match_start -= wsize;+            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */+            s->block_start -= (long) wsize;+            slide_hash(s);+            more += wsize;+        }+        if (s->strm->avail_in == 0) break;++        /* If there was no sliding:+         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&+         *    more == window_size - lookahead - strstart+         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)+         * => more >= window_size - 2*WSIZE + 2+         * In the BIG_MEM or MMAP case (not yet supported),+         *   window_size == input_size + MIN_LOOKAHEAD  &&+         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.+         * Otherwise, window_size == 2*WSIZE so more >= 2.+         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.+         */+        Assert(more >= 2, "more < 2");++        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);+        s->lookahead += n;++        /* Initialize the hash value now that we have some input: */+        if (s->lookahead + s->insert >= MIN_MATCH) {+            uInt str = s->strstart - s->insert;+            s->ins_h = s->window[str];+            UPDATE_HASH(s, s->ins_h, s->window[str + 1]);+#if MIN_MATCH != 3+            Call UPDATE_HASH() MIN_MATCH-3 more times+#endif+            while (s->insert) {+                UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);+#ifndef FASTEST+                s->prev[str & s->w_mask] = s->head[s->ins_h];+#endif+                s->head[s->ins_h] = (Pos)str;+                str++;+                s->insert--;+                if (s->lookahead + s->insert < MIN_MATCH)+                    break;+            }+        }+        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,+         * but this is not important since only literal bytes will be emitted.+         */++    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);++    /* If the WIN_INIT bytes after the end of the current data have never been+     * written, then zero those bytes in order to avoid memory check reports of+     * the use of uninitialized (or uninitialised as Julian writes) bytes by+     * the longest match routines.  Update the high water mark for the next+     * time through here.  WIN_INIT is set to MAX_MATCH since the longest match+     * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.+     */+    if (s->high_water < s->window_size) {+        ulg curr = s->strstart + (ulg)(s->lookahead);+        ulg init;++        if (s->high_water < curr) {+            /* Previous high water mark below current data -- zero WIN_INIT+             * bytes or up to end of window, whichever is less.+             */+            init = s->window_size - curr;+            if (init > WIN_INIT)+                init = WIN_INIT;+            zmemzero(s->window + curr, (unsigned)init);+            s->high_water = curr + init;+        }+        else if (s->high_water < (ulg)curr + WIN_INIT) {+            /* High water mark at or above current data, but below current data+             * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up+             * to end of window, whichever is less.+             */+            init = (ulg)curr + WIN_INIT - s->high_water;+            if (init > s->window_size - s->high_water)+                init = s->window_size - s->high_water;+            zmemzero(s->window + s->high_water, (unsigned)init);+            s->high_water += init;+        }+    }++    Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,+           "not enough room for search");+}++/* ===========================================================================+ * Flush the current block, with given end-of-file flag.+ * IN assertion: strstart is set to the end of the current match.+ */+#define FLUSH_BLOCK_ONLY(s, last) { \+   _tr_flush_block(s, (s->block_start >= 0L ? \+                   (charf *)&s->window[(unsigned)s->block_start] : \+                   (charf *)Z_NULL), \+                (ulg)((long)s->strstart - s->block_start), \+                (last)); \+   s->block_start = s->strstart; \+   flush_pending(s->strm); \+   Tracev((stderr,"[FLUSH]")); \+}++/* Same but force premature exit if necessary. */+#define FLUSH_BLOCK(s, last) { \+   FLUSH_BLOCK_ONLY(s, last); \+   if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \+}++/* Maximum stored block length in deflate format (not including header). */+#define MAX_STORED 65535++/* Minimum of a and b. */+#define MIN(a, b) ((a) > (b) ? (b) : (a))++/* ===========================================================================+ * Copy without compression as much as possible from the input stream, return+ * the current block state.+ *+ * In case deflateParams() is used to later switch to a non-zero compression+ * level, s->matches (otherwise unused when storing) keeps track of the number+ * of hash table slides to perform. If s->matches is 1, then one hash table+ * slide will be done when switching. If s->matches is 2, the maximum value+ * allowed here, then the hash table will be cleared, since two or more slides+ * is the same as a clear.+ *+ * deflate_stored() is written to minimize the number of times an input byte is+ * copied. It is most efficient with large input and output buffers, which+ * maximizes the opportunites to have a single copy from next_in to next_out.+ */+local block_state deflate_stored(s, flush)+    deflate_state *s;+    int flush;+{+    /* Smallest worthy block size when not flushing or finishing. By default+     * this is 32K. This can be as small as 507 bytes for memLevel == 1. For+     * large input and output buffers, the stored block size will be larger.+     */+    unsigned min_block = MIN(s->pending_buf_size - 5, s->w_size);++    /* Copy as many min_block or larger stored blocks directly to next_out as+     * possible. If flushing, copy the remaining available input to next_out as+     * stored blocks, if there is enough space.+     */+    unsigned len, left, have, last = 0;+    unsigned used = s->strm->avail_in;+    do {+        /* Set len to the maximum size block that we can copy directly with the+         * available input data and output space. Set left to how much of that+         * would be copied from what's left in the window.+         */+        len = MAX_STORED;       /* maximum deflate stored block length */+        have = (s->bi_valid + 42) >> 3;         /* number of header bytes */+        if (s->strm->avail_out < have)          /* need room for header */+            break;+            /* maximum stored block length that will fit in avail_out: */+        have = s->strm->avail_out - have;+        left = s->strstart - s->block_start;    /* bytes left in window */+        if (len > (ulg)left + s->strm->avail_in)+            len = left + s->strm->avail_in;     /* limit len to the input */+        if (len > have)+            len = have;                         /* limit len to the output */++        /* If the stored block would be less than min_block in length, or if+         * unable to copy all of the available input when flushing, then try+         * copying to the window and the pending buffer instead. Also don't+         * write an empty block when flushing -- deflate() does that.+         */+        if (len < min_block && ((len == 0 && flush != Z_FINISH) ||+                                flush == Z_NO_FLUSH ||+                                len != left + s->strm->avail_in))+            break;++        /* Make a dummy stored block in pending to get the header bytes,+         * including any pending bits. This also updates the debugging counts.+         */+        last = flush == Z_FINISH && len == left + s->strm->avail_in ? 1 : 0;+        _tr_stored_block(s, (char *)0, 0L, last);++        /* Replace the lengths in the dummy stored block with len. */+        s->pending_buf[s->pending - 4] = len;+        s->pending_buf[s->pending - 3] = len >> 8;+        s->pending_buf[s->pending - 2] = ~len;+        s->pending_buf[s->pending - 1] = ~len >> 8;++        /* Write the stored block header bytes. */+        flush_pending(s->strm);++#ifdef ZLIB_DEBUG+        /* Update debugging counts for the data about to be copied. */+        s->compressed_len += len << 3;+        s->bits_sent += len << 3;+#endif++        /* Copy uncompressed bytes from the window to next_out. */+        if (left) {+            if (left > len)+                left = len;+            zmemcpy(s->strm->next_out, s->window + s->block_start, left);+            s->strm->next_out += left;+            s->strm->avail_out -= left;+            s->strm->total_out += left;+            s->block_start += left;+            len -= left;+        }++        /* Copy uncompressed bytes directly from next_in to next_out, updating+         * the check value.+         */+        if (len) {+            read_buf(s->strm, s->strm->next_out, len);+            s->strm->next_out += len;+            s->strm->avail_out -= len;+            s->strm->total_out += len;+        }+    } while (last == 0);++    /* Update the sliding window with the last s->w_size bytes of the copied+     * data, or append all of the copied data to the existing window if less+     * than s->w_size bytes were copied. Also update the number of bytes to+     * insert in the hash tables, in the event that deflateParams() switches to+     * a non-zero compression level.+     */+    used -= s->strm->avail_in;      /* number of input bytes directly copied */+    if (used) {+        /* If any input was used, then no unused input remains in the window,+         * therefore s->block_start == s->strstart.+         */+        if (used >= s->w_size) {    /* supplant the previous history */+            s->matches = 2;         /* clear hash */+            zmemcpy(s->window, s->strm->next_in - s->w_size, s->w_size);+            s->strstart = s->w_size;+        }+        else {+            if (s->window_size - s->strstart <= used) {+                /* Slide the window down. */+                s->strstart -= s->w_size;+                zmemcpy(s->window, s->window + s->w_size, s->strstart);+                if (s->matches < 2)+                    s->matches++;   /* add a pending slide_hash() */+            }+            zmemcpy(s->window + s->strstart, s->strm->next_in - used, used);+            s->strstart += used;+        }+        s->block_start = s->strstart;+        s->insert += MIN(used, s->w_size - s->insert);+    }+    if (s->high_water < s->strstart)+        s->high_water = s->strstart;++    /* If the last block was written to next_out, then done. */+    if (last)+        return finish_done;++    /* If flushing and all input has been consumed, then done. */+    if (flush != Z_NO_FLUSH && flush != Z_FINISH &&+        s->strm->avail_in == 0 && (long)s->strstart == s->block_start)+        return block_done;++    /* Fill the window with any remaining input. */+    have = s->window_size - s->strstart - 1;+    if (s->strm->avail_in > have && s->block_start >= (long)s->w_size) {+        /* Slide the window down. */+        s->block_start -= s->w_size;+        s->strstart -= s->w_size;+        zmemcpy(s->window, s->window + s->w_size, s->strstart);+        if (s->matches < 2)+            s->matches++;           /* add a pending slide_hash() */+        have += s->w_size;          /* more space now */+    }+    if (have > s->strm->avail_in)+        have = s->strm->avail_in;+    if (have) {+        read_buf(s->strm, s->window + s->strstart, have);+        s->strstart += have;+    }+    if (s->high_water < s->strstart)+        s->high_water = s->strstart;++    /* There was not enough avail_out to write a complete worthy or flushed+     * stored block to next_out. Write a stored block to pending instead, if we+     * have enough input for a worthy block, or if flushing and there is enough+     * room for the remaining input as a stored block in the pending buffer.+     */+    have = (s->bi_valid + 42) >> 3;         /* number of header bytes */+        /* maximum stored block length that will fit in pending: */+    have = MIN(s->pending_buf_size - have, MAX_STORED);+    min_block = MIN(have, s->w_size);+    left = s->strstart - s->block_start;+    if (left >= min_block ||+        ((left || flush == Z_FINISH) && flush != Z_NO_FLUSH &&+         s->strm->avail_in == 0 && left <= have)) {+        len = MIN(left, have);+        last = flush == Z_FINISH && s->strm->avail_in == 0 &&+               len == left ? 1 : 0;+        _tr_stored_block(s, (charf *)s->window + s->block_start, len, last);+        s->block_start += len;+        flush_pending(s->strm);+    }++    /* We've done all we can with the available input and output. */+    return last ? finish_started : need_more;+}++/* ===========================================================================+ * Compress as much as possible from the input stream, return the current+ * block state.+ * This function does not perform lazy evaluation of matches and inserts+ * new strings in the dictionary only for unmatched strings or for short+ * matches. It is used only for the fast compression options.+ */+local block_state deflate_fast(s, flush)+    deflate_state *s;+    int flush;+{+    IPos hash_head;       /* head of the hash chain */+    int bflush;           /* set if current block must be flushed */++    for (;;) {+        /* Make sure that we always have enough lookahead, except+         * at the end of the input file. We need MAX_MATCH bytes+         * for the next match, plus MIN_MATCH bytes to insert the+         * string following the next match.+         */+        if (s->lookahead < MIN_LOOKAHEAD) {+            fill_window(s);+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {+                return need_more;+            }+            if (s->lookahead == 0) break; /* flush the current block */+        }++        /* Insert the string window[strstart .. strstart+2] in the+         * dictionary, and set hash_head to the head of the hash chain:+         */+        hash_head = NIL;+        if (s->lookahead >= MIN_MATCH) {+            INSERT_STRING(s, s->strstart, hash_head);+        }++        /* Find the longest match, discarding those <= prev_length.+         * At this point we have always match_length < MIN_MATCH+         */+        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {+            /* To simplify the code, we prevent matches with the string+             * of window index 0 (in particular we have to avoid a match+             * of the string with itself at the start of the input file).+             */+            s->match_length = longest_match (s, hash_head);+            /* longest_match() sets match_start */+        }+        if (s->match_length >= MIN_MATCH) {+            check_match(s, s->strstart, s->match_start, s->match_length);++            _tr_tally_dist(s, s->strstart - s->match_start,+                           s->match_length - MIN_MATCH, bflush);++            s->lookahead -= s->match_length;++            /* Insert new strings in the hash table only if the match length+             * is not too large. This saves time but degrades compression.+             */+#ifndef FASTEST+            if (s->match_length <= s->max_insert_length &&+                s->lookahead >= MIN_MATCH) {+                s->match_length--; /* string at strstart already in table */+                do {+                    s->strstart++;+                    INSERT_STRING(s, s->strstart, hash_head);+                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are+                     * always MIN_MATCH bytes ahead.+                     */+                } while (--s->match_length != 0);+                s->strstart++;+            } else+#endif+            {+                s->strstart += s->match_length;+                s->match_length = 0;+                s->ins_h = s->window[s->strstart];+                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);+#if MIN_MATCH != 3+                Call UPDATE_HASH() MIN_MATCH-3 more times+#endif+                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not+                 * matter since it will be recomputed at next deflate call.+                 */+            }+        } else {+            /* No match, output a literal byte */+            Tracevv((stderr,"%c", s->window[s->strstart]));+            _tr_tally_lit (s, s->window[s->strstart], bflush);+            s->lookahead--;+            s->strstart++;+        }+        if (bflush) FLUSH_BLOCK(s, 0);+    }+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;+    if (flush == Z_FINISH) {+        FLUSH_BLOCK(s, 1);+        return finish_done;+    }+    if (s->last_lit)+        FLUSH_BLOCK(s, 0);+    return block_done;+}++#ifndef FASTEST+/* ===========================================================================+ * Same as above, but achieves better compression. We use a lazy+ * evaluation for matches: a match is finally adopted only if there is+ * no better match at the next window position.+ */+local block_state deflate_slow(s, flush)+    deflate_state *s;+    int flush;+{+    IPos hash_head;          /* head of hash chain */+    int bflush;              /* set if current block must be flushed */++    /* Process the input block. */+    for (;;) {+        /* Make sure that we always have enough lookahead, except+         * at the end of the input file. We need MAX_MATCH bytes+         * for the next match, plus MIN_MATCH bytes to insert the+         * string following the next match.+         */+        if (s->lookahead < MIN_LOOKAHEAD) {+            fill_window(s);+            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {+                return need_more;+            }+            if (s->lookahead == 0) break; /* flush the current block */+        }++        /* Insert the string window[strstart .. strstart+2] in the+         * dictionary, and set hash_head to the head of the hash chain:+         */+        hash_head = NIL;+        if (s->lookahead >= MIN_MATCH) {+            INSERT_STRING(s, s->strstart, hash_head);+        }++        /* Find the longest match, discarding those <= prev_length.+         */+        s->prev_length = s->match_length, s->prev_match = s->match_start;+        s->match_length = MIN_MATCH-1;++        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&+            s->strstart - hash_head <= MAX_DIST(s)) {+            /* To simplify the code, we prevent matches with the string+             * of window index 0 (in particular we have to avoid a match+             * of the string with itself at the start of the input file).+             */+            s->match_length = longest_match (s, hash_head);+            /* longest_match() sets match_start */++            if (s->match_length <= 5 && (s->strategy == Z_FILTERED+#if TOO_FAR <= 32767+                || (s->match_length == MIN_MATCH &&+                    s->strstart - s->match_start > TOO_FAR)+#endif+                )) {++                /* If prev_match is also MIN_MATCH, match_start is garbage+                 * but we will ignore the current match anyway.+                 */+                s->match_length = MIN_MATCH-1;+            }+        }+        /* If there was a match at the previous step and the current+         * match is not better, output the previous match:+         */+        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {+            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;+            /* Do not insert strings in hash table beyond this. */++            check_match(s, s->strstart-1, s->prev_match, s->prev_length);++            _tr_tally_dist(s, s->strstart -1 - s->prev_match,+                           s->prev_length - MIN_MATCH, bflush);++            /* Insert in hash table all strings up to the end of the match.+             * strstart-1 and strstart are already inserted. If there is not+             * enough lookahead, the last two strings are not inserted in+             * the hash table.+             */+            s->lookahead -= s->prev_length-1;+            s->prev_length -= 2;+            do {+                if (++s->strstart <= max_insert) {+                    INSERT_STRING(s, s->strstart, hash_head);+                }+            } while (--s->prev_length != 0);+            s->match_available = 0;+            s->match_length = MIN_MATCH-1;+            s->strstart++;++            if (bflush) FLUSH_BLOCK(s, 0);++        } else if (s->match_available) {+            /* If there was no match at the previous position, output a+             * single literal. If there was a match but the current match+             * is longer, truncate the previous match to a single literal.+             */+            Tracevv((stderr,"%c", s->window[s->strstart-1]));+            _tr_tally_lit(s, s->window[s->strstart-1], bflush);+            if (bflush) {+                FLUSH_BLOCK_ONLY(s, 0);+            }+            s->strstart++;+            s->lookahead--;+            if (s->strm->avail_out == 0) return need_more;+        } else {+            /* There is no previous match to compare with, wait for+             * the next step to decide.+             */+            s->match_available = 1;+            s->strstart++;+            s->lookahead--;+        }+    }+    Assert (flush != Z_NO_FLUSH, "no flush?");+    if (s->match_available) {+        Tracevv((stderr,"%c", s->window[s->strstart-1]));+        _tr_tally_lit(s, s->window[s->strstart-1], bflush);+        s->match_available = 0;+    }+    s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;+    if (flush == Z_FINISH) {+        FLUSH_BLOCK(s, 1);+        return finish_done;+    }+    if (s->last_lit)+        FLUSH_BLOCK(s, 0);+    return block_done;+}+#endif /* FASTEST */++/* ===========================================================================+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance+ * one.  Do not maintain a hash table.  (It will be regenerated if this run of+ * deflate switches away from Z_RLE.)+ */+local block_state deflate_rle(s, flush)+    deflate_state *s;+    int flush;+{+    int bflush;             /* set if current block must be flushed */+    uInt prev;              /* byte at distance one to match */+    Bytef *scan, *strend;   /* scan goes up to strend for length of run */++    for (;;) {+        /* Make sure that we always have enough lookahead, except+         * at the end of the input file. We need MAX_MATCH bytes+         * for the longest run, plus one for the unrolled loop.+         */+        if (s->lookahead <= MAX_MATCH) {+            fill_window(s);+            if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {+                return need_more;+            }+            if (s->lookahead == 0) break; /* flush the current block */+        }++        /* See how many times the previous byte repeats */+        s->match_length = 0;+        if (s->lookahead >= MIN_MATCH && s->strstart > 0) {+            scan = s->window + s->strstart - 1;+            prev = *scan;+            if (prev == *++scan && prev == *++scan && prev == *++scan) {+                strend = s->window + s->strstart + MAX_MATCH;+                do {+                } while (prev == *++scan && prev == *++scan &&+                         prev == *++scan && prev == *++scan &&+                         prev == *++scan && prev == *++scan &&+                         prev == *++scan && prev == *++scan &&+                         scan < strend);+                s->match_length = MAX_MATCH - (uInt)(strend - scan);+                if (s->match_length > s->lookahead)+                    s->match_length = s->lookahead;+            }+            Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");+        }++        /* Emit match if have run of MIN_MATCH or longer, else emit literal */+        if (s->match_length >= MIN_MATCH) {+            check_match(s, s->strstart, s->strstart - 1, s->match_length);++            _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);++            s->lookahead -= s->match_length;+            s->strstart += s->match_length;+            s->match_length = 0;+        } else {+            /* No match, output a literal byte */+            Tracevv((stderr,"%c", s->window[s->strstart]));+            _tr_tally_lit (s, s->window[s->strstart], bflush);+            s->lookahead--;+            s->strstart++;+        }+        if (bflush) FLUSH_BLOCK(s, 0);+    }+    s->insert = 0;+    if (flush == Z_FINISH) {+        FLUSH_BLOCK(s, 1);+        return finish_done;+    }+    if (s->last_lit)+        FLUSH_BLOCK(s, 0);+    return block_done;+}++/* ===========================================================================+ * For Z_HUFFMAN_ONLY, do not look for matches.  Do not maintain a hash table.+ * (It will be regenerated if this run of deflate switches away from Huffman.)+ */+local block_state deflate_huff(s, flush)+    deflate_state *s;+    int flush;+{+    int bflush;             /* set if current block must be flushed */++    for (;;) {+        /* Make sure that we have a literal to write. */+        if (s->lookahead == 0) {+            fill_window(s);+            if (s->lookahead == 0) {+                if (flush == Z_NO_FLUSH)+                    return need_more;+                break;      /* flush the current block */+            }+        }++        /* Output a literal byte */+        s->match_length = 0;+        Tracevv((stderr,"%c", s->window[s->strstart]));+        _tr_tally_lit (s, s->window[s->strstart], bflush);+        s->lookahead--;+        s->strstart++;+        if (bflush) FLUSH_BLOCK(s, 0);+    }+    s->insert = 0;+    if (flush == Z_FINISH) {+        FLUSH_BLOCK(s, 1);+        return finish_done;+    }+    if (s->last_lit)+        FLUSH_BLOCK(s, 0);+    return block_done;+}

@@ -0,0 +1,349 @@+/* deflate.h -- internal compression state+ * Copyright (C) 1995-2016 Jean-loup Gailly+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++/* WARNING: this file should *not* be used by applications. It is+   part of the implementation of the compression library and is+   subject to change. Applications should only use zlib.h.+ */++/* @(#) $Id$ */++#ifndef DEFLATE_H+#define DEFLATE_H++#include "zutil.h"++/* define NO_GZIP when compiling if you want to disable gzip header and+   trailer creation by deflate().  NO_GZIP would be used to avoid linking in+   the crc code when it is not needed.  For shared libraries, gzip encoding+   should be left enabled. */+#ifndef NO_GZIP+#  define GZIP+#endif++/* ===========================================================================+ * Internal compression state.+ */++#define LENGTH_CODES 29+/* number of length codes, not counting the special END_BLOCK code */++#define LITERALS  256+/* number of literal bytes 0..255 */++#define L_CODES (LITERALS+1+LENGTH_CODES)+/* number of Literal or Length codes, including the END_BLOCK code */++#define D_CODES   30+/* number of distance codes */++#define BL_CODES  19+/* number of codes used to transfer the bit lengths */++#define HEAP_SIZE (2*L_CODES+1)+/* maximum heap size */++#define MAX_BITS 15+/* All codes must not exceed MAX_BITS bits */++#define Buf_size 16+/* size of bit buffer in bi_buf */++#define INIT_STATE    42    /* zlib header -> BUSY_STATE */+#ifdef GZIP+#  define GZIP_STATE  57    /* gzip header -> BUSY_STATE | EXTRA_STATE */+#endif+#define EXTRA_STATE   69    /* gzip extra block -> NAME_STATE */+#define NAME_STATE    73    /* gzip file name -> COMMENT_STATE */+#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 {+    union {+        ush  freq;       /* frequency count */+        ush  code;       /* bit string */+    } fc;+    union {+        ush  dad;        /* father node in Huffman tree */+        ush  len;        /* length of bit string */+    } dl;+} FAR ct_data;++#define Freq fc.freq+#define Code fc.code+#define Dad  dl.dad+#define Len  dl.len++typedef struct static_tree_desc_s  static_tree_desc;++typedef struct tree_desc_s {+    ct_data *dyn_tree;           /* the dynamic tree */+    int     max_code;            /* largest code with non zero frequency */+    const static_tree_desc *stat_desc;  /* the corresponding static tree */+} FAR tree_desc;++typedef ush Pos;+typedef Pos FAR Posf;+typedef unsigned IPos;++/* A Pos is an index in the character window. We use short instead of int to+ * save space in the various tables. IPos is used only for parameter passing.+ */++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 */+    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 */+    ulg   gzindex;       /* where in extra, name, or comment */+    Byte  method;        /* can only be DEFLATED */+    int   last_flush;    /* value of flush param for previous deflate call */++                /* used by deflate.c: */++    uInt  w_size;        /* LZ77 window size (32K by default) */+    uInt  w_bits;        /* log2(w_size)  (8..16) */+    uInt  w_mask;        /* w_size - 1 */++    Bytef *window;+    /* Sliding window. Input bytes are read into the second half of the window,+     * and move to the first half later to keep a dictionary of at least wSize+     * bytes. With this organization, matches are limited to a distance of+     * wSize-MAX_MATCH bytes, but this ensures that IO is always+     * performed with a length multiple of the block size. Also, it limits+     * the window size to 64K, which is quite useful on MSDOS.+     * To do: use the user input buffer as sliding window.+     */++    ulg window_size;+    /* Actual size of window: 2*wSize, except when the user input buffer+     * is directly used as sliding window.+     */++    Posf *prev;+    /* Link to older string with same hash index. To limit the size of this+     * array to 64K, this link is maintained only for the last 32K strings.+     * An index in this array is thus a window index modulo 32K.+     */++    Posf *head; /* Heads of the hash chains or NIL. */++    uInt  ins_h;          /* hash index of string to be inserted */+    uInt  hash_size;      /* number of elements in hash table */+    uInt  hash_bits;      /* log2(hash_size) */+    uInt  hash_mask;      /* hash_size-1 */++    uInt  hash_shift;+    /* Number of bits by which ins_h must be shifted at each input+     * step. It must be such that after MIN_MATCH steps, the oldest+     * byte no longer takes part in the hash key, that is:+     *   hash_shift * MIN_MATCH >= hash_bits+     */++    long block_start;+    /* Window position at the beginning of the current output block. Gets+     * negative when the window is moved backwards.+     */++    uInt match_length;           /* length of best match */+    IPos prev_match;             /* previous match */+    int match_available;         /* set if previous match exists */+    uInt strstart;               /* start of string to insert */+    uInt match_start;            /* start of matching string */+    uInt lookahead;              /* number of valid bytes ahead in window */++    uInt prev_length;+    /* Length of the best match at previous step. Matches not greater than this+     * are discarded. This is used in the lazy match evaluation.+     */++    uInt max_chain_length;+    /* To speed up deflation, hash chains are never searched beyond this+     * length.  A higher limit improves compression ratio but degrades the+     * speed.+     */++    uInt max_lazy_match;+    /* Attempt to find a better match only when the current match is strictly+     * smaller than this value. This mechanism is used only for compression+     * levels >= 4.+     */+#   define max_insert_length  max_lazy_match+    /* Insert new strings in the hash table only if the match length is not+     * greater than this length. This saves time but degrades compression.+     * max_insert_length is used only for compression levels <= 3.+     */++    int level;    /* compression level (1..9) */+    int strategy; /* favor or force Huffman coding*/++    uInt good_match;+    /* Use a faster search when the previous match is longer than this */++    int nice_match; /* Stop searching when current match exceeds this */++                /* used by trees.c: */+    /* Didn't use ct_data typedef below to suppress compiler warning */+    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */+    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */+    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */++    struct tree_desc_s l_desc;               /* desc. for literal tree */+    struct tree_desc_s d_desc;               /* desc. for distance tree */+    struct tree_desc_s bl_desc;              /* desc. for bit length tree */++    ush bl_count[MAX_BITS+1];+    /* number of codes at each bit length for an optimal tree */++    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */+    int heap_len;               /* number of elements in the heap */+    int heap_max;               /* element of largest frequency */+    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.+     * The same heap array is used to build all trees.+     */++    uch depth[2*L_CODES+1];+    /* Depth of each subtree used as tie breaker for trees of equal frequency+     */++    uchf *l_buf;          /* buffer for literals or lengths */++    uInt  lit_bufsize;+    /* Size of match buffer for literals/lengths.  There are 4 reasons for+     * limiting lit_bufsize to 64K:+     *   - frequencies can be kept in 16 bit counters+     *   - if compression is not successful for the first block, all input+     *     data is still in the window so we can still emit a stored block even+     *     when input comes from standard input.  (This can also be done for+     *     all blocks if lit_bufsize is not greater than 32K.)+     *   - if compression is not successful for a file smaller than 64K, we can+     *     even emit a stored file instead of a stored block (saving 5 bytes).+     *     This is applicable only for zip (not gzip or zlib).+     *   - creating new Huffman trees less frequently may not provide fast+     *     adaptation to changes in the input data statistics. (Take for+     *     example a binary file with poorly compressible code followed by+     *     a highly compressible string table.) Smaller buffer sizes give+     *     fast adaptation but have of course the overhead of transmitting+     *     trees more frequently.+     *   - I can't count above 4+     */++    uInt last_lit;      /* running index in l_buf */++    ushf *d_buf;+    /* Buffer for distances. To simplify the code, d_buf and l_buf have+     * the same number of elements. To use different lengths, an extra flag+     * array would be necessary.+     */++    ulg opt_len;        /* bit length of current block with optimal trees */+    ulg static_len;     /* bit length of current block with static trees */+    uInt matches;       /* number of string matches in current block */+    uInt insert;        /* bytes at end of window left to insert */++#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++    ush bi_buf;+    /* Output buffer. bits are inserted starting at the bottom (least+     * significant bits).+     */+    int bi_valid;+    /* Number of valid bits in bi_buf.  All bits above the last valid bit+     * are always zero.+     */++    ulg high_water;+    /* High water mark offset in window for initialized bytes -- bytes above+     * this are set to zero in order to avoid memory check warnings when+     * longest match routines access bytes past the input.  This is then+     * updated to the new high water mark.+     */++} FAR deflate_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++] = (Bytef)(c);}+++#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)+/* Minimum amount of lookahead, except at the end of the input file.+ * See deflate.c for comments about the MIN_MATCH+1.+ */++#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)+/* In order to simplify the code, particularly on 16 bit machines, match+ * distances are limited to MAX_DIST instead of WSIZE.+ */++#define WIN_INIT MAX_MATCH+/* Number of bytes after end of data in window to initialize in order to avoid+   memory checker errors from longest match routines */++        /* in trees.c */+void ZLIB_INTERNAL _tr_init OF((deflate_state *s));+int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));+void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,+                        ulg stored_len, int last));+void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));+void ZLIB_INTERNAL _tr_align OF((deflate_state *s));+void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,+                        ulg stored_len, int last));++#define d_code(dist) \+   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])+/* Mapping from a distance to a distance code. dist is the distance - 1 and+ * must not have side effects. _dist_code[256] and _dist_code[257] are never+ * used.+ */++#ifndef ZLIB_DEBUG+/* Inline versions of _tr_tally for speed: */++#if defined(GEN_TREES_H) || !defined(STDC)+  extern uch ZLIB_INTERNAL _length_code[];+  extern uch ZLIB_INTERNAL _dist_code[];+#else+  extern const uch ZLIB_INTERNAL _length_code[];+  extern const uch ZLIB_INTERNAL _dist_code[];+#endif++# define _tr_tally_lit(s, c, flush) \+  { uch cc = (c); \+    s->d_buf[s->last_lit] = 0; \+    s->l_buf[s->last_lit++] = cc; \+    s->dyn_ltree[cc].Freq++; \+    flush = (s->last_lit == s->lit_bufsize-1); \+   }+# define _tr_tally_dist(s, distance, length, flush) \+  { uch len = (uch)(length); \+    ush dist = (ush)(distance); \+    s->d_buf[s->last_lit] = dist; \+    s->l_buf[s->last_lit++] = len; \+    dist--; \+    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \+    s->dyn_dtree[d_code(dist)].Freq++; \+    flush = (s->last_lit == s->lit_bufsize-1); \+  }+#else+# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)+# define _tr_tally_dist(s, distance, length, flush) \+              flush = _tr_tally(s, distance, length)+#endif++#endif /* DEFLATE_H */

@@ -0,0 +1,218 @@+/* gzguts.h -- zlib internal header definitions for gz* operations+ * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++#ifdef _LARGEFILE64_SOURCE+#  ifndef _LARGEFILE_SOURCE+#    define _LARGEFILE_SOURCE 1+#  endif+#  ifdef _FILE_OFFSET_BITS+#    undef _FILE_OFFSET_BITS+#  endif+#endif++#ifdef HAVE_HIDDEN+#  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))+#else+#  define ZLIB_INTERNAL+#endif++#include <stdio.h>+#include "zlib.h"+#ifdef STDC+#  include <string.h>+#  include <stdlib.h>+#  include <limits.h>+#endif++#ifndef _POSIX_SOURCE+#  define _POSIX_SOURCE+#endif+#include <fcntl.h>++#ifdef _WIN32+#  include <stddef.h>+#endif++#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)+#  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++#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)+#  ifndef HAVE_VSNPRINTF+#    define HAVE_VSNPRINTF+#  endif+#endif++#if defined(__CYGWIN__)+#  ifndef HAVE_VSNPRINTF+#    define HAVE_VSNPRINTF+#  endif+#endif++#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)+#  ifndef HAVE_VSNPRINTF+#    define HAVE_VSNPRINTF+#  endif+#endif++#ifndef HAVE_VSNPRINTF+#  ifdef MSDOS+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),+   but for now we just assume it doesn't. */+#    define NO_vsnprintf+#  endif+#  ifdef __TURBOC__+#    define NO_vsnprintf+#  endif+#  ifdef WIN32+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */+#    if !defined(vsnprintf) && !defined(NO_vsnprintf)+#      if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )+#         define vsnprintf _vsnprintf+#      endif+#    endif+#  endif+#  ifdef __SASC+#    define NO_vsnprintf+#  endif+#  ifdef VMS+#    define NO_vsnprintf+#  endif+#  ifdef __OS400__+#    define NO_vsnprintf+#  endif+#  ifdef __MVS__+#    define NO_vsnprintf+#  endif+#endif++/* 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+/* 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+  extern voidp  malloc OF((uInt size));+  extern void   free   OF((voidpf ptr));+#endif++/* get errno and strerror definition */+#if defined UNDER_CE+#  include <windows.h>+#  define zstrerror() gz_strwinerror((DWORD)GetLastError())+#else+#  ifndef NO_STRERROR+#    include <errno.h>+#    define zstrerror() strerror(errno)+#  else+#    define zstrerror() "stdio error (consult errno)"+#  endif+#endif++/* provide prototypes for these when building zlib without LFS */+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0+    ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));+    ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));+    ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));+    ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));+#endif++/* default memLevel */+#if MAX_MEM_LEVEL >= 8+#  define DEF_MEM_LEVEL 8+#else+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL+#endif++/* default i/o buffer size -- double this for output when reading (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 */+#define GZ_NONE 0+#define GZ_READ 7247+#define GZ_WRITE 31153+#define GZ_APPEND 1     /* mode set to GZ_WRITE after the file is opened */++/* values for gz_state how */+#define LOOK 0      /* look for a gzip header */+#define COPY 1      /* copy input directly */+#define GZIP 2      /* decompress a gzip stream */++/* internal gzip file state data structure */+typedef struct {+        /* exposed contents for gzgetc() macro */+    struct gzFile_s x;      /* "x" for exposed */+                            /* x.have: number of bytes available at x.next */+                            /* x.next: next output data to deliver or write */+                            /* x.pos: current position in uncompressed data */+        /* used for both reading and writing */+    int mode;               /* see gzip modes above */+    int fd;                 /* file descriptor */+    char *path;             /* path or fd for error messages */+    unsigned size;          /* buffer size, zero if not allocated yet */+    unsigned want;          /* requested buffer size, default is GZBUFSIZE */+    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 */+    int how;                /* 0: get header, 1: copy, 2: decompress */+    z_off64_t start;        /* where the gzip data started, for rewinding */+    int eof;                /* true if end of input file reached */+    int past;               /* true if read requested past end */+        /* just for writing */+    int level;              /* compression level */+    int strategy;           /* compression strategy */+        /* seek request */+    z_off64_t skip;         /* amount to skip (already rewound if backwards) */+    int seek;               /* true if seek request pending */+        /* error information */+    int err;                /* error code */+    char *msg;              /* error message */+        /* zlib inflate or deflate stream */+    z_stream strm;          /* stream structure in-place (not a pointer) */+} gz_state;+typedef gz_state FAR *gz_statep;++/* shared functions */+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));+#if defined UNDER_CE+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));+#endif++/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t+   value -- needed when comparing unsigned to z_off64_t, which is signed+   (possible z_off64_t types off_t, off64_t, and long are all signed) */+#ifdef INT_MAX+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)+#else+unsigned ZLIB_INTERNAL gz_intmax OF((void));+#  define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())+#endif

@@ -0,0 +1,640 @@+/* infback.c -- inflate using a call-back interface+ * Copyright (C) 1995-2016 Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++/*+   This code is largely copied from inflate.c.  Normally either infback.o or+   inflate.o would be linked into an application--not both.  The interface+   with inffast.c is retained so that optimized assembler-coded versions of+   inflate_fast() can be used with either inflate.c or infback.c.+ */++#include "zutil.h"+#include "inftrees.h"+#include "inflate.h"+#include "inffast.h"++/* function prototypes */+local void fixedtables OF((struct inflate_state FAR *state));++/*+   strm provides memory allocation functions in zalloc and zfree, or+   Z_NULL to use the library memory allocation functions.++   windowBits is in the range 8..15, and window is a user-supplied+   window and output buffer that is 2**windowBits bytes.+ */+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)+z_streamp strm;+int windowBits;+unsigned char FAR *window;+const char *version;+int stream_size;+{+    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) {+#ifdef Z_SOLO+        return Z_STREAM_ERROR;+#else+        strm->zalloc = zcalloc;+        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 = (uInt)windowBits;+    state->wsize = 1U << windowBits;+    state->window = window;+    state->wnext = 0;+    state->whave = 0;+    return Z_OK;+}++/*+   Return state with length and distance decoding tables and index sizes set to+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.+   If BUILDFIXED is defined, then instead this routine builds the tables the+   first time it's called, and returns those tables the first time and+   thereafter.  This reduces the size of the code by about 2K bytes, in+   exchange for a little execution time.  However, BUILDFIXED should not be+   used for threaded applications, since the rewriting of the tables and virgin+   may not be thread-safe.+ */+local void fixedtables(state)+struct inflate_state FAR *state;+{+#ifdef BUILDFIXED+    static int virgin = 1;+    static code *lenfix, *distfix;+    static code fixed[544];++    /* build fixed huffman tables if first call (may not be thread safe) */+    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;+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);++        /* 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);++        /* do this just once */+        virgin = 0;+    }+#else /* !BUILDFIXED */+#   include "inffixed.h"+#endif /* BUILDFIXED */+    state->lencode = lenfix;+    state->lenbits = 9;+    state->distcode = distfix;+    state->distbits = 5;+}++/* Macros for inflateBack(): */++/* Load returned state from inflate_fast() */+#define LOAD() \+    do { \+        put = strm->next_out; \+        left = strm->avail_out; \+        next = strm->next_in; \+        have = strm->avail_in; \+        hold = state->hold; \+        bits = state->bits; \+    } while (0)++/* Set state from registers for inflate_fast() */+#define RESTORE() \+    do { \+        strm->next_out = put; \+        strm->avail_out = left; \+        strm->next_in = next; \+        strm->avail_in = have; \+        state->hold = hold; \+        state->bits = bits; \+    } while (0)++/* Clear the input bit accumulator */+#define INITBITS() \+    do { \+        hold = 0; \+        bits = 0; \+    } while (0)++/* Assure that some input is available.  If input is requested, but denied,+   then return a Z_BUF_ERROR from inflateBack(). */+#define PULL() \+    do { \+        if (have == 0) { \+            have = in(in_desc, &next); \+            if (have == 0) { \+                next = Z_NULL; \+                ret = Z_BUF_ERROR; \+                goto inf_leave; \+            } \+        } \+    } while (0)++/* Get a byte of input into the bit accumulator, or return from inflateBack()+   with an error if there is no input available. */+#define PULLBYTE() \+    do { \+        PULL(); \+        have--; \+        hold += (unsigned long)(*next++) << bits; \+        bits += 8; \+    } 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+   an error. */+#define NEEDBITS(n) \+    do { \+        while (bits < (unsigned)(n)) \+            PULLBYTE(); \+    } while (0)++/* Return the low n bits of the bit accumulator (n < 16) */+#define BITS(n) \+    ((unsigned)hold & ((1U << (n)) - 1))++/* Remove n bits from the bit accumulator */+#define DROPBITS(n) \+    do { \+        hold >>= (n); \+        bits -= (unsigned)(n); \+    } while (0)++/* Remove zero to seven bits as needed to go to a byte boundary */+#define BYTEBITS() \+    do { \+        hold >>= bits & 7; \+        bits -= bits & 7; \+    } 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+   Z_BUF_ERROR. */+#define ROOM() \+    do { \+        if (left == 0) { \+            put = state->window; \+            left = state->wsize; \+            state->whave = left; \+            if (out(out_desc, put, left)) { \+                ret = Z_BUF_ERROR; \+                goto inf_leave; \+            } \+        } \+    } while (0)++/*+   strm provides the memory allocation functions and window buffer on input,+   and provides information on the unused input on return.  For Z_DATA_ERROR+   returns, strm will also provide an error message.++   in() and out() are the call-back input and output functions.  When+   inflateBack() needs more input, it calls in().  When inflateBack() has+   filled the window with output, or when it completes with data in the+   window, it calls out() to write out the data.  The application must not+   change the provided input until in() is called again or inflateBack()+   returns.  The application must not change the window/output buffer until+   inflateBack() returns.++   in() and out() are called with a descriptor parameter provided in the+   inflateBack() call.  This parameter can be a structure that provides the+   information required to do the read or write, as well as accumulated+   information on the input and output such as totals and check values.++   in() should return zero on failure.  out() should return non-zero on+   failure.  If either in() or out() fails, than inflateBack() returns a+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it+   was in() or out() that caused in the error.  Otherwise,  inflateBack()+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format+   error, or Z_MEM_ERROR if it could not allocate memory for the 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.+ */+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;+{+    struct inflate_state FAR *state;+    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 */+    unsigned bits;              /* bits in bit buffer */+    unsigned copy;              /* number of stored or match bytes to copy */+    unsigned char FAR *from;    /* where to copy match bytes from */+    code here;                  /* current decoding table entry */+    code last;                  /* parent table entry */+    unsigned len;               /* length to copy for repeats, bits to drop */+    int ret;                    /* return code */+    static const unsigned short order[19] = /* permutation of code lengths */+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};++    /* 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 */+    strm->msg = Z_NULL;+    state->mode = TYPE;+    state->last = 0;+    state->whave = 0;+    next = strm->next_in;+    have = next != Z_NULL ? strm->avail_in : 0;+    hold = 0;+    bits = 0;+    put = state->window;+    left = state->wsize;++    /* Inflate until end of block marked as last */+    for (;;)+        switch (state->mode) {+        case TYPE:+            /* determine and dispatch block type */+            if (state->last) {+                BYTEBITS();+                state->mode = DONE;+                break;+            }+            NEEDBITS(3);+            state->last = BITS(1);+            DROPBITS(1);+            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;++        case STORED:+            /* get and verify stored block length */+            BYTEBITS();                         /* go to byte boundary */+            NEEDBITS(32);+            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) {+                copy = state->length;+                PULL();+                ROOM();+                if (copy > have) copy = have;+                if (copy > left) copy = left;+                zmemcpy(put, next, copy);+                have -= copy;+                next += copy;+                left -= copy;+                put += copy;+                state->length -= copy;+            }+            Tracev((stderr, "inflate:       stored end\n"));+            state->mode = TYPE;+            break;++        case TABLE:+            /* get dynamic table entries descriptor */+            NEEDBITS(14);+            state->nlen = BITS(5) + 257;+            DROPBITS(5);+            state->ndist = BITS(5) + 1;+            DROPBITS(5);+            state->ncode = BITS(4) + 4;+            DROPBITS(4);+#ifndef PKZIP_BUG_WORKAROUND+            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) {+                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) {+                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) {+                for (;;) {+                    here = state->lencode[BITS(state->lenbits)];+                    if ((unsigned)(here.bits) <= bits) break;+                    PULLBYTE();+                }+                if (here.val < 16) {+                    DROPBITS(here.bits);+                    state->lens[state->have++] = here.val;+                }+                else {+                    if (here.val == 16) {+                        NEEDBITS(here.bits + 2);+                        DROPBITS(here.bits);+                        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) {+                        NEEDBITS(here.bits + 3);+                        DROPBITS(here.bits);+                        len = 0;+                        copy = 3 + BITS(3);+                        DROPBITS(3);+                    }+                    else {+                        NEEDBITS(here.bits + 7);+                        DROPBITS(here.bits);+                        len = 0;+                        copy = 11 + BITS(7);+                        DROPBITS(7);+                    }+                    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;+                }+            }++            /* handle error breaks in while */+            if (state->mode == BAD) break;++            /* check for end-of-block code (better have one) */+            if (state->lens[256] == 0) {+                strm->msg = (char *)"invalid code -- missing end-of-block";+                state->mode = BAD;+                break;+            }++            /* build code tables -- note: do not change the lenbits or distbits+               values here (9 and 6) without reading the comments in inftrees.h+               concerning the ENOUGH constants, which depend on those values */+            state->next = state->codes;+            state->lencode = (code const FAR *)(state->next);+            state->lenbits = 9;+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),+                                &(state->lenbits), state->work);+            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) {+                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) {+                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 (;;) {+                here = state->lencode[BITS(state->lenbits)];+                if ((unsigned)(here.bits) <= bits) break;+                PULLBYTE();+            }+            if (here.op && (here.op & 0xf0) == 0) {+                last = here;+                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) {+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?+                        "inflate:         literal '%c'\n" :+                        "inflate:         literal 0x%02x\n", here.val));+                ROOM();+                *put++ = (unsigned char)(state->length);+                left--;+                state->mode = LEN;+                break;+            }++            /* process end of block */+            if (here.op & 32) {+                Tracevv((stderr, "inflate:         end of block\n"));+                state->mode = TYPE;+                break;+            }++            /* invalid code */+            if (here.op & 64) {+                strm->msg = (char *)"invalid literal/length code";+                state->mode = BAD;+                break;+            }++            /* length code -- get extra bits, if any */+            state->extra = (unsigned)(here.op) & 15;+            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 (;;) {+                here = state->distcode[BITS(state->distbits)];+                if ((unsigned)(here.bits) <= bits) break;+                PULLBYTE();+            }+            if ((here.op & 0xf0) == 0) {+                last = here;+                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) {+                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) {+                NEEDBITS(state->extra);+                state->offset += BITS(state->extra);+                DROPBITS(state->extra);+            }+            if (state->offset > state->wsize - (state->whave < state->wsize ?+                                                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 {+                ROOM();+                copy = state->wsize - state->offset;+                if (copy < left) {+                    from = put + copy;+                    copy = left - copy;+                }+                else {+                    from = put - state->offset;+                    copy = left;+                }+                if (copy > state->length) copy = state->length;+                state->length -= copy;+                left -= copy;+                do {+                    *put++ = *from++;+                } while (--copy);+            } while (state->length != 0);+            break;++        case DONE:+            /* inflate stream terminated properly -- write leftover output */+            ret = Z_STREAM_END;+            if (left < state->wsize) {+                if (out(out_desc, state->window, state->wsize - left))+                    ret = Z_BUF_ERROR;+            }+            goto inf_leave;++        case BAD:+            ret = Z_DATA_ERROR;+            goto inf_leave;++        default:                /* can't happen, but makes compilers happy */+            ret = Z_STREAM_ERROR;+            goto inf_leave;+        }++    /* Return unused input */+  inf_leave:+    strm->next_in = next;+    strm->avail_in = have;+    return ret;+}++int ZEXPORT inflateBackEnd(strm)+z_streamp strm;+{+    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"));+    return Z_OK;+}

@@ -0,0 +1,323 @@+/* inffast.c -- fast decoding+ * Copyright (C) 1995-2017 Mark Adler+ * For conditions of distribution and use, see copyright notice in zlib.h+ */++#include "zutil.h"+#include "inftrees.h"+#include "inflate.h"+#include "inffast.h"++#ifdef ASMINF+#  pragma message("Assembler code may have bugs -- use at your own risk")+#else++/*+   Decode literal, length, and distance codes and write out the resulting+   literal and match bytes until either not enough input or output is+   available, an end-of-block is encountered, or a data error is encountered.+   When large enough input and output buffers are supplied to inflate(), for+   example, a 16K input buffer and a 64K output buffer, more than 95% of the+   inflate execution time is spent in this routine.++   Entry assumptions:++        state->mode == LEN+        strm->avail_in >= 6+        strm->avail_out >= 258+        start >= strm->avail_out+        state->bits < 8++   On return, state->mode is one of:++        LEN -- ran out of enough output space or enough available input+        TYPE -- reached end of block code, inflate() to interpret next block+        BAD -- error in block data++   Notes:++    - The maximum input bits used by a length/distance pair is 15 bits for the+      length code, 5 bits for the length extra, 15 bits for the distance code,+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.+      Therefore if strm->avail_in >= 6, then there is enough input to avoid+      checking for available input while decoding.++    - The maximum bytes that a single length/distance pair can output is 258+      bytes, which is the maximum length that can be coded.  inflate_fast()+      requires strm->avail_out >= 258 for each loop to avoid checking for+      output space.+ */+void ZLIB_INTERNAL inflate_fast(strm, start)+z_streamp strm;+unsigned start;         /* inflate()'s starting value for strm->avail_out */+{+    struct inflate_state FAR *state;+    z_const unsigned char FAR *in;      /* local strm->next_in */+    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 */+#ifdef INFLATE_STRICT+    unsigned dmax;              /* maximum distance from zlib header */+#endif+    unsigned wsize;             /* window size or zero if not using window */+    unsigned whave;             /* valid bytes in the window */+    unsigned wnext;             /* window write index */+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */+    unsigned long hold;         /* local strm->hold */+    unsigned bits;              /* local strm->bits */+    code const FAR *lcode;      /* local strm->lencode */+    code const FAR *dcode;      /* local strm->distcode */+    unsigned lmask;             /* mask for first level of length codes */+    unsigned dmask;             /* mask for first level of distance codes */+    code here;                  /* retrieved table entry */+    unsigned op;                /* code bits, operation, extra bits, or */+                                /*  window position, window bytes to copy */+    unsigned len;               /* match length, unused bytes */+    unsigned dist;              /* match distance */+    unsigned char FAR *from;    /* where to copy match from */++    /* copy state to local variables */+    state = (struct inflate_state FAR *)strm->state;+    in = strm->next_in;+    last = in + (strm->avail_in - 5);+    out = strm->next_out;+    beg = out - (start - strm->avail_out);+    end = out + (strm->avail_out - 257);+#ifdef INFLATE_STRICT+    dmax = state->dmax;+#endif+    wsize = state->wsize;+    whave = state->whave;+    wnext = state->wnext;+    window = state->window;+    hold = state->hold;+    bits = state->bits;+    lcode = state->lencode;+    dcode = state->distcode;+    lmask = (1U << state->lenbits) - 1;+    dmask = (1U << state->distbits) - 1;++    /* decode literals and length/distances until end-of-block or not enough+       input data or output space */+    do {+        if (bits < 15) {+            hold += (unsigned long)(*in++) << bits;+            bits += 8;+            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 */+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?+                    "inflate:         literal '%c'\n" :+                    "inflate:         literal 0x%02x\n", here.val));+            *out++ = (unsigned char)(here.val);+        }+        else if (op & 16) {                     /* length base */+            len = (unsigned)(here.val);+            op &= 15;                           /* number of extra bits */+            if (op) {+                if (bits < op) {+                    hold += (unsigned long)(*in++) << bits;+                    bits += 8;+                }+                len += (unsigned)hold & ((1U << op) - 1);+                hold >>= op;+                bits -= op;+            }+            Tracevv((stderr, "inflate:         length %u\n", len));+            if (bits < 15) {+                hold += (unsigned long)(*in++) << bits;+                bits += 8;+                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 */+                dist = (unsigned)(here.val);+                op &= 15;                       /* number of extra bits */+                if (bits < op) {+                    hold += (unsigned long)(*in++) << bits;+                    bits += 8;+                    if (bits < op) {+                        hold += (unsigned long)(*in++) << bits;+                        bits += 8;+                    }+                }+                dist += (unsigned)hold & ((1U << op) - 1);+#ifdef INFLATE_STRICT+                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 */+                    op = dist - op;             /* distance back in window */+                    if (op > whave) {+                        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) {+                            do {+                                *out++ = 0;+                            } while (--len);+                            continue;+                        }+                        len -= op - whave;+                        do {+                            *out++ = 0;+                        } while (--op > whave);+                        if (op == 0) {+                            from = out - dist;+                            do {+                                *out++ = *from++;+                            } while (--len);+                            continue;+                        }+#endif+                    }+                    from = window;+                    if (wnext == 0) {           /* very common case */+                        from += wsize - op;+                        if (op < len) {         /* some from window */+                            len -= op;+                            do {+                                *out++ = *from++;+                            } while (--op);+                            from = out - dist;  /* rest from output */+                        }+                    }+                    else if (wnext < op) {      /* wrap around window */+                        from += wsize + wnext - op;+                        op -= wnext;+                        if (op < len) {         /* some from end of window */+                            len -= op;+                            do {+                                *out++ = *from++;+                            } while (--op);+                            from = window;+                            if (wnext < len) {  /* some from start of window */+                                op = wnext;+                                len -= op;+                                do {+                                    *out++ = *from++;+                                } while (--op);+                                from = out - dist;      /* rest from output */+                            }+                        }+                    }+                    else {                      /* contiguous in window */+                        from += wnext - op;+                        if (op < len) {         /* some from window */+                            len -= op;+                            do {+                                *out++ = *from++;+                            } while (--op);+                            from = out - dist;  /* rest from output */+                        }+                    }+                    while (len > 2) {+                        *out++ = *from++;+                        *out++ = *from++;+                        *out++ = *from++;+                        len -= 3;+                    }+                    if (len) {+                        *out++ = *from++;+                        if (len > 1)+                            *out++ = *from++;+                    }+                }+                else {+                    from = out - dist;          /* copy direct from output */+                    do {                        /* minimum length is three */+                        *out++ = *from++;+                        *out++ = *from++;+                        *out++ = *from++;+                        len -= 3;+                    } while (len > 2);+                    if (len) {+                        *out++ = *from++;+                        if (len > 1)+                            *out++ = *from++;+                    }+                }+            }+            else if ((op & 64) == 0) {          /* 2nd level distance code */+                here = dcode[here.val + (hold & ((1U << op) - 1))];+                goto dodist;+            }+            else {+                strm->msg = (char *)"invalid distance code";+                state->mode = BAD;+                break;+            }+        }+        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 */+            Tracevv((stderr, "inflate:         end of block\n"));+            state->mode = TYPE;+            break;+        }+        else {+            strm->msg = (char *)"invalid literal/length code";+            state->mode = BAD;+            break;+        }+    } while (in < last && out < end);++    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */+    len = bits >> 3;+    in -= len;+    bits -= len << 3;+    hold &= (1U << bits) - 1;++    /* update state and return */+    strm->next_in = in;+    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));+    state->hold = hold;+    state->bits = bits;+    return;+}++/*+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):+   - Using bit fields for code structure+   - Different op definition to avoid & for extra bits (do & for table bits)+   - Three separate decoding do-loops for direct, window, and wnext == 0+   - Special case for distance > 1 copies to do overlapped load and store copy+   - Explicit branch predictions (based on measured branch probabilities)+   - Deferring match copy and interspersed it with decoding subsequent codes+   - Swapping literal/length else+   - Swapping window/direct else+   - Larger unrolled copy loops (three is about right)+   - Moving len -= 3 statement into middle of loop+ */++#endif /* !ASMINF */