toybox: toys/pending/xzcat.c annotate

annotate toys/pending/xzcat.c @ 944:b4faf2ae39e8

This inlines CRC64, and nothing more. The functions involved were called only once.

author	Isaac Dunham <idunham@lavabit.com>
date	Sat, 06 Jul 2013 11:26:15 -0500
parents	88060f1ff4a4
children	13916d161ec0

rev	line source
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2 * Simple XZ decoder command line tool
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	4 * Author: Lasse Collin <lasse.collin@tukaani.org>
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	5 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	6 * This file has been put into the public domain.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	7 * You can do whatever you want with this file.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	8 * Modified for toybox by Isaac Dunham
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	9 USE_XZCAT(NEWTOY(xzcat, NULL, TOYFLAG_USR\|TOYFLAG_BIN))
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	10
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	11 config XZCAT
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	12 bool "xzcat"
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	13 default n
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	14 help
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	15 usage: xzcat < file.xz
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	16
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	17 Read xz-compressed file from stdin and write decompressed file to stdout.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	18
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	19 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	20 #define FOR_xzcat
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	21 #include "toys.h"
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	22
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	23 // BEGIN xz.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	24
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	25 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	26 * enum xz_mode - Operation mode
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	27 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	28 * @XZ_SINGLE: Single-call mode. This uses less RAM than
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	29 * than multi-call modes, because the LZMA2
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	30 * dictionary doesn't need to be allocated as
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	31 * part of the decoder state. All required data
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	32 * structures are allocated at initialization,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	33 * so xz_dec_run() cannot return XZ_MEM_ERROR.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	34 * @XZ_PREALLOC: Multi-call mode with preallocated LZMA2
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	35 * dictionary buffer. All data structures are
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	36 * allocated at initialization, so xz_dec_run()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	37 * cannot return XZ_MEM_ERROR.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	38 * @XZ_DYNALLOC: Multi-call mode. The LZMA2 dictionary is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	39 * allocated once the required size has been
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	40 * parsed from the stream headers. If the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	41 * allocation fails, xz_dec_run() will return
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	42 * XZ_MEM_ERROR.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	43 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	44 * It is possible to enable support only for a subset of the above
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	45 * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	46 * or XZ_DEC_DYNALLOC. xzcat uses only XZ_DEC_DYNALLOC,
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	47 * so that is the default.
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	48 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	49 enum xz_mode {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	50 XZ_SINGLE,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	51 XZ_PREALLOC,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	52 XZ_DYNALLOC
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	53 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	54
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	55 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	56 * enum xz_ret - Return codes
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	57 * @XZ_OK: Everything is OK so far. More input or more
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	58 * output space is required to continue. This
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	59 * return code is possible only in multi-call mode
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	60 * (XZ_PREALLOC or XZ_DYNALLOC).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	61 * @XZ_STREAM_END: Operation finished successfully.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	62 * @XZ_UNSUPPORTED_CHECK: Integrity check type is not supported. Decoding
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	63 * is still possible in multi-call mode by simply
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	64 * calling xz_dec_run() again.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	65 * Note that this return value is used only if
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	66 * XZ_DEC_ANY_CHECK was defined at build time,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	67 * which is not used in the kernel. Unsupported
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	68 * check types return XZ_OPTIONS_ERROR if
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	69 * XZ_DEC_ANY_CHECK was not defined at build time.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	70 * @XZ_MEM_ERROR: Allocating memory failed. This return code is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	71 * possible only if the decoder was initialized
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	72 * with XZ_DYNALLOC. The amount of memory that was
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	73 * tried to be allocated was no more than the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	74 * dict_max argument given to xz_dec_init().
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	75 * @XZ_MEMLIMIT_ERROR: A bigger LZMA2 dictionary would be needed than
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	76 * allowed by the dict_max argument given to
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	77 * xz_dec_init(). This return value is possible
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	78 * only in multi-call mode (XZ_PREALLOC or
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	79 * XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	80 * ignores the dict_max argument.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	81 * @XZ_FORMAT_ERROR: File format was not recognized (wrong magic
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	82 * bytes).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	83 * @XZ_OPTIONS_ERROR: This implementation doesn't support the requested
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	84 * compression options. In the decoder this means
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	85 * that the header CRC32 matches, but the header
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	86 * itself specifies something that we don't support.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	87 * @XZ_DATA_ERROR: Compressed data is corrupt.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	88 * @XZ_BUF_ERROR: Cannot make any progress. Details are slightly
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	89 * different between multi-call and single-call
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	90 * mode; more information below.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	91 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	92 * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	93 * to XZ code cannot consume any input and cannot produce any new output.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	94 * This happens when there is no new input available, or the output buffer
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	95 * is full while at least one output byte is still pending. Assuming your
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	96 * code is not buggy, you can get this error only when decoding a compressed
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	97 * stream that is truncated or otherwise corrupt.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	98 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	99 * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	100 * is too small or the compressed input is corrupt in a way that makes the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	101 * decoder produce more output than the caller expected. When it is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	102 * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	103 * is used instead of XZ_BUF_ERROR.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	104 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	105 enum xz_ret {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	106 XZ_OK,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	107 XZ_STREAM_END,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	108 XZ_UNSUPPORTED_CHECK,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	109 XZ_MEM_ERROR,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	110 XZ_MEMLIMIT_ERROR,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	111 XZ_FORMAT_ERROR,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	112 XZ_OPTIONS_ERROR,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	113 XZ_DATA_ERROR,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	114 XZ_BUF_ERROR
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	115 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	116
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	117 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	118 * struct xz_buf - Passing input and output buffers to XZ code
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	119 * @in: Beginning of the input buffer. This may be NULL if and only
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	120 * if in_pos is equal to in_size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	121 * @in_pos: Current position in the input buffer. This must not exceed
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	122 * in_size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	123 * @in_size: Size of the input buffer
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	124 * @out: Beginning of the output buffer. This may be NULL if and only
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	125 * if out_pos is equal to out_size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	126 * @out_pos: Current position in the output buffer. This must not exceed
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	127 * out_size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	128 * @out_size: Size of the output buffer
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	129 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	130 * Only the contents of the output buffer from out[out_pos] onward, and
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	131 * the variables in_pos and out_pos are modified by the XZ code.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	132 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	133 struct xz_buf {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	134 const uint8_t *in;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	135 size_t in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	136 size_t in_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	137
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	138 uint8_t *out;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	139 size_t out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	140 size_t out_size;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	141 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	142
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	143 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	144 * struct xz_dec - Opaque type to hold the XZ decoder state
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	145 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	146 struct xz_dec;
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	147
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	148 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	149 * xz_dec_init() - Allocate and initialize a XZ decoder state
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	150 * @mode: Operation mode
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	151 * @dict_max: Maximum size of the LZMA2 dictionary (history buffer) for
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	152 * multi-call decoding. This is ignored in single-call mode
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	153 * (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	154 * or 2^n + 2^(n-1) bytes (the latter sizes are less common
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	155 * in practice), so other values for dict_max don't make sense.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	156 * In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	157 * 512 KiB, and 1 MiB are probably the only reasonable values,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	158 * except for kernel and initramfs images where a bigger
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	159 * dictionary can be fine and useful.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	160 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	161 * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	162 * once. The caller must provide enough output space or the decoding will
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	163 * fail. The output space is used as the dictionary buffer, which is why
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	164 * there is no need to allocate the dictionary as part of the decoder's
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	165 * internal state.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	166 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	167 * Because the output buffer is used as the workspace, streams encoded using
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	168 * a big dictionary are not a problem in single-call mode. It is enough that
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	169 * the output buffer is big enough to hold the actual uncompressed data; it
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	170 * can be smaller than the dictionary size stored in the stream headers.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	171 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	172 * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	173 * of memory is preallocated for the LZMA2 dictionary. This way there is no
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	174 * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	175 * never allocate any memory. Instead, if the preallocated dictionary is too
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	176 * small for decoding the given input stream, xz_dec_run() will return
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	177 * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	178 * decoded to avoid allocating excessive amount of memory for the dictionary.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	179 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	180 * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	181 * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	182 * may allocate once it has parsed the dictionary size from the stream
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	183 * headers. This way excessive allocations can be avoided while still
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	184 * limiting the maximum memory usage to a sane value to prevent running the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	185 * system out of memory when decompressing streams from untrusted sources.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	186 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	187 * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	188 * ready to be used with xz_dec_run(). If memory allocation fails,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	189 * xz_dec_init() returns NULL.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	190 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	191 struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	192
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	193 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	194 * xz_dec_run() - Run the XZ decoder
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	195 * @s: Decoder state allocated using xz_dec_init()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	196 * @b: Input and output buffers
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	197 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	198 * The possible return values depend on build options and operation mode.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	199 * See enum xz_ret for details.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	200 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	201 * Note that if an error occurs in single-call mode (return value is not
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	202 * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	203 * contents of the output buffer from b->out[b->out_pos] onward are
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	204 * undefined. This is true even after XZ_BUF_ERROR, because with some filter
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	205 * chains, there may be a second pass over the output buffer, and this pass
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	206 * cannot be properly done if the output buffer is truncated. Thus, you
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	207 * cannot give the single-call decoder a too small buffer and then expect to
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	208 * get that amount valid data from the beginning of the stream. You must use
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	209 * the multi-call decoder if you don't want to uncompress the whole stream.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	210 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	211 enum xz_ret xz_dec_run(struct xz_dec s, struct xz_buf b);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	212
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	213 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	214 * xz_dec_reset() - Reset an already allocated decoder state
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	215 * @s: Decoder state allocated using xz_dec_init()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	216 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	217 * This function can be used to reset the multi-call decoder state without
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	218 * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	219 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	220 * In single-call mode, xz_dec_reset() is always called in the beginning of
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	221 * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	222 * multi-call mode.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	223 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	224 void xz_dec_reset(struct xz_dec *s);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	225
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	226 /**
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	227 * xz_dec_end() - Free the memory allocated for the decoder state
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	228 * @s: Decoder state allocated using xz_dec_init(). If s is NULL,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	229 * this function does nothing.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	230 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	231 void xz_dec_end(struct xz_dec *s);
e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	232
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	233 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	234 * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	235 * calculation, the third argument must be zero. To continue the calculation,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	236 * the previously returned value is passed as the third argument.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	237 */
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	238 static uint32_t xz_crc32_table[256];
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	239
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	240 uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	241 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	242 crc = ~crc;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	243
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	244 while (size != 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	245 crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	246 --size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	247 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	248
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	249 return ~crc;
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	250 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	251
850 fef134bc206c More of same. Isaac Dunham <idunham@lavabit.com> parents: 846 diff changeset	252 static uint64_t xz_crc64_table[256];
fef134bc206c More of same. Isaac Dunham <idunham@lavabit.com> parents: 846 diff changeset	253
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	254
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	255 // END xz.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	256
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	257 static uint8_t in[BUFSIZ];
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	258 static uint8_t out[BUFSIZ];
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	259
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	260 void xzcat_main(void)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	261 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	262 struct xz_buf b;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	263 struct xz_dec *s;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	264 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	265 const char *msg;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	266
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	267 crc_init(xz_crc32_table, 1);
944 b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	268 const uint64_t poly = 0xC96C5795D7870F42ULL;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	269 uint32_t i;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	270 uint32_t j;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	271 uint64_t r;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	272
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	273 /* initialize CRC64 table*/
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	274 for (i = 0; i < 256; ++i) {
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	275 r = i;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	276 for (j = 0; j < 8; ++j)
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	277 r = (r >> 1) ^ (poly & ~((r & 1) - 1));
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	278
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	279 xz_crc64_table[i] = r;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	280 }
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	281
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	282 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	283 * Support up to 64 MiB dictionary. The actually needed memory
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	284 * is allocated once the headers have been parsed.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	285 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	286 s = xz_dec_init(XZ_DYNALLOC, 1 << 26);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	287 if (s == NULL) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	288 msg = "Memory allocation failed\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	289 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	290 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	291
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	292 b.in = in;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	293 b.in_pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	294 b.in_size = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	295 b.out = out;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	296 b.out_pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	297 b.out_size = BUFSIZ;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	298
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	299 for (;;) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	300 if (b.in_pos == b.in_size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	301 b.in_size = fread(in, 1, sizeof(in), stdin);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	302 b.in_pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	303 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	304
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	305 ret = xz_dec_run(s, &b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	306
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	307 if (b.out_pos == sizeof(out)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	308 if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	309 msg = "Write error\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	310 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	311 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	312
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	313 b.out_pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	314 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	315
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	316 if (ret == XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	317 continue;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	318
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	319 if (ret == XZ_UNSUPPORTED_CHECK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	320 continue;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	321
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	322 if (fwrite(out, 1, b.out_pos, stdout) != b.out_pos
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	323 \|\| fclose(stdout)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	324 msg = "Write error\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	325 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	326 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	327
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	328 switch (ret) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	329 case XZ_STREAM_END:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	330 xz_dec_end(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	331 return;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	332
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	333 case XZ_MEM_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	334 msg = "Memory allocation failed\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	335 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	336
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	337 case XZ_MEMLIMIT_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	338 msg = "Memory usage limit reached\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	339 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	340
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	341 case XZ_FORMAT_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	342 msg = "Not a .xz file\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	343 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	344
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	345 case XZ_OPTIONS_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	346 msg = "Unsupported options in the .xz headers\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	347 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	348
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	349 case XZ_DATA_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	350 case XZ_BUF_ERROR:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	351 msg = "File is corrupt\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	352 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	353
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	354 default:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	355 msg = "Bug!\n";
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	356 goto error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	357 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	358 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	359
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	360 error:
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	361 xz_dec_end(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	362 error_exit("%s", msg);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	363 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	364
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	365 // BEGIN xz_private.h
850 fef134bc206c More of same. Isaac Dunham <idunham@lavabit.com> parents: 846 diff changeset	366
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	367
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	368 /* Uncomment as needed to enable BCJ filter decoders.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	369 * These cost about 2.5 k when all are enabled; SPARC and IA64 make 0.7 k
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	370 * */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	371
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	372 #define XZ_DEC_X86
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	373 #define XZ_DEC_POWERPC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	374 #define XZ_DEC_IA64
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	375 #define XZ_DEC_ARM
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	376 #define XZ_DEC_ARMTHUMB
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	377 #define XZ_DEC_SPARC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	378
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	379
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	380 #define memeq(a, b, size) (memcmp(a, b, size) == 0)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	381
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	382 #ifndef min
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	383 # define min(x, y) ((x) < (y) ? (x) : (y))
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	384 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	385 #define min_t(type, x, y) min(x, y)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	386
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	387
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	388 /* Inline functions to access unaligned unsigned 32-bit integers */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	389 #ifndef get_unaligned_le32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	390 static inline uint32_t get_unaligned_le32(const uint8_t *buf)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	391 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	392 return (uint32_t)buf[0]
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	393 \| ((uint32_t)buf[1] << 8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	394 \| ((uint32_t)buf[2] << 16)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	395 \| ((uint32_t)buf[3] << 24);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	396 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	397 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	398
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	399 #ifndef get_unaligned_be32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	400 static inline uint32_t get_unaligned_be32(const uint8_t *buf)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	401 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	402 return (uint32_t)(buf[0] << 24)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	403 \| ((uint32_t)buf[1] << 16)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	404 \| ((uint32_t)buf[2] << 8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	405 \| (uint32_t)buf[3];
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	406 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	407 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	408
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	409 #ifndef put_unaligned_le32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	410 static inline void put_unaligned_le32(uint32_t val, uint8_t *buf)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	411 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	412 buf[0] = (uint8_t)val;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	413 buf[1] = (uint8_t)(val >> 8);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	414 buf[2] = (uint8_t)(val >> 16);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	415 buf[3] = (uint8_t)(val >> 24);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	416 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	417 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	418
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	419 #ifndef put_unaligned_be32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	420 static inline void put_unaligned_be32(uint32_t val, uint8_t *buf)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	421 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	422 buf[0] = (uint8_t)(val >> 24);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	423 buf[1] = (uint8_t)(val >> 16);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	424 buf[2] = (uint8_t)(val >> 8);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	425 buf[3] = (uint8_t)val;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	426 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	427 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	428
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	429 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	430 * Use get_unaligned_le32() also for aligned access for simplicity. On
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	431 * little endian systems, #define get_le32(ptr) ((const uint32_t )(ptr))
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	432 * could save a few bytes in code size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	433 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	434 #ifndef get_le32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	435 # define get_le32 get_unaligned_le32
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	436 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	437
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	438
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	439 #define XZ_DEC_DYNALLOC
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	440 /* DYNALLOC is what we use, but we may want these later.
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	441 #define XZ_DEC_SINGLE
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	442 #define XZ_DEC_PREALLOC
68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	443 */
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	444
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	445 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	446 * The DEC_IS_foo(mode) macros are used in "if" statements. If only some
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	447 * of the supported modes are enabled, these macros will evaluate to true or
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	448 * false at compile time and thus allow the compiler to omit unneeded code.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	449 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	450 #ifdef XZ_DEC_SINGLE
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	451 # define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	452 #else
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	453 # define DEC_IS_SINGLE(mode) (0)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	454 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	455
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	456 #ifdef XZ_DEC_PREALLOC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	457 # define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	458 #else
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	459 # define DEC_IS_PREALLOC(mode) (0)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	460 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	461
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	462 #ifdef XZ_DEC_DYNALLOC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	463 # define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	464 #else
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	465 # define DEC_IS_DYNALLOC(mode) (0)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	466 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	467
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	468 #if !defined(XZ_DEC_SINGLE)
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	469 # define DEC_IS_MULTI(mode) (1)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	470 #elif defined(XZ_DEC_PREALLOC) \|\| defined(XZ_DEC_DYNALLOC)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	471 # define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	472 #else
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	473 # define DEC_IS_MULTI(mode) (0)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	474 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	475
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	476 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	477 * If any of the BCJ filter decoders are wanted, define XZ_DEC_BCJ.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	478 * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	479 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	480 #ifndef XZ_DEC_BCJ
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	481 # if defined(XZ_DEC_X86) \|\| defined(XZ_DEC_POWERPC) \
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	482 \|\| defined(XZ_DEC_IA64) \|\| defined(XZ_DEC_ARM) \
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	483 \|\| defined(XZ_DEC_ARM) \|\| defined(XZ_DEC_ARMTHUMB) \
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	484 \|\| defined(XZ_DEC_SPARC)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	485 # define XZ_DEC_BCJ
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	486 # endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	487 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	488
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	489 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	490 * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	491 * before calling xz_dec_lzma2_run().
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	492 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	493 struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	494 uint32_t dict_max);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	495
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	496 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	497 * Decode the LZMA2 properties (one byte) and reset the decoder. Return
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	498 * XZ_OK on success, XZ_MEMLIMIT_ERROR if the preallocated dictionary is not
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	499 * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	500 * decoder doesn't support.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	501 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	502 enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	503 uint8_t props);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	504
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	505 /* Decode raw LZMA2 stream from b->in to b->out. */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	506 enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	507 struct xz_buf *b);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	508
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	509 #ifdef XZ_DEC_BCJ
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	510 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	511 * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	512 * calling xz_dec_bcj_run().
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	513 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	514 struct xz_dec_bcj *xz_dec_bcj_create(int single_call);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	515
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	516 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	517 * Decode the Filter ID of a BCJ filter. This implementation doesn't
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	518 * support custom start offsets, so no decoding of Filter Properties
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	519 * is needed. Returns XZ_OK if the given Filter ID is supported.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	520 * Otherwise XZ_OPTIONS_ERROR is returned.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	521 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	522 enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	523
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	524 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	525 * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	526 * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	527 * must be called directly.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	528 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	529 enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	530 struct xz_dec_lzma2 *lzma2,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	531 struct xz_buf *b);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	532 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	533
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	534 // END "xz_private.h"
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	535
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	536
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	537
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	538
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	539 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	540 * Branch/Call/Jump (BCJ) filter decoders
850 fef134bc206c More of same. Isaac Dunham <idunham@lavabit.com> parents: 846 diff changeset	541 * The rest of the code is inside this ifdef. It makes things a little more
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	542 * convenient when building without support for any BCJ filters.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	543 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	544 #ifdef XZ_DEC_BCJ
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	545
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	546 struct xz_dec_bcj {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	547 /* Type of the BCJ filter being used */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	548 enum {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	549 BCJ_X86 = 4, /* x86 or x86-64 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	550 BCJ_POWERPC = 5, /* Big endian only */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	551 BCJ_IA64 = 6, /* Big or little endian */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	552 BCJ_ARM = 7, /* Little endian only */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	553 BCJ_ARMTHUMB = 8, /* Little endian only */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	554 BCJ_SPARC = 9 /* Big or little endian */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	555 } type;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	556
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	557 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	558 * Return value of the next filter in the chain. We need to preserve
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	559 * this information across calls, because we must not call the next
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	560 * filter anymore once it has returned XZ_STREAM_END.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	561 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	562 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	563
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	564 /* True if we are operating in single-call mode. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	565 int single_call;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	566
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	567 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	568 * Absolute position relative to the beginning of the uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	569 * data (in a single .xz Block). We care only about the lowest 32
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	570 * bits so this doesn't need to be uint64_t even with big files.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	571 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	572 uint32_t pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	573
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	574 /* x86 filter state */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	575 uint32_t x86_prev_mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	576
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	577 /* Temporary space to hold the variables from struct xz_buf */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	578 uint8_t *out;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	579 size_t out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	580 size_t out_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	581
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	582 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	583 /* Amount of already filtered data in the beginning of buf */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	584 size_t filtered;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	585
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	586 /* Total amount of data currently stored in buf */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	587 size_t size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	588
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	589 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	590 * Buffer to hold a mix of filtered and unfiltered data. This
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	591 * needs to be big enough to hold Alignment + 2 * Look-ahead:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	592 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	593 * Type Alignment Look-ahead
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	594 * x86 1 4
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	595 * PowerPC 4 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	596 * IA-64 16 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	597 * ARM 4 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	598 * ARM-Thumb 2 2
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	599 * SPARC 4 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	600 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	601 uint8_t buf[16];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	602 } temp;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	603 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	604
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	605 #ifdef XZ_DEC_X86
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	606 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	607 * This is used to test the most significant byte of a memory address
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	608 * in an x86 instruction.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	609 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	610 static inline int bcj_x86_test_msbyte(uint8_t b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	611 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	612 return b == 0x00 \|\| b == 0xFF;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	613 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	614
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	615 static size_t bcj_x86(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	616 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	617 static const int mask_to_allowed_status[8]
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	618 = { 1,1,1,0,1,0,0,0 };
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	619
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	620 static const uint8_t mask_to_bit_num[8] = { 0, 1, 2, 2, 3, 3, 3, 3 };
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	621
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	622 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	623 size_t prev_pos = (size_t)-1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	624 uint32_t prev_mask = s->x86_prev_mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	625 uint32_t src;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	626 uint32_t dest;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	627 uint32_t j;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	628 uint8_t b;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	629
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	630 if (size <= 4)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	631 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	632
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	633 size -= 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	634 for (i = 0; i < size; ++i) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	635 if ((buf[i] & 0xFE) != 0xE8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	636 continue;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	637
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	638 prev_pos = i - prev_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	639 if (prev_pos > 3) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	640 prev_mask = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	641 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	642 prev_mask = (prev_mask << (prev_pos - 1)) & 7;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	643 if (prev_mask != 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	644 b = buf[i + 4 - mask_to_bit_num[prev_mask]];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	645 if (!mask_to_allowed_status[prev_mask]
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	646 \|\| bcj_x86_test_msbyte(b)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	647 prev_pos = i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	648 prev_mask = (prev_mask << 1) \| 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	649 continue;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	650 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	651 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	652 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	653
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	654 prev_pos = i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	655
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	656 if (bcj_x86_test_msbyte(buf[i + 4])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	657 src = get_unaligned_le32(buf + i + 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	658 for (;;) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	659 dest = src - (s->pos + (uint32_t)i + 5);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	660 if (prev_mask == 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	661 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	662
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	663 j = mask_to_bit_num[prev_mask] * 8;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	664 b = (uint8_t)(dest >> (24 - j));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	665 if (!bcj_x86_test_msbyte(b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	666 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	667
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	668 src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	669 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	670
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	671 dest &= 0x01FFFFFF;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	672 dest \|= (uint32_t)0 - (dest & 0x01000000);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	673 put_unaligned_le32(dest, buf + i + 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	674 i += 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	675 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	676 prev_mask = (prev_mask << 1) \| 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	677 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	678 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	679
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	680 prev_pos = i - prev_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	681 s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	682 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	683 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	684 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	685
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	686 #ifdef XZ_DEC_POWERPC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	687 static size_t bcj_powerpc(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	688 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	689 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	690 uint32_t instr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	691
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	692 for (i = 0; i + 4 <= size; i += 4) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	693 instr = get_unaligned_be32(buf + i);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	694 if ((instr & 0xFC000003) == 0x48000001) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	695 instr &= 0x03FFFFFC;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	696 instr -= s->pos + (uint32_t)i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	697 instr &= 0x03FFFFFC;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	698 instr \|= 0x48000001;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	699 put_unaligned_be32(instr, buf + i);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	700 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	701 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	702
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	703 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	704 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	705 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	706
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	707 #ifdef XZ_DEC_IA64
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	708 static size_t bcj_ia64(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	709 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	710 static const uint8_t branch_table[32] = {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	711 0, 0, 0, 0, 0, 0, 0, 0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	712 0, 0, 0, 0, 0, 0, 0, 0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	713 4, 4, 6, 6, 0, 0, 7, 7,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	714 4, 4, 0, 0, 4, 4, 0, 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	715 };
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	716
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	717 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	718 * The local variables take a little bit stack space, but it's less
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	719 * than what LZMA2 decoder takes, so it doesn't make sense to reduce
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	720 * stack usage here without doing that for the LZMA2 decoder too.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	721 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	722
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	723 /* Loop counters */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	724 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	725 size_t j;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	726
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	727 /* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	728 uint32_t slot;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	729
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	730 /* Bitwise offset of the instruction indicated by slot */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	731 uint32_t bit_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	732
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	733 /* bit_pos split into byte and bit parts */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	734 uint32_t byte_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	735 uint32_t bit_res;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	736
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	737 /* Address part of an instruction */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	738 uint32_t addr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	739
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	740 /* Mask used to detect which instructions to convert */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	741 uint32_t mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	742
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	743 /* 41-bit instruction stored somewhere in the lowest 48 bits */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	744 uint64_t instr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	745
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	746 /* Instruction normalized with bit_res for easier manipulation */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	747 uint64_t norm;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	748
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	749 for (i = 0; i + 16 <= size; i += 16) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	750 mask = branch_table[buf[i] & 0x1F];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	751 for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	752 if (((mask >> slot) & 1) == 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	753 continue;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	754
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	755 byte_pos = bit_pos >> 3;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	756 bit_res = bit_pos & 7;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	757 instr = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	758 for (j = 0; j < 6; ++j)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	759 instr \|= (uint64_t)(buf[i + j + byte_pos])
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	760 << (8 * j);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	761
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	762 norm = instr >> bit_res;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	763
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	764 if (((norm >> 37) & 0x0F) == 0x05
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	765 && ((norm >> 9) & 0x07) == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	766 addr = (norm >> 13) & 0x0FFFFF;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	767 addr \|= ((uint32_t)(norm >> 36) & 1) << 20;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	768 addr <<= 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	769 addr -= s->pos + (uint32_t)i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	770 addr >>= 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	771
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	772 norm &= ~((uint64_t)0x8FFFFF << 13);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	773 norm \|= (uint64_t)(addr & 0x0FFFFF) << 13;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	774 norm \|= (uint64_t)(addr & 0x100000)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	775 << (36 - 20);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	776
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	777 instr &= (1 << bit_res) - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	778 instr \|= norm << bit_res;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	779
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	780 for (j = 0; j < 6; j++)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	781 buf[i + j + byte_pos]
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	782 = (uint8_t)(instr >> (8 * j));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	783 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	784 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	785 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	786
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	787 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	788 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	789 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	790
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	791 #ifdef XZ_DEC_ARM
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	792 static size_t bcj_arm(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	793 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	794 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	795 uint32_t addr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	796
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	797 for (i = 0; i + 4 <= size; i += 4) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	798 if (buf[i + 3] == 0xEB) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	799 addr = (uint32_t)buf[i] \| ((uint32_t)buf[i + 1] << 8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	800 \| ((uint32_t)buf[i + 2] << 16);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	801 addr <<= 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	802 addr -= s->pos + (uint32_t)i + 8;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	803 addr >>= 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	804 buf[i] = (uint8_t)addr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	805 buf[i + 1] = (uint8_t)(addr >> 8);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	806 buf[i + 2] = (uint8_t)(addr >> 16);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	807 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	808 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	809
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	810 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	811 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	812 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	813
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	814 #ifdef XZ_DEC_ARMTHUMB
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	815 static size_t bcj_armthumb(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	816 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	817 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	818 uint32_t addr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	819
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	820 for (i = 0; i + 4 <= size; i += 2) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	821 if ((buf[i + 1] & 0xF8) == 0xF0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	822 && (buf[i + 3] & 0xF8) == 0xF8) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	823 addr = (((uint32_t)buf[i + 1] & 0x07) << 19)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	824 \| ((uint32_t)buf[i] << 11)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	825 \| (((uint32_t)buf[i + 3] & 0x07) << 8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	826 \| (uint32_t)buf[i + 2];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	827 addr <<= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	828 addr -= s->pos + (uint32_t)i + 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	829 addr >>= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	830 buf[i + 1] = (uint8_t)(0xF0 \| ((addr >> 19) & 0x07));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	831 buf[i] = (uint8_t)(addr >> 11);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	832 buf[i + 3] = (uint8_t)(0xF8 \| ((addr >> 8) & 0x07));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	833 buf[i + 2] = (uint8_t)addr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	834 i += 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	835 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	836 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	837
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	838 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	839 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	840 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	841
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	842 #ifdef XZ_DEC_SPARC
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	843 static size_t bcj_sparc(struct xz_dec_bcj s, uint8_t buf, size_t size)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	844 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	845 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	846 uint32_t instr;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	847
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	848 for (i = 0; i + 4 <= size; i += 4) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	849 instr = get_unaligned_be32(buf + i);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	850 if ((instr >> 22) == 0x100 \|\| (instr >> 22) == 0x1FF) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	851 instr <<= 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	852 instr -= s->pos + (uint32_t)i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	853 instr >>= 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	854 instr = ((uint32_t)0x40000000 - (instr & 0x400000))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	855 \| 0x40000000 \| (instr & 0x3FFFFF);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	856 put_unaligned_be32(instr, buf + i);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	857 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	858 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	859
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	860 return i;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	861 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	862 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	863
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	864 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	865 * Apply the selected BCJ filter. Update *pos and s->pos to match the amount
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	866 * of data that got filtered.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	867 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	868 * NOTE: This is implemented as a switch statement to avoid using function
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	869 * pointers, which could be problematic in the kernel boot code, which must
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	870 * avoid pointers to static data (at least on x86).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	871 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	872 static void bcj_apply(struct xz_dec_bcj *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	873 uint8_t buf, size_t pos, size_t size)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	874 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	875 size_t filtered;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	876
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	877 buf += *pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	878 size -= *pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	879
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	880 switch (s->type) {
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	881 #ifdef XZ_DEC_X86
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	882 case BCJ_X86:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	883 filtered = bcj_x86(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	884 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	885 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	886 #ifdef XZ_DEC_POWERPC
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	887 case BCJ_POWERPC:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	888 filtered = bcj_powerpc(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	889 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	890 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	891 #ifdef XZ_DEC_IA64
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	892 case BCJ_IA64:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	893 filtered = bcj_ia64(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	894 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	895 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	896 #ifdef XZ_DEC_ARM
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	897 case BCJ_ARM:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	898 filtered = bcj_arm(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	899 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	900 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	901 #ifdef XZ_DEC_ARMTHUMB
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	902 case BCJ_ARMTHUMB:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	903 filtered = bcj_armthumb(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	904 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	905 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	906 #ifdef XZ_DEC_SPARC
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	907 case BCJ_SPARC:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	908 filtered = bcj_sparc(s, buf, size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	909 break;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	910 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	911 default:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	912 /* Never reached but silence compiler warnings. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	913 filtered = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	914 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	915 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	916
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	917 *pos += filtered;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	918 s->pos += filtered;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	919 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	920
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	921 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	922 * Flush pending filtered data from temp to the output buffer.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	923 * Move the remaining mixture of possibly filtered and unfiltered
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	924 * data to the beginning of temp.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	925 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	926 static void bcj_flush(struct xz_dec_bcj s, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	927 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	928 size_t copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	929
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	930 copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	931 memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	932 b->out_pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	933
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	934 s->temp.filtered -= copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	935 s->temp.size -= copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	936 memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	937 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	938
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	939 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	940 * The BCJ filter functions are primitive in sense that they process the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	941 * data in chunks of 1-16 bytes. To hide this issue, this function does
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	942 * some buffering.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	943 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	944 enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	945 struct xz_dec_lzma2 *lzma2,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	946 struct xz_buf *b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	947 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	948 size_t out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	949
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	950 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	951 * Flush pending already filtered data to the output buffer. Return
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	952 * immediatelly if we couldn't flush everything, or if the next
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	953 * filter in the chain had already returned XZ_STREAM_END.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	954 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	955 if (s->temp.filtered > 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	956 bcj_flush(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	957 if (s->temp.filtered > 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	958 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	959
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	960 if (s->ret == XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	961 return XZ_STREAM_END;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	962 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	963
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	964 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	965 * If we have more output space than what is currently pending in
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	966 * temp, copy the unfiltered data from temp to the output buffer
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	967 * and try to fill the output buffer by decoding more data from the
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	968 * next filter in the chain. Apply the BCJ filter on the new data
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	969 * in the output buffer. If everything cannot be filtered, copy it
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	970 * to temp and rewind the output buffer position accordingly.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	971 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	972 * This needs to be always run when temp.size == 0 to handle a special
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	973 * case where the output buffer is full and the next filter has no
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	974 * more output coming but hasn't returned XZ_STREAM_END yet.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	975 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	976 if (s->temp.size < b->out_size - b->out_pos \|\| s->temp.size == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	977 out_start = b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	978 memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	979 b->out_pos += s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	980
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	981 s->ret = xz_dec_lzma2_run(lzma2, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	982 if (s->ret != XZ_STREAM_END
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	983 && (s->ret != XZ_OK \|\| s->single_call))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	984 return s->ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	985
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	986 bcj_apply(s, b->out, &out_start, b->out_pos);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	987
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	988 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	989 * As an exception, if the next filter returned XZ_STREAM_END,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	990 * we can do that too, since the last few bytes that remain
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	991 * unfiltered are meant to remain unfiltered.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	992 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	993 if (s->ret == XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	994 return XZ_STREAM_END;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	995
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	996 s->temp.size = b->out_pos - out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	997 b->out_pos -= s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	998 memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	999
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1000 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1001 * If there wasn't enough input to the next filter to fill
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1002 * the output buffer with unfiltered data, there's no point
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1003 * to try decoding more data to temp.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1004 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1005 if (b->out_pos + s->temp.size < b->out_size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1006 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1007 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1008
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1009 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1010 * We have unfiltered data in temp. If the output buffer isn't full
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1011 * yet, try to fill the temp buffer by decoding more data from the
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1012 * next filter. Apply the BCJ filter on temp. Then we hopefully can
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1013 * fill the actual output buffer by copying filtered data from temp.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1014 * A mix of filtered and unfiltered data may be left in temp; it will
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1015 * be taken care on the next call to this function.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1016 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1017 if (b->out_pos < b->out_size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1018 /* Make b->out{,_pos,_size} temporarily point to s->temp. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1019 s->out = b->out;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1020 s->out_pos = b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1021 s->out_size = b->out_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1022 b->out = s->temp.buf;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1023 b->out_pos = s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1024 b->out_size = sizeof(s->temp.buf);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1025
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1026 s->ret = xz_dec_lzma2_run(lzma2, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1027
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1028 s->temp.size = b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1029 b->out = s->out;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1030 b->out_pos = s->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1031 b->out_size = s->out_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1032
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1033 if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1034 return s->ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1035
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1036 bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1037
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1038 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1039 * If the next filter returned XZ_STREAM_END, we mark that
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1040 * everything is filtered, since the last unfiltered bytes
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1041 * of the stream are meant to be left as is.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1042 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1043 if (s->ret == XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1044 s->temp.filtered = s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1045
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1046 bcj_flush(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1047 if (s->temp.filtered > 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1048 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1049 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1050
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1051 return s->ret;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1052 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1053
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1054 struct xz_dec_bcj *xz_dec_bcj_create(int single_call)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1055 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1056 struct xz_dec_bcj s = malloc(sizeof(s));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1057 if (s != NULL)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1058 s->single_call = single_call;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1059
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1060 return s;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1061 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1062
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	1063 enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1064 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1065 switch (id) {
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1066 #ifdef XZ_DEC_X86
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1067 case BCJ_X86:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1068 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1069 #ifdef XZ_DEC_POWERPC
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1070 case BCJ_POWERPC:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1071 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1072 #ifdef XZ_DEC_IA64
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1073 case BCJ_IA64:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1074 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1075 #ifdef XZ_DEC_ARM
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1076 case BCJ_ARM:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1077 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1078 #ifdef XZ_DEC_ARMTHUMB
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1079 case BCJ_ARMTHUMB:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1080 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1081 #ifdef XZ_DEC_SPARC
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1082 case BCJ_SPARC:
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1083 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1084 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1085
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1086 default:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1087 /* Unsupported Filter ID */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1088 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1089 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1090
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1091 s->type = id;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1092 s->ret = XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1093 s->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1094 s->x86_prev_mask = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1095 s->temp.filtered = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1096 s->temp.size = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1097
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1098 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1099 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1100
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1101 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1102 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1103 * LZMA2 decoder
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1104 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1105
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1106
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1107 // BEGIN xz_lzma2.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1108 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1109 * LZMA2 definitions
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1110 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1111 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1112
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1113
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1114 /* Range coder constants */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1115 #define RC_SHIFT_BITS 8
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1116 #define RC_TOP_BITS 24
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1117 #define RC_TOP_VALUE (1 << RC_TOP_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1118 #define RC_BIT_MODEL_TOTAL_BITS 11
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1119 #define RC_BIT_MODEL_TOTAL (1 << RC_BIT_MODEL_TOTAL_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1120 #define RC_MOVE_BITS 5
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1121
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1122 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1123 * Maximum number of position states. A position state is the lowest pb
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1124 * number of bits of the current uncompressed offset. In some places there
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1125 * are different sets of probabilities for different position states.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1126 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1127 #define POS_STATES_MAX (1 << 4)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1128
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1129 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1130 * This enum is used to track which LZMA symbols have occurred most recently
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1131 * and in which order. This information is used to predict the next symbol.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1132 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1133 * Symbols:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1134 * - Literal: One 8-bit byte
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1135 * - Match: Repeat a chunk of data at some distance
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1136 * - Long repeat: Multi-byte match at a recently seen distance
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1137 * - Short repeat: One-byte repeat at a recently seen distance
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1138 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1139 * The symbol names are in from STATE_oldest_older_previous. REP means
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1140 * either short or long repeated match, and NONLIT means any non-literal.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1141 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1142 enum lzma_state {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1143 STATE_LIT_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1144 STATE_MATCH_LIT_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1145 STATE_REP_LIT_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1146 STATE_SHORTREP_LIT_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1147 STATE_MATCH_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1148 STATE_REP_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1149 STATE_SHORTREP_LIT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1150 STATE_LIT_MATCH,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1151 STATE_LIT_LONGREP,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1152 STATE_LIT_SHORTREP,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1153 STATE_NONLIT_MATCH,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1154 STATE_NONLIT_REP
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1155 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1156
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1157 /* Total number of states */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1158 #define STATES 12
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1159
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1160 /* The lowest 7 states indicate that the previous state was a literal. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1161 #define LIT_STATES 7
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1162
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1163 /* Indicate that the latest symbol was a literal. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1164 static inline void lzma_state_literal(enum lzma_state *state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1165 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1166 if (*state <= STATE_SHORTREP_LIT_LIT)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1167 *state = STATE_LIT_LIT;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1168 else if (*state <= STATE_LIT_SHORTREP)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1169 *state -= 3;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1170 else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1171 *state -= 6;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1172 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1173
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1174 /* Indicate that the latest symbol was a match. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1175 static inline void lzma_state_match(enum lzma_state *state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1176 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1177 state = state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1178 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1179
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1180 /* Indicate that the latest state was a long repeated match. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1181 static inline void lzma_state_long_rep(enum lzma_state *state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1182 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1183 state = state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1184 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1185
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1186 /* Indicate that the latest symbol was a short match. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1187 static inline void lzma_state_short_rep(enum lzma_state *state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1188 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1189 state = state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1190 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1191
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1192 /* Test if the previous symbol was a literal. */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1193 static inline int lzma_state_is_literal(enum lzma_state state)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1194 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1195 return state < LIT_STATES;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1196 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1197
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1198 /* Each literal coder is divided in three sections:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1199 * - 0x001-0x0FF: Without match byte
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1200 * - 0x101-0x1FF: With match byte; match bit is 0
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1201 * - 0x201-0x2FF: With match byte; match bit is 1
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1202 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1203 * Match byte is used when the previous LZMA symbol was something else than
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1204 * a literal (that is, it was some kind of match).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1205 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1206 #define LITERAL_CODER_SIZE 0x300
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1207
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1208 /* Maximum number of literal coders */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1209 #define LITERAL_CODERS_MAX (1 << 4)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1210
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1211 /* Minimum length of a match is two bytes. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1212 #define MATCH_LEN_MIN 2
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1213
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1214 /* Match length is encoded with 4, 5, or 10 bits.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1215 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1216 * Length Bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1217 * 2-9 4 = Choice=0 + 3 bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1218 * 10-17 5 = Choice=1 + Choice2=0 + 3 bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1219 * 18-273 10 = Choice=1 + Choice2=1 + 8 bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1220 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1221 #define LEN_LOW_BITS 3
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1222 #define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1223 #define LEN_MID_BITS 3
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1224 #define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1225 #define LEN_HIGH_BITS 8
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1226 #define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1227 #define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1228
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1229 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1230 * Maximum length of a match is 273 which is a result of the encoding
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1231 * described above.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1232 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1233 #define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1234
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1235 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1236 * Different sets of probabilities are used for match distances that have
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1237 * very short match length: Lengths of 2, 3, and 4 bytes have a separate
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1238 * set of probabilities for each length. The matches with longer length
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1239 * use a shared set of probabilities.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1240 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1241 #define DIST_STATES 4
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1242
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1243 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1244 * Get the index of the appropriate probability array for decoding
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1245 * the distance slot.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1246 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1247 static inline uint32_t lzma_get_dist_state(uint32_t len)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1248 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1249 return len < DIST_STATES + MATCH_LEN_MIN
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1250 ? len - MATCH_LEN_MIN : DIST_STATES - 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1251 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1252
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1253 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1254 * The highest two bits of a 32-bit match distance are encoded using six bits.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1255 * This six-bit value is called a distance slot. This way encoding a 32-bit
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1256 * value takes 6-36 bits, larger values taking more bits.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1257 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1258 #define DIST_SLOT_BITS 6
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1259 #define DIST_SLOTS (1 << DIST_SLOT_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1260
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1261 /* Match distances up to 127 are fully encoded using probabilities. Since
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1262 * the highest two bits (distance slot) are always encoded using six bits,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1263 * the distances 0-3 don't need any additional bits to encode, since the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1264 * distance slot itself is the same as the actual distance. DIST_MODEL_START
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1265 * indicates the first distance slot where at least one additional bit is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1266 * needed.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1267 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1268 #define DIST_MODEL_START 4
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1269
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1270 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1271 * Match distances greater than 127 are encoded in three pieces:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1272 * - distance slot: the highest two bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1273 * - direct bits: 2-26 bits below the highest two bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1274 * - alignment bits: four lowest bits
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1275 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1276 * Direct bits don't use any probabilities.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1277 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1278 * The distance slot value of 14 is for distances 128-191.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1279 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1280 #define DIST_MODEL_END 14
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1281
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1282 /* Distance slots that indicate a distance <= 127. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1283 #define FULL_DISTANCES_BITS (DIST_MODEL_END / 2)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1284 #define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1285
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1286 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1287 * For match distances greater than 127, only the highest two bits and the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1288 * lowest four bits (alignment) is encoded using probabilities.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1289 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1290 #define ALIGN_BITS 4
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1291 #define ALIGN_SIZE (1 << ALIGN_BITS)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1292 #define ALIGN_MASK (ALIGN_SIZE - 1)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1293
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1294 /* Total number of all probability variables */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1295 #define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX * LITERAL_CODER_SIZE)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1296
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1297 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1298 * LZMA remembers the four most recent match distances. Reusing these
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1299 * distances tends to take less space than re-encoding the actual
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1300 * distance value.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1301 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1302 #define REPS 4
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1303
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1304
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1305 // END xz_lzma2.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1306
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1307 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1308 * Range decoder initialization eats the first five bytes of each LZMA chunk.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1309 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1310 #define RC_INIT_BYTES 5
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1311
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1312 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1313 * Minimum number of usable input buffer to safely decode one LZMA symbol.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1314 * The worst case is that we decode 22 bits using probabilities and 26
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1315 * direct bits. This may decode at maximum of 20 bytes of input. However,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1316 * lzma_main() does an extra normalization before returning, thus we
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1317 * need to put 21 here.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1318 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1319 #define LZMA_IN_REQUIRED 21
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1320
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1321 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1322 * Dictionary (history buffer)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1323 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1324 * These are always true:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1325 * start <= pos <= full <= end
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1326 * pos <= limit <= end
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1327 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1328 * In multi-call mode, also these are true:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1329 * end == size
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1330 * size <= size_max
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1331 * allocated <= size
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1332 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1333 * Most of these variables are size_t to support single-call mode,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1334 * in which the dictionary variables address the actual output
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1335 * buffer directly.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1336 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1337 struct dictionary {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1338 /* Beginning of the history buffer */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1339 uint8_t *buf;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1340
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1341 /* Old position in buf (before decoding more data) */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1342 size_t start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1343
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1344 /* Position in buf */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1345 size_t pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1346
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1347 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1348 * How full dictionary is. This is used to detect corrupt input that
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1349 * would read beyond the beginning of the uncompressed stream.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1350 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1351 size_t full;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1352
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1353 /* Write limit; we don't write to buf[limit] or later bytes. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1354 size_t limit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1355
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1356 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1357 * End of the dictionary buffer. In multi-call mode, this is
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1358 * the same as the dictionary size. In single-call mode, this
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1359 * indicates the size of the output buffer.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1360 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1361 size_t end;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1362
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1363 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1364 * Size of the dictionary as specified in Block Header. This is used
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1365 * together with "full" to detect corrupt input that would make us
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1366 * read beyond the beginning of the uncompressed stream.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1367 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1368 uint32_t size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1369
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1370 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1371 * Maximum allowed dictionary size in multi-call mode.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1372 * This is ignored in single-call mode.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1373 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1374 uint32_t size_max;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1375
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1376 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1377 * Amount of memory currently allocated for the dictionary.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1378 * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1379 * size_max is always the same as the allocated size.)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1380 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1381 uint32_t allocated;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1382
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1383 /* Operation mode */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1384 enum xz_mode mode;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1385 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1386
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1387 /* Range decoder */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1388 struct rc_dec {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1389 uint32_t range;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1390 uint32_t code;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1391
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1392 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1393 * Number of initializing bytes remaining to be read
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1394 * by rc_read_init().
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1395 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1396 uint32_t init_bytes_left;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1397
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1398 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1399 * Buffer from which we read our input. It can be either
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1400 * temp.buf or the caller-provided input buffer.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1401 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1402 const uint8_t *in;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1403 size_t in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1404 size_t in_limit;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1405 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1406
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1407 /* Probabilities for a length decoder. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1408 struct lzma_len_dec {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1409 /* Probability of match length being at least 10 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1410 uint16_t choice;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1411
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1412 /* Probability of match length being at least 18 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1413 uint16_t choice2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1414
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1415 /* Probabilities for match lengths 2-9 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1416 uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1417
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1418 /* Probabilities for match lengths 10-17 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1419 uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1420
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1421 /* Probabilities for match lengths 18-273 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1422 uint16_t high[LEN_HIGH_SYMBOLS];
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1423 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1424
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1425 struct lzma_dec {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1426 /* Distances of latest four matches */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1427 uint32_t rep0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1428 uint32_t rep1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1429 uint32_t rep2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1430 uint32_t rep3;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1431
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1432 /* Types of the most recently seen LZMA symbols */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1433 enum lzma_state state;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1434
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1435 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1436 * Length of a match. This is updated so that dict_repeat can
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1437 * be called again to finish repeating the whole match.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1438 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1439 uint32_t len;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1440
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1441 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1442 * LZMA properties or related bit masks (number of literal
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1443 * context bits, a mask dervied from the number of literal
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1444 * position bits, and a mask dervied from the number
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1445 * position bits)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1446 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1447 uint32_t lc;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1448 uint32_t literal_pos_mask; /* (1 << lp) - 1 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1449 uint32_t pos_mask; /* (1 << pb) - 1 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1450
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1451 /* If 1, it's a match. Otherwise it's a single 8-bit literal. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1452 uint16_t is_match[STATES][POS_STATES_MAX];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1453
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1454 /* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1455 uint16_t is_rep[STATES];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1456
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1457 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1458 * If 0, distance of a repeated match is rep0.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1459 * Otherwise check is_rep1.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1460 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1461 uint16_t is_rep0[STATES];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1462
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1463 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1464 * If 0, distance of a repeated match is rep1.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1465 * Otherwise check is_rep2.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1466 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1467 uint16_t is_rep1[STATES];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1468
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1469 /* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1470 uint16_t is_rep2[STATES];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1471
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1472 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1473 * If 1, the repeated match has length of one byte. Otherwise
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1474 * the length is decoded from rep_len_decoder.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1475 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1476 uint16_t is_rep0_long[STATES][POS_STATES_MAX];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1477
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1478 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1479 * Probability tree for the highest two bits of the match
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1480 * distance. There is a separate probability tree for match
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1481 * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1482 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1483 uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1484
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1485 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1486 * Probility trees for additional bits for match distance
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1487 * when the distance is in the range [4, 127].
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1488 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1489 uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1490
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1491 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1492 * Probability tree for the lowest four bits of a match
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1493 * distance that is equal to or greater than 128.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1494 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1495 uint16_t dist_align[ALIGN_SIZE];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1496
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1497 /* Length of a normal match */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1498 struct lzma_len_dec match_len_dec;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1499
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1500 /* Length of a repeated match */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1501 struct lzma_len_dec rep_len_dec;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1502
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1503 /* Probabilities of literals */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1504 uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1505 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1506
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1507 struct lzma2_dec {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1508 /* Position in xz_dec_lzma2_run(). */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1509 enum lzma2_seq {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1510 SEQ_CONTROL,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1511 SEQ_UNCOMPRESSED_1,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1512 SEQ_UNCOMPRESSED_2,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1513 SEQ_COMPRESSED_0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1514 SEQ_COMPRESSED_1,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1515 SEQ_PROPERTIES,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1516 SEQ_LZMA_PREPARE,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1517 SEQ_LZMA_RUN,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1518 SEQ_COPY
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1519 } sequence;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1520
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1521 /* Next position after decoding the compressed size of the chunk. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1522 enum lzma2_seq next_sequence;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1523
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1524 /* Uncompressed size of LZMA chunk (2 MiB at maximum) */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1525 uint32_t uncompressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1526
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1527 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1528 * Compressed size of LZMA chunk or compressed/uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1529 * size of uncompressed chunk (64 KiB at maximum)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1530 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1531 uint32_t compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1532
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1533 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1534 * True if dictionary reset is needed. This is false before
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1535 * the first chunk (LZMA or uncompressed).
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1536 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1537 int need_dict_reset;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1538
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1539 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1540 * True if new LZMA properties are needed. This is false
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1541 * before the first LZMA chunk.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1542 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1543 int need_props;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1544 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1545
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1546 struct xz_dec_lzma2 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1547 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1548 * The order below is important on x86 to reduce code size and
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1549 * it shouldn't hurt on other platforms. Everything up to and
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1550 * including lzma.pos_mask are in the first 128 bytes on x86-32,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1551 * which allows using smaller instructions to access those
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1552 * variables. On x86-64, fewer variables fit into the first 128
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1553 * bytes, but this is still the best order without sacrificing
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1554 * the readability by splitting the structures.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1555 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1556 struct rc_dec rc;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1557 struct dictionary dict;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1558 struct lzma2_dec lzma2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1559 struct lzma_dec lzma;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1560
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1561 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1562 * Temporary buffer which holds small number of input bytes between
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1563 * decoder calls. See lzma2_lzma() for details.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1564 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1565 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1566 uint32_t size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1567 uint8_t buf[3 * LZMA_IN_REQUIRED];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1568 } temp;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1569 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1570
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1571 /**************
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1572 * Dictionary *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1573 **************/
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1574
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1575 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1576 * Reset the dictionary state. When in single-call mode, set up the beginning
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1577 * of the dictionary to point to the actual output buffer.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1578 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1579 static void dict_reset(struct dictionary dict, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1580 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1581 if (DEC_IS_SINGLE(dict->mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1582 dict->buf = b->out + b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1583 dict->end = b->out_size - b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1584 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1585
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1586 dict->start = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1587 dict->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1588 dict->limit = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1589 dict->full = 0;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1590 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1591
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1592 /* Set dictionary write limit */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1593 static void dict_limit(struct dictionary *dict, size_t out_max)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1594 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1595 if (dict->end - dict->pos <= out_max)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1596 dict->limit = dict->end;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1597 else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1598 dict->limit = dict->pos + out_max;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1599 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1600
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1601 /* Return true if at least one byte can be written into the dictionary. */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1602 static inline int dict_has_space(const struct dictionary *dict)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1603 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1604 return dict->pos < dict->limit;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1605 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1606
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1607 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1608 * Get a byte from the dictionary at the given distance. The distance is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1609 * assumed to valid, or as a special case, zero when the dictionary is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1610 * still empty. This special case is needed for single-call decoding to
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1611 * avoid writing a '\0' to the end of the destination buffer.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1612 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1613 static inline uint32_t dict_get(const struct dictionary *dict, uint32_t dist)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1614 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1615 size_t offset = dict->pos - dist - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1616
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1617 if (dist >= dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1618 offset += dict->end;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1619
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1620 return dict->full > 0 ? dict->buf[offset] : 0;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1621 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1622
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1623 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1624 * Put one byte into the dictionary. It is assumed that there is space for it.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1625 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1626 static inline void dict_put(struct dictionary *dict, uint8_t byte)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1627 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1628 dict->buf[dict->pos++] = byte;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1629
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1630 if (dict->full < dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1631 dict->full = dict->pos;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1632 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1633
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1634 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1635 * Repeat given number of bytes from the given distance. If the distance is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1636 * invalid, false is returned. On success, true is returned and *len is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1637 * updated to indicate how many bytes were left to be repeated.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1638 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1639 static int dict_repeat(struct dictionary dict, uint32_t len, uint32_t dist)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1640 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1641 size_t back;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1642 uint32_t left;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1643
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1644 if (dist >= dict->full \|\| dist >= dict->size) return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1645
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1646 left = min_t(size_t, dict->limit - dict->pos, *len);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1647 *len -= left;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1648
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1649 back = dict->pos - dist - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1650 if (dist >= dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1651 back += dict->end;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1652
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1653 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1654 dict->buf[dict->pos++] = dict->buf[back++];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1655 if (back == dict->end)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1656 back = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1657 } while (--left > 0);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1658
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1659 if (dict->full < dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1660 dict->full = dict->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1661
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1662 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1663 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1664
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1665 /* Copy uncompressed data as is from input to dictionary and output buffers. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1666 static void dict_uncompressed(struct dictionary dict, struct xz_buf b,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1667 uint32_t *left)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1668 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1669 size_t copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1670
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1671 while (*left > 0 && b->in_pos < b->in_size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1672 && b->out_pos < b->out_size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1673 copy_size = min(b->in_size - b->in_pos,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1674 b->out_size - b->out_pos);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1675 if (copy_size > dict->end - dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1676 copy_size = dict->end - dict->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1677 if (copy_size > *left)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1678 copy_size = *left;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1679
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1680 *left -= copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1681
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1682 memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1683 dict->pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1684
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1685 if (dict->full < dict->pos)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1686 dict->full = dict->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1687
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1688 if (DEC_IS_MULTI(dict->mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1689 if (dict->pos == dict->end)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1690 dict->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1691
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1692 memcpy(b->out + b->out_pos, b->in + b->in_pos,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1693 copy_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1694 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1695
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1696 dict->start = dict->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1697
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1698 b->out_pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1699 b->in_pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1700 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1701 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1702
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1703 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1704 * Flush pending data from dictionary to b->out. It is assumed that there is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1705 * enough space in b->out. This is guaranteed because caller uses dict_limit()
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1706 * before decoding data into the dictionary.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1707 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1708 static uint32_t dict_flush(struct dictionary dict, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1709 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1710 size_t copy_size = dict->pos - dict->start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1711
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1712 if (DEC_IS_MULTI(dict->mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1713 if (dict->pos == dict->end)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1714 dict->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1715
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1716 memcpy(b->out + b->out_pos, dict->buf + dict->start,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1717 copy_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1718 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1719
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1720 dict->start = dict->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1721 b->out_pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1722 return copy_size;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1723 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1724
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1725 /*****************
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1726 * Range decoder *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1727 *****************/
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1728
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1729 /* Reset the range decoder. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1730 static void rc_reset(struct rc_dec *rc)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1731 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1732 rc->range = (uint32_t)-1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1733 rc->code = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1734 rc->init_bytes_left = RC_INIT_BYTES;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1735 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1736
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1737 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1738 * Read the first five initial bytes into rc->code if they haven't been
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1739 * read already. (Yes, the first byte gets completely ignored.)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1740 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1741 static int rc_read_init(struct rc_dec rc, struct xz_buf b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1742 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1743 while (rc->init_bytes_left > 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1744 if (b->in_pos == b->in_size) return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1745
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1746 rc->code = (rc->code << 8) + b->in[b->in_pos++];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1747 --rc->init_bytes_left;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1748 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1749
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1750 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1751 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1752
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1753 /* Return true if there may not be enough input for the next decoding loop. */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1754 static inline int rc_limit_exceeded(const struct rc_dec *rc)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1755 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1756 return rc->in_pos > rc->in_limit;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1757 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1758
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1759 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1760 * Return true if it is possible (from point of view of range decoder) that
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1761 * we have reached the end of the LZMA chunk.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1762 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	1763 static inline int rc_is_finished(const struct rc_dec *rc)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1764 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1765 return rc->code == 0;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1766 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1767
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1768 /* Read the next input byte if needed. */
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	1769 static inline void rc_normalize(struct rc_dec *rc)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1770 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1771 if (rc->range < RC_TOP_VALUE) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1772 rc->range <<= RC_SHIFT_BITS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1773 rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1774 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1775 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1776
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1777 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1778 * Decode one bit. In some versions, this function has been splitted in three
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1779 * functions so that the compiler is supposed to be able to more easily avoid
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1780 * an extra branch. In this particular version of the LZMA decoder, this
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1781 * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1782 * on x86). Using a non-splitted version results in nicer looking code too.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1783 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1784 * NOTE: This must return an int. Do not make it return a bool or the speed
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1785 * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1786 * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1787 */
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	1788 static inline int rc_bit(struct rc_dec rc, uint16_t prob)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1789 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1790 uint32_t bound;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1791 int bit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1792
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1793 rc_normalize(rc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1794 bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1795 if (rc->code < bound) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1796 rc->range = bound;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1797 prob += (RC_BIT_MODEL_TOTAL - prob) >> RC_MOVE_BITS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1798 bit = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1799 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1800 rc->range -= bound;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1801 rc->code -= bound;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1802 prob -= prob >> RC_MOVE_BITS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1803 bit = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1804 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1805
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1806 return bit;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1807 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1808
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1809 /* Decode a bittree starting from the most significant bit. */
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	1810 static inline uint32_t rc_bittree(struct rc_dec *rc,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1811 uint16_t *probs, uint32_t limit)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1812 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1813 uint32_t symbol = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1814
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1815 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1816 if (rc_bit(rc, &probs[symbol]))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1817 symbol = (symbol << 1) + 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1818 else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1819 symbol <<= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1820 } while (symbol < limit);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1821
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1822 return symbol;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1823 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1824
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1825 /* Decode a bittree starting from the least significant bit. */
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	1826 static inline void rc_bittree_reverse(struct rc_dec *rc,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1827 uint16_t *probs,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1828 uint32_t *dest, uint32_t limit)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1829 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1830 uint32_t symbol = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1831 uint32_t i = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1832
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1833 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1834 if (rc_bit(rc, &probs[symbol])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1835 symbol = (symbol << 1) + 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1836 *dest += 1 << i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1837 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1838 symbol <<= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1839 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1840 } while (++i < limit);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1841 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1842
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1843 /* Decode direct bits (fixed fifty-fifty probability) */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1844 static inline void rc_direct(struct rc_dec rc, uint32_t dest, uint32_t limit)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1845 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1846 uint32_t mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1847
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1848 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1849 rc_normalize(rc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1850 rc->range >>= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1851 rc->code -= rc->range;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1852 mask = (uint32_t)0 - (rc->code >> 31);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1853 rc->code += rc->range & mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1854 dest = (dest << 1) + (mask + 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1855 } while (--limit > 0);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1856 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1857
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1858 /********
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1859 * LZMA *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1860 ********/
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1861
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1862 /* Get pointer to literal coder probability array. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1863 static uint16_t lzma_literal_probs(struct xz_dec_lzma2 s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1864 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1865 uint32_t prev_byte = dict_get(&s->dict, 0);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1866 uint32_t low = prev_byte >> (8 - s->lzma.lc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1867 uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1868 return s->lzma.literal[low + high];
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1869 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1870
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1871 /* Decode a literal (one 8-bit byte) */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1872 static void lzma_literal(struct xz_dec_lzma2 *s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1873 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1874 uint16_t *probs;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1875 uint32_t symbol;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1876 uint32_t match_byte;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1877 uint32_t match_bit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1878 uint32_t offset;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1879 uint32_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1880
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1881 probs = lzma_literal_probs(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1882
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1883 if (lzma_state_is_literal(s->lzma.state)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1884 symbol = rc_bittree(&s->rc, probs, 0x100);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1885 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1886 symbol = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1887 match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1888 offset = 0x100;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1889
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1890 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1891 match_bit = match_byte & offset;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1892 match_byte <<= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1893 i = offset + match_bit + symbol;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1894
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1895 if (rc_bit(&s->rc, &probs[i])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1896 symbol = (symbol << 1) + 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1897 offset &= match_bit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1898 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1899 symbol <<= 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1900 offset &= ~match_bit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1901 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1902 } while (symbol < 0x100);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1903 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1904
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1905 dict_put(&s->dict, (uint8_t)symbol);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1906 lzma_state_literal(&s->lzma.state);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1907 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1908
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1909 /* Decode the length of the match into s->lzma.len. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1910 static void lzma_len(struct xz_dec_lzma2 s, struct lzma_len_dec l,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1911 uint32_t pos_state)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1912 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1913 uint16_t *probs;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1914 uint32_t limit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1915
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1916 if (!rc_bit(&s->rc, &l->choice)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1917 probs = l->low[pos_state];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1918 limit = LEN_LOW_SYMBOLS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1919 s->lzma.len = MATCH_LEN_MIN;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1920 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1921 if (!rc_bit(&s->rc, &l->choice2)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1922 probs = l->mid[pos_state];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1923 limit = LEN_MID_SYMBOLS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1924 s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1925 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1926 probs = l->high;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1927 limit = LEN_HIGH_SYMBOLS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1928 s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1929 + LEN_MID_SYMBOLS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1930 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1931 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1932
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1933 s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1934 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1935
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1936 /* Decode a match. The distance will be stored in s->lzma.rep0. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1937 static void lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1938 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1939 uint16_t *probs;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1940 uint32_t dist_slot;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1941 uint32_t limit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1942
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1943 lzma_state_match(&s->lzma.state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1944
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1945 s->lzma.rep3 = s->lzma.rep2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1946 s->lzma.rep2 = s->lzma.rep1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1947 s->lzma.rep1 = s->lzma.rep0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1948
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1949 lzma_len(s, &s->lzma.match_len_dec, pos_state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1950
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1951 probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1952 dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1953
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1954 if (dist_slot < DIST_MODEL_START) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1955 s->lzma.rep0 = dist_slot;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1956 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1957 limit = (dist_slot >> 1) - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1958 s->lzma.rep0 = 2 + (dist_slot & 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1959
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1960 if (dist_slot < DIST_MODEL_END) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1961 s->lzma.rep0 <<= limit;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1962 probs = s->lzma.dist_special + s->lzma.rep0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1963 - dist_slot - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1964 rc_bittree_reverse(&s->rc, probs,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1965 &s->lzma.rep0, limit);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1966 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1967 rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1968 s->lzma.rep0 <<= ALIGN_BITS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1969 rc_bittree_reverse(&s->rc, s->lzma.dist_align,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1970 &s->lzma.rep0, ALIGN_BITS);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1971 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1972 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1973 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1974
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1975 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1976 * Decode a repeated match. The distance is one of the four most recently
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1977 * seen matches. The distance will be stored in s->lzma.rep0.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1978 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1979 static void lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	1980 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1981 uint32_t tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1982
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1983 if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1984 if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1985 s->lzma.state][pos_state])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1986 lzma_state_short_rep(&s->lzma.state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1987 s->lzma.len = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1988 return;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1989 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1990 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1991 if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1992 tmp = s->lzma.rep1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1993 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1994 if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1995 tmp = s->lzma.rep2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1996 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1997 tmp = s->lzma.rep3;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1998 s->lzma.rep3 = s->lzma.rep2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	1999 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2000
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2001 s->lzma.rep2 = s->lzma.rep1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2002 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2003
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2004 s->lzma.rep1 = s->lzma.rep0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2005 s->lzma.rep0 = tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2006 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2007
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2008 lzma_state_long_rep(&s->lzma.state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2009 lzma_len(s, &s->lzma.rep_len_dec, pos_state);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2010 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2011
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2012 /* LZMA decoder core */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	2013 static int lzma_main(struct xz_dec_lzma2 *s)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2014 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2015 uint32_t pos_state;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2016
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2017 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2018 * If the dictionary was reached during the previous call, try to
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2019 * finish the possibly pending repeat in the dictionary.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2020 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2021 if (dict_has_space(&s->dict) && s->lzma.len > 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2022 dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2023
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2024 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2025 * Decode more LZMA symbols. One iteration may consume up to
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2026 * LZMA_IN_REQUIRED - 1 bytes.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2027 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2028 while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2029 pos_state = s->dict.pos & s->lzma.pos_mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2030
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2031 if (!rc_bit(&s->rc, &s->lzma.is_match[
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2032 s->lzma.state][pos_state])) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2033 lzma_literal(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2034 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2035 if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2036 lzma_rep_match(s, pos_state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2037 else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2038 lzma_match(s, pos_state);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2039
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2040 if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2041 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2042 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2043 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2044
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2045 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2046 * Having the range decoder always normalized when we are outside
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2047 * this function makes it easier to correctly handle end of the chunk.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2048 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2049 rc_normalize(&s->rc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2050
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2051 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2052 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2053
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2054 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2055 * Reset the LZMA decoder and range decoder state. Dictionary is nore reset
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2056 * here, because LZMA state may be reset without resetting the dictionary.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2057 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2058 static void lzma_reset(struct xz_dec_lzma2 *s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2059 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2060 uint16_t *probs;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2061 size_t i;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2062
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2063 s->lzma.state = STATE_LIT_LIT;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2064 s->lzma.rep0 = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2065 s->lzma.rep1 = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2066 s->lzma.rep2 = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2067 s->lzma.rep3 = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2068
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2069 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2070 * All probabilities are initialized to the same value. This hack
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2071 * makes the code smaller by avoiding a separate loop for each
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2072 * probability array.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2073 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2074 * This could be optimized so that only that part of literal
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2075 * probabilities that are actually required. In the common case
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2076 * we would write 12 KiB less.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2077 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2078 probs = s->lzma.is_match[0];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2079 for (i = 0; i < PROBS_TOTAL; ++i)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2080 probs[i] = RC_BIT_MODEL_TOTAL / 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2081
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2082 rc_reset(&s->rc);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2083 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2084
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2085 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2086 * Decode and validate LZMA properties (lc/lp/pb) and calculate the bit masks
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2087 * from the decoded lp and pb values. On success, the LZMA decoder state is
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2088 * reset and true is returned.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2089 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	2090 static int lzma_props(struct xz_dec_lzma2 *s, uint8_t props)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2091 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2092 if (props > (4 * 5 + 4) * 9 + 8)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2093 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2094
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2095 s->lzma.pos_mask = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2096 while (props >= 9 * 5) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2097 props -= 9 * 5;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2098 ++s->lzma.pos_mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2099 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2100
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2101 s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2102
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2103 s->lzma.literal_pos_mask = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2104 while (props >= 9) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2105 props -= 9;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2106 ++s->lzma.literal_pos_mask;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2107 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2108
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2109 s->lzma.lc = props;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2110
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2111 if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2112 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2113
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2114 s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2115
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2116 lzma_reset(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2117
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2118 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2119 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2120
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2121 /*********
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2122 * LZMA2 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2123 *********/
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2124
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2125 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2126 * The LZMA decoder assumes that if the input limit (s->rc.in_limit) hasn't
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2127 * been exceeded, it is safe to read up to LZMA_IN_REQUIRED bytes. This
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2128 * wrapper function takes care of making the LZMA decoder's assumption safe.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2129 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2130 * As long as there is plenty of input left to be decoded in the current LZMA
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2131 * chunk, we decode directly from the caller-supplied input buffer until
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2132 * there's LZMA_IN_REQUIRED bytes left. Those remaining bytes are copied into
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2133 * s->temp.buf, which (hopefully) gets filled on the next call to this
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2134 * function. We decode a few bytes from the temporary buffer so that we can
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2135 * continue decoding from the caller-supplied input buffer again.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2136 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	2137 static int lzma2_lzma(struct xz_dec_lzma2 s, struct xz_buf b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2138 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2139 size_t in_avail;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2140 uint32_t tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2141
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2142 in_avail = b->in_size - b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2143 if (s->temp.size > 0 \|\| s->lzma2.compressed == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2144 tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2145 if (tmp > s->lzma2.compressed - s->temp.size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2146 tmp = s->lzma2.compressed - s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2147 if (tmp > in_avail)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2148 tmp = in_avail;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2149
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2150 memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2151
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2152 if (s->temp.size + tmp == s->lzma2.compressed) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2153 memset(s->temp.buf + s->temp.size + tmp, 0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2154 sizeof(s->temp.buf)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2155 - s->temp.size - tmp);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2156 s->rc.in_limit = s->temp.size + tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2157 } else if (s->temp.size + tmp < LZMA_IN_REQUIRED) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2158 s->temp.size += tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2159 b->in_pos += tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2160 return 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2161 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2162 s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2163 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2164
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2165 s->rc.in = s->temp.buf;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2166 s->rc.in_pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2167
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2168 if (!lzma_main(s) \|\| s->rc.in_pos > s->temp.size + tmp)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2169 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2170
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2171 s->lzma2.compressed -= s->rc.in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2172
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2173 if (s->rc.in_pos < s->temp.size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2174 s->temp.size -= s->rc.in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2175 memmove(s->temp.buf, s->temp.buf + s->rc.in_pos,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2176 s->temp.size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2177 return 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2178 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2179
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2180 b->in_pos += s->rc.in_pos - s->temp.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2181 s->temp.size = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2182 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2183
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2184 in_avail = b->in_size - b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2185 if (in_avail >= LZMA_IN_REQUIRED) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2186 s->rc.in = b->in;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2187 s->rc.in_pos = b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2188
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2189 if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2190 s->rc.in_limit = b->in_pos + s->lzma2.compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2191 else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2192 s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2193
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2194 if (!lzma_main(s))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2195 return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2196
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2197 in_avail = s->rc.in_pos - b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2198 if (in_avail > s->lzma2.compressed) return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2199
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2200 s->lzma2.compressed -= in_avail;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2201 b->in_pos = s->rc.in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2202 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2203
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2204 in_avail = b->in_size - b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2205 if (in_avail < LZMA_IN_REQUIRED) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2206 if (in_avail > s->lzma2.compressed)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2207 in_avail = s->lzma2.compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2208
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2209 memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2210 s->temp.size = in_avail;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2211 b->in_pos += in_avail;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2212 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2213
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2214 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2215 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2216
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2217 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2218 * Take care of the LZMA2 control layer, and forward the job of actual LZMA
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2219 * decoding or copying of uncompressed chunks to other functions.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2220 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	2221 enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2222 struct xz_buf *b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2223 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2224 uint32_t tmp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2225
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2226 while (b->in_pos < b->in_size \|\| s->lzma2.sequence == SEQ_LZMA_RUN) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2227 switch (s->lzma2.sequence) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2228 case SEQ_CONTROL:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2229 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2230 * LZMA2 control byte
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2231 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2232 * Exact values:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2233 * 0x00 End marker
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2234 * 0x01 Dictionary reset followed by
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2235 * an uncompressed chunk
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2236 * 0x02 Uncompressed chunk (no dictionary reset)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2237 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2238 * Highest three bits (s->control & 0xE0):
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2239 * 0xE0 Dictionary reset, new properties and state
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2240 * reset, followed by LZMA compressed chunk
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2241 * 0xC0 New properties and state reset, followed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2242 * by LZMA compressed chunk (no dictionary
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2243 * reset)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2244 * 0xA0 State reset using old properties,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2245 * followed by LZMA compressed chunk (no
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2246 * dictionary reset)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2247 * 0x80 LZMA chunk (no dictionary or state reset)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2248 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2249 * For LZMA compressed chunks, the lowest five bits
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2250 * (s->control & 1F) are the highest bits of the
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2251 * uncompressed size (bits 16-20).
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2252 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2253 * A new LZMA2 stream must begin with a dictionary
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2254 * reset. The first LZMA chunk must set new
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2255 * properties and reset the LZMA state.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2256 *
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2257 * Values that don't match anything described above
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2258 * are invalid and we return XZ_DATA_ERROR.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2259 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2260 tmp = b->in[b->in_pos++];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2261
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2262 if (tmp == 0x00)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2263 return XZ_STREAM_END;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2264
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2265 if (tmp >= 0xE0 \|\| tmp == 0x01) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2266 s->lzma2.need_props = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2267 s->lzma2.need_dict_reset = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2268 dict_reset(&s->dict, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2269 } else if (s->lzma2.need_dict_reset) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2270 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2271 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2272
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2273 if (tmp >= 0x80) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2274 s->lzma2.uncompressed = (tmp & 0x1F) << 16;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2275 s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2276
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2277 if (tmp >= 0xC0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2278 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2279 * When there are new properties,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2280 * state reset is done at
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2281 * SEQ_PROPERTIES.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2282 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2283 s->lzma2.need_props = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2284 s->lzma2.next_sequence
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2285 = SEQ_PROPERTIES;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2286
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2287 } else if (s->lzma2.need_props) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2288 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2289
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2290 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2291 s->lzma2.next_sequence
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2292 = SEQ_LZMA_PREPARE;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2293 if (tmp >= 0xA0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2294 lzma_reset(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2295 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2296 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2297 if (tmp > 0x02)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2298 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2299
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2300 s->lzma2.sequence = SEQ_COMPRESSED_0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2301 s->lzma2.next_sequence = SEQ_COPY;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2302 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2303
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2304 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2305
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2306 case SEQ_UNCOMPRESSED_1:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2307 s->lzma2.uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2308 += (uint32_t)b->in[b->in_pos++] << 8;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2309 s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2310 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2311
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2312 case SEQ_UNCOMPRESSED_2:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2313 s->lzma2.uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2314 += (uint32_t)b->in[b->in_pos++] + 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2315 s->lzma2.sequence = SEQ_COMPRESSED_0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2316 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2317
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2318 case SEQ_COMPRESSED_0:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2319 s->lzma2.compressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2320 = (uint32_t)b->in[b->in_pos++] << 8;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2321 s->lzma2.sequence = SEQ_COMPRESSED_1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2322 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2323
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2324 case SEQ_COMPRESSED_1:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2325 s->lzma2.compressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2326 += (uint32_t)b->in[b->in_pos++] + 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2327 s->lzma2.sequence = s->lzma2.next_sequence;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2328 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2329
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2330 case SEQ_PROPERTIES:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2331 if (!lzma_props(s, b->in[b->in_pos++]))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2332 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2333
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2334 s->lzma2.sequence = SEQ_LZMA_PREPARE;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2335
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2336 case SEQ_LZMA_PREPARE:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2337 if (s->lzma2.compressed < RC_INIT_BYTES)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2338 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2339
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2340 if (!rc_read_init(&s->rc, b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2341 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2342
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2343 s->lzma2.compressed -= RC_INIT_BYTES;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2344 s->lzma2.sequence = SEQ_LZMA_RUN;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2345
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2346 case SEQ_LZMA_RUN:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2347 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2348 * Set dictionary limit to indicate how much we want
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2349 * to be encoded at maximum. Decode new data into the
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2350 * dictionary. Flush the new data from dictionary to
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2351 * b->out. Check if we finished decoding this chunk.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2352 * In case the dictionary got full but we didn't fill
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2353 * the output buffer yet, we may run this loop
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2354 * multiple times without changing s->lzma2.sequence.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2355 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2356 dict_limit(&s->dict, min_t(size_t,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2357 b->out_size - b->out_pos,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2358 s->lzma2.uncompressed));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2359 if (!lzma2_lzma(s, b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2360 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2361
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2362 s->lzma2.uncompressed -= dict_flush(&s->dict, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2363
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2364 if (s->lzma2.uncompressed == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2365 if (s->lzma2.compressed > 0 \|\| s->lzma.len > 0
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2366 \|\| !rc_is_finished(&s->rc))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2367 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2368
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2369 rc_reset(&s->rc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2370 s->lzma2.sequence = SEQ_CONTROL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2371
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2372 } else if (b->out_pos == b->out_size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2373 \|\| (b->in_pos == b->in_size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2374 && s->temp.size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2375 < s->lzma2.compressed)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2376 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2377 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2378
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2379 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2380
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2381 case SEQ_COPY:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2382 dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2383 if (s->lzma2.compressed > 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2384 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2385
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2386 s->lzma2.sequence = SEQ_CONTROL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2387 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2388 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2389 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2390
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2391 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2392 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2393
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	2394 struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2395 uint32_t dict_max)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2396 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2397 struct xz_dec_lzma2 s = malloc(sizeof(s));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2398 if (s == NULL)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2399 return NULL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2400
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2401 s->dict.mode = mode;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2402 s->dict.size_max = dict_max;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2403
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2404 if (DEC_IS_PREALLOC(mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2405 s->dict.buf = malloc(dict_max);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2406 if (s->dict.buf == NULL) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2407 free(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2408 return NULL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2409 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2410 } else if (DEC_IS_DYNALLOC(mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2411 s->dict.buf = NULL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2412 s->dict.allocated = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2413 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2414
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2415 return s;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2416 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2417
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	2418 enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2419 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2420 /* This limits dictionary size to 3 GiB to keep parsing simpler. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2421 if (props > 39)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2422 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2423
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2424 s->dict.size = 2 + (props & 1);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2425 s->dict.size <<= (props >> 1) + 11;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2426
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2427 if (DEC_IS_MULTI(s->dict.mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2428 if (s->dict.size > s->dict.size_max)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2429 return XZ_MEMLIMIT_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2430
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2431 s->dict.end = s->dict.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2432
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2433 if (DEC_IS_DYNALLOC(s->dict.mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2434 if (s->dict.allocated < s->dict.size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2435 free(s->dict.buf);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2436 s->dict.buf = malloc(s->dict.size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2437 if (s->dict.buf == NULL) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2438 s->dict.allocated = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2439 return XZ_MEM_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2440 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2441 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2442 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2443 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2444
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2445 s->lzma.len = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2446
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2447 s->lzma2.sequence = SEQ_CONTROL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2448 s->lzma2.need_dict_reset = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2449
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2450 s->temp.size = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2451
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2452 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2453 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2454
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2455 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2456 * .xz Stream decoder
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2457 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2458
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2459
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2460 // BEGIN xz_stream.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2461 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2462 * Definitions for handling the .xz file format
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2463 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2464
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2465 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2466 * See the .xz file format specification at
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2467 * http://tukaani.org/xz/xz-file-format.txt
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2468 * to understand the container format.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2469 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2470
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2471 #define STREAM_HEADER_SIZE 12
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2472
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2473 #define HEADER_MAGIC "\3757zXZ"
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2474 #define HEADER_MAGIC_SIZE 6
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2475
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2476 #define FOOTER_MAGIC "YZ"
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2477 #define FOOTER_MAGIC_SIZE 2
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2478
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2479 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2480 * Variable-length integer can hold a 63-bit unsigned integer or a special
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2481 * value indicating that the value is unknown.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2482 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2483 * Experimental: vli_type can be defined to uint32_t to save a few bytes
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2484 * in code size (no effect on speed). Doing so limits the uncompressed and
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2485 * compressed size of the file to less than 256 MiB and may also weaken
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2486 * error detection slightly.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2487 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2488 typedef uint64_t vli_type;
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2489
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2490 #define VLI_MAX ((vli_type)-1 / 2)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2491 #define VLI_UNKNOWN ((vli_type)-1)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2492
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2493 /* Maximum encoded size of a VLI */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2494 #define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2495
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2496 /* Integrity Check types */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2497 enum xz_check {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2498 XZ_CHECK_NONE = 0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2499 XZ_CHECK_CRC32 = 1,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2500 XZ_CHECK_CRC64 = 4,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2501 XZ_CHECK_SHA256 = 10
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2502 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2503
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2504 /* Maximum possible Check ID */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2505 #define XZ_CHECK_MAX 15
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2506 // END xz_stream.h
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2507
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	2508 #define IS_CRC64(check_type) ((check_type) == XZ_CHECK_CRC64)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2509
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2510 /* Hash used to validate the Index field */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2511 struct xz_dec_hash {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2512 vli_type unpadded;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2513 vli_type uncompressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2514 uint32_t crc32;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2515 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2516
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2517 struct xz_dec {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2518 /* Position in dec_main() */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2519 enum {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2520 SEQ_STREAM_HEADER,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2521 SEQ_BLOCK_START,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2522 SEQ_BLOCK_HEADER,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2523 SEQ_BLOCK_UNCOMPRESS,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2524 SEQ_BLOCK_PADDING,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2525 SEQ_BLOCK_CHECK,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2526 SEQ_INDEX,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2527 SEQ_INDEX_PADDING,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2528 SEQ_INDEX_CRC32,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2529 SEQ_STREAM_FOOTER
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2530 } sequence;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2531
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2532 /* Position in variable-length integers and Check fields */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2533 uint32_t pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2534
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2535 /* Variable-length integer decoded by dec_vli() */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2536 vli_type vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2537
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2538 /* Saved in_pos and out_pos */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2539 size_t in_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2540 size_t out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2541
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2542 /* CRC32 or CRC64 value in Block or CRC32 value in Index */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2543 uint64_t crc;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2544
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2545 /* Type of the integrity check calculated from uncompressed data */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2546 enum xz_check check_type;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2547
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2548 /* Operation mode */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2549 enum xz_mode mode;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2550
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2551 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2552 * True if the next call to xz_dec_run() is allowed to return
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2553 * XZ_BUF_ERROR.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2554 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2555 int allow_buf_error;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2556
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2557 /* Information stored in Block Header */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2558 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2559 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2560 * Value stored in the Compressed Size field, or
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2561 * VLI_UNKNOWN if Compressed Size is not present.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2562 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2563 vli_type compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2564
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2565 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2566 * Value stored in the Uncompressed Size field, or
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2567 * VLI_UNKNOWN if Uncompressed Size is not present.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2568 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2569 vli_type uncompressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2570
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2571 /* Size of the Block Header field */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2572 uint32_t size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2573 } block_header;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2574
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2575 /* Information collected when decoding Blocks */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2576 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2577 /* Observed compressed size of the current Block */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2578 vli_type compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2579
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2580 /* Observed uncompressed size of the current Block */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2581 vli_type uncompressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2582
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2583 /* Number of Blocks decoded so far */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2584 vli_type count;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2585
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2586 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2587 * Hash calculated from the Block sizes. This is used to
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2588 * validate the Index field.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2589 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2590 struct xz_dec_hash hash;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2591 } block;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2592
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2593 /* Variables needed when verifying the Index field */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2594 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2595 /* Position in dec_index() */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2596 enum {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2597 SEQ_INDEX_COUNT,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2598 SEQ_INDEX_UNPADDED,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2599 SEQ_INDEX_UNCOMPRESSED
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2600 } sequence;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2601
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2602 /* Size of the Index in bytes */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2603 vli_type size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2604
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2605 /* Number of Records (matches block.count in valid files) */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2606 vli_type count;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2607
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2608 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2609 * Hash calculated from the Records (matches block.hash in
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2610 * valid files).
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2611 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2612 struct xz_dec_hash hash;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2613 } index;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2614
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2615 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2616 * Temporary buffer needed to hold Stream Header, Block Header,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2617 * and Stream Footer. The Block Header is the biggest (1 KiB)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2618 * so we reserve space according to that. buf[] has to be aligned
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2619 * to a multiple of four bytes; the size_t variables before it
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2620 * should guarantee this.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2621 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2622 struct {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2623 size_t pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2624 size_t size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2625 uint8_t buf[1024];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2626 } temp;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2627
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2628 struct xz_dec_lzma2 *lzma2;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2629
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2630 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2631 struct xz_dec_bcj *bcj;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2632 int bcj_active;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2633 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2634 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2635
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2636 /* Sizes of the Check field with different Check IDs */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2637 static const uint8_t check_sizes[16] = {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2638 0,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2639 4, 4, 4,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2640 8, 8, 8,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2641 16, 16, 16,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2642 32, 32, 32,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2643 64, 64, 64
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2644 };
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2645
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2646 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2647 * Fill s->temp by copying data starting from b->in[b->in_pos]. Caller
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2648 * must have set s->temp.pos to indicate how much data we are supposed
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2649 * to copy into s->temp.buf. Return true once s->temp.pos has reached
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2650 * s->temp.size.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2651 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	2652 static int fill_temp(struct xz_dec s, struct xz_buf b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2653 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2654 size_t copy_size = min_t(size_t,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2655 b->in_size - b->in_pos, s->temp.size - s->temp.pos);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2656
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2657 memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2658 b->in_pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2659 s->temp.pos += copy_size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2660
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2661 if (s->temp.pos == s->temp.size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2662 s->temp.pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2663 return 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2664 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2665
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2666 return 0;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2667 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2668
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2669 /* Decode a variable-length integer (little-endian base-128 encoding) */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2670 static enum xz_ret dec_vli(struct xz_dec s, const uint8_t in,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2671 size_t *in_pos, size_t in_size)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2672 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2673 uint8_t byte;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2674
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2675 if (s->pos == 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2676 s->vli = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2677
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2678 while (*in_pos < in_size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2679 byte = in[*in_pos];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2680 ++*in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2681
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2682 s->vli \|= (vli_type)(byte & 0x7F) << s->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2683
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2684 if ((byte & 0x80) == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2685 /* Don't allow non-minimal encodings. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2686 if (byte == 0 && s->pos != 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2687 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2688
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2689 s->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2690 return XZ_STREAM_END;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2691 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2692
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2693 s->pos += 7;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2694 if (s->pos == 7 * VLI_BYTES_MAX)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2695 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2696 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2697
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2698 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2699 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2700
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2701 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2702 * Decode the Compressed Data field from a Block. Update and validate
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2703 * the observed compressed and uncompressed sizes of the Block so that
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2704 * they don't exceed the values possibly stored in the Block Header
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2705 * (validation assumes that no integer overflow occurs, since vli_type
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2706 * is normally uint64_t). Update the CRC32 or CRC64 value if presence of
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2707 * the CRC32 or CRC64 field was indicated in Stream Header.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2708 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2709 * Once the decoding is finished, validate that the observed sizes match
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2710 * the sizes possibly stored in the Block Header. Update the hash and
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2711 * Block count, which are later used to validate the Index field.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2712 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2713 static enum xz_ret dec_block(struct xz_dec s, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2714 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2715 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2716
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2717 s->in_start = b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2718 s->out_start = b->out_pos;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2719
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2720 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2721 if (s->bcj_active)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2722 ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2723 else
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2724 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2725 ret = xz_dec_lzma2_run(s->lzma2, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2726
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2727 s->block.compressed += b->in_pos - s->in_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2728 s->block.uncompressed += b->out_pos - s->out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2729
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2730 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2731 * There is no need to separately check for VLI_UNKNOWN, since
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2732 * the observed sizes are always smaller than VLI_UNKNOWN.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2733 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2734 if (s->block.compressed > s->block_header.compressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2735 \|\| s->block.uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2736 > s->block_header.uncompressed)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2737 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2738
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2739 if (s->check_type == XZ_CHECK_CRC32)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2740 s->crc = xz_crc32(b->out + s->out_start,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2741 b->out_pos - s->out_start, s->crc);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2742 else if (s->check_type == XZ_CHECK_CRC64)
944 b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2743 s->crc = ~(s->crc);
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2744 size_t size = b->out_pos - s->out_start;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2745 uint8_t *buf = b->out + s->out_start;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2746 while (size) {
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2747 s->crc = xz_crc64_table[*buf++ ^ (s->crc & 0xFF)] ^ (s->crc >> 8);
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2748 --size;
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2749 }
b4faf2ae39e8 This inlines CRC64, and nothing more. Isaac Dunham <idunham@lavabit.com> parents: 855 diff changeset	2750 s->crc=~(s->crc);
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2751
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2752 if (ret == XZ_STREAM_END) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2753 if (s->block_header.compressed != VLI_UNKNOWN
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2754 && s->block_header.compressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2755 != s->block.compressed)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2756 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2757
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2758 if (s->block_header.uncompressed != VLI_UNKNOWN
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2759 && s->block_header.uncompressed
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2760 != s->block.uncompressed)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2761 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2762
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2763 s->block.hash.unpadded += s->block_header.size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2764 + s->block.compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2765
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2766 s->block.hash.unpadded += check_sizes[s->check_type];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2767
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2768 s->block.hash.uncompressed += s->block.uncompressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2769 s->block.hash.crc32 = xz_crc32(
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2770 (const uint8_t *)&s->block.hash,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2771 sizeof(s->block.hash), s->block.hash.crc32);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2772
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2773 ++s->block.count;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2774 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2775
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2776 return ret;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2777 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2778
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2779 /* Update the Index size and the CRC32 value. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2780 static void index_update(struct xz_dec s, const struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2781 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2782 size_t in_used = b->in_pos - s->in_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2783 s->index.size += in_used;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2784 s->crc = xz_crc32(b->in + s->in_start, in_used, s->crc);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2785 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2786
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2787 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2788 * Decode the Number of Records, Unpadded Size, and Uncompressed Size
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2789 * fields from the Index field. That is, Index Padding and CRC32 are not
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2790 * decoded by this function.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2791 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2792 * This can return XZ_OK (more input needed), XZ_STREAM_END (everything
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2793 * successfully decoded), or XZ_DATA_ERROR (input is corrupt).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2794 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2795 static enum xz_ret dec_index(struct xz_dec s, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2796 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2797 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2798
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2799 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2800 ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2801 if (ret != XZ_STREAM_END) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2802 index_update(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2803 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2804 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2805
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2806 switch (s->index.sequence) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2807 case SEQ_INDEX_COUNT:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2808 s->index.count = s->vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2809
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2810 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2811 * Validate that the Number of Records field
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2812 * indicates the same number of Records as
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2813 * there were Blocks in the Stream.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2814 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2815 if (s->index.count != s->block.count)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2816 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2817
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2818 s->index.sequence = SEQ_INDEX_UNPADDED;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2819 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2820
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2821 case SEQ_INDEX_UNPADDED:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2822 s->index.hash.unpadded += s->vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2823 s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2824 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2825
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2826 case SEQ_INDEX_UNCOMPRESSED:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2827 s->index.hash.uncompressed += s->vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2828 s->index.hash.crc32 = xz_crc32(
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2829 (const uint8_t *)&s->index.hash,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2830 sizeof(s->index.hash),
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2831 s->index.hash.crc32);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2832 --s->index.count;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2833 s->index.sequence = SEQ_INDEX_UNPADDED;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2834 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2835 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2836 } while (s->index.count > 0);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2837
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2838 return XZ_STREAM_END;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2839 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2840
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2841 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2842 * Validate that the next four or eight input bytes match the value
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2843 * of s->crc. s->pos must be zero when starting to validate the first byte.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2844 * The "bits" argument allows using the same code for both CRC32 and CRC64.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2845 */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2846 static enum xz_ret crc_validate(struct xz_dec s, struct xz_buf b,
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2847 uint32_t bits)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2848 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2849 do {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2850 if (b->in_pos == b->in_size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2851 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2852
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2853 if (((s->crc >> s->pos) & 0xFF) != b->in[b->in_pos++])
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2854 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2855
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2856 s->pos += 8;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2857
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2858 } while (s->pos < bits);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2859
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2860 s->crc = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2861 s->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2862
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2863 return XZ_STREAM_END;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2864 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2865
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2866 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2867 * Skip over the Check field when the Check ID is not supported.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2868 * Returns true once the whole Check field has been skipped over.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2869 */
851 db9878df884a More xzcat cleanup. Rob Landley <rob@landley.net> parents: 850 diff changeset	2870 static int check_skip(struct xz_dec s, struct xz_buf b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2871 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2872 while (s->pos < check_sizes[s->check_type]) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2873 if (b->in_pos == b->in_size) return 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2874
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2875 ++b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2876 ++s->pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2877 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2878
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2879 s->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2880
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2881 return 1;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2882 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2883
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2884 /* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2885 static enum xz_ret dec_stream_header(struct xz_dec *s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2886 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2887 if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2888 return XZ_FORMAT_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2889
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2890 if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2891 != get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2892 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2893
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2894 if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2895 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2896
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2897 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2898 * Of integrity checks, we support none (Check ID = 0),
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2899 * CRC32 (Check ID = 1), and optionally CRC64 (Check ID = 4).
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2900 * However, if XZ_DEC_ANY_CHECK is defined, we will accept other
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2901 * check types too, but then the check won't be verified and
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2902 * a warning (XZ_UNSUPPORTED_CHECK) will be given.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2903 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2904 s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2905
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2906 if (s->check_type > XZ_CHECK_MAX)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2907 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2908
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2909 if (s->check_type > XZ_CHECK_CRC32 && !IS_CRC64(s->check_type))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2910 return XZ_UNSUPPORTED_CHECK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2911
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2912 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2913 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2914
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2915 /* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2916 static enum xz_ret dec_stream_footer(struct xz_dec *s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2917 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2918 if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2919 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2920
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2921 if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2922 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2923
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2924 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2925 * Validate Backward Size. Note that we never added the size of the
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2926 * Index CRC32 field to s->index.size, thus we use s->index.size / 4
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2927 * instead of s->index.size / 4 - 1.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2928 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2929 if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2930 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2931
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2932 if (s->temp.buf[8] != 0 \|\| s->temp.buf[9] != s->check_type)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2933 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2934
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2935 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2936 * Use XZ_STREAM_END instead of XZ_OK to be more convenient
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2937 * for the caller.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2938 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2939 return XZ_STREAM_END;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2940 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2941
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2942 /* Decode the Block Header and initialize the filter chain. */
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2943 static enum xz_ret dec_block_header(struct xz_dec *s)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2944 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2945 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2946
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2947 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2948 * Validate the CRC32. We know that the temp buffer is at least
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2949 * eight bytes so this is safe.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2950 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2951 s->temp.size -= 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2952 if (xz_crc32(s->temp.buf, s->temp.size, 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2953 != get_le32(s->temp.buf + s->temp.size))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2954 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2955
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2956 s->temp.pos = 2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2957
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2958 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2959 * Catch unsupported Block Flags. We support only one or two filters
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2960 * in the chain, so we catch that with the same test.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2961 */
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2962 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2963 if (s->temp.buf[1] & 0x3E)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2964 #else
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2965 if (s->temp.buf[1] & 0x3F)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2966 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2967 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2968
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2969 /* Compressed Size */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2970 if (s->temp.buf[1] & 0x40) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2971 if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2972 != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2973 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2974
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2975 s->block_header.compressed = s->vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2976 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2977 s->block_header.compressed = VLI_UNKNOWN;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2978 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2979
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2980 /* Uncompressed Size */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2981 if (s->temp.buf[1] & 0x80) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2982 if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2983 != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2984 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2985
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2986 s->block_header.uncompressed = s->vli;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2987 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2988 s->block_header.uncompressed = VLI_UNKNOWN;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2989 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2990
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	2991 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2992 /* If there are two filters, the first one must be a BCJ filter. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2993 s->bcj_active = s->temp.buf[1] & 0x01;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2994 if (s->bcj_active) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2995 if (s->temp.size - s->temp.pos < 2)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2996 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2997
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2998 ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	2999 if (ret != XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3000 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3001
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3002 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3003 * We don't support custom start offset,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3004 * so Size of Properties must be zero.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3005 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3006 if (s->temp.buf[s->temp.pos++] != 0x00)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3007 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3008 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3009 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3010
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3011 /* Valid Filter Flags always take at least two bytes. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3012 if (s->temp.size - s->temp.pos < 2)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3013 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3014
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3015 /* Filter ID = LZMA2 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3016 if (s->temp.buf[s->temp.pos++] != 0x21)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3017 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3018
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3019 /* Size of Properties = 1-byte Filter Properties */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3020 if (s->temp.buf[s->temp.pos++] != 0x01)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3021 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3022
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3023 /* Filter Properties contains LZMA2 dictionary size. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3024 if (s->temp.size - s->temp.pos < 1)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3025 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3026
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3027 ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3028 if (ret != XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3029 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3030
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3031 /* The rest must be Header Padding. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3032 while (s->temp.pos < s->temp.size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3033 if (s->temp.buf[s->temp.pos++] != 0x00)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3034 return XZ_OPTIONS_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3035
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3036 s->temp.pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3037 s->block.compressed = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3038 s->block.uncompressed = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3039
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3040 return XZ_OK;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3041 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3042
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3043 static enum xz_ret dec_main(struct xz_dec s, struct xz_buf b)
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3044 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3045 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3046
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3047 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3048 * Store the start position for the case when we are in the middle
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3049 * of the Index field.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3050 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3051 s->in_start = b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3052
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3053 for (;;) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3054 switch (s->sequence) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3055 case SEQ_STREAM_HEADER:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3056 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3057 * Stream Header is copied to s->temp, and then
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3058 * decoded from there. This way if the caller
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3059 * gives us only little input at a time, we can
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3060 * still keep the Stream Header decoding code
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3061 * simple. Similar approach is used in many places
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3062 * in this file.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3063 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3064 if (!fill_temp(s, b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3065 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3066
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3067 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3068 * If dec_stream_header() returns
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3069 * XZ_UNSUPPORTED_CHECK, it is still possible
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3070 * to continue decoding if working in multi-call
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3071 * mode. Thus, update s->sequence before calling
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3072 * dec_stream_header().
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3073 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3074 s->sequence = SEQ_BLOCK_START;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3075
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3076 ret = dec_stream_header(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3077 if (ret != XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3078 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3079
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3080 case SEQ_BLOCK_START:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3081 /* We need one byte of input to continue. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3082 if (b->in_pos == b->in_size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3083 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3084
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3085 /* See if this is the beginning of the Index field. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3086 if (b->in[b->in_pos] == 0) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3087 s->in_start = b->in_pos++;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3088 s->sequence = SEQ_INDEX;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3089 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3090 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3091
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3092 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3093 * Calculate the size of the Block Header and
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3094 * prepare to decode it.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3095 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3096 s->block_header.size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3097 = ((uint32_t)b->in[b->in_pos] + 1) * 4;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3098
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3099 s->temp.size = s->block_header.size;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3100 s->temp.pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3101 s->sequence = SEQ_BLOCK_HEADER;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3102
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3103 case SEQ_BLOCK_HEADER:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3104 if (!fill_temp(s, b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3105 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3106
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3107 ret = dec_block_header(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3108 if (ret != XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3109 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3110
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3111 s->sequence = SEQ_BLOCK_UNCOMPRESS;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3112
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3113 case SEQ_BLOCK_UNCOMPRESS:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3114 ret = dec_block(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3115 if (ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3116 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3117
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3118 s->sequence = SEQ_BLOCK_PADDING;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3119
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3120 case SEQ_BLOCK_PADDING:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3121 /*
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3122 * Size of Compressed Data + Block Padding
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3123 * must be a multiple of four. We don't need
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3124 * s->block.compressed for anything else
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3125 * anymore, so we use it here to test the size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3126 * of the Block Padding field.
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3127 */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3128 while (s->block.compressed & 3) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3129 if (b->in_pos == b->in_size)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3130 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3131
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3132 if (b->in[b->in_pos++] != 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3133 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3134
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3135 ++s->block.compressed;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3136 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3137
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3138 s->sequence = SEQ_BLOCK_CHECK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3139
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3140 case SEQ_BLOCK_CHECK:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3141 if (s->check_type == XZ_CHECK_CRC32) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3142 ret = crc_validate(s, b, 32);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3143 if (ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3144 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3145 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3146 else if (IS_CRC64(s->check_type)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3147 ret = crc_validate(s, b, 64);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3148 if (ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3149 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3150 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3151 else if (!check_skip(s, b)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3152 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3153 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3154
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3155 s->sequence = SEQ_BLOCK_START;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3156 break;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3157
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3158 case SEQ_INDEX:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3159 ret = dec_index(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3160 if (ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3161 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3162
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3163 s->sequence = SEQ_INDEX_PADDING;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3164
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3165 case SEQ_INDEX_PADDING:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3166 while ((s->index.size + (b->in_pos - s->in_start))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3167 & 3) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3168 if (b->in_pos == b->in_size) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3169 index_update(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3170 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3171 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3172
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3173 if (b->in[b->in_pos++] != 0)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3174 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3175 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3176
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3177 /* Finish the CRC32 value and Index size. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3178 index_update(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3179
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3180 /* Compare the hashes to validate the Index field. */
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3181 if (!memeq(&s->block.hash, &s->index.hash,
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3182 sizeof(s->block.hash)))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3183 return XZ_DATA_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3184
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3185 s->sequence = SEQ_INDEX_CRC32;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3186
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3187 case SEQ_INDEX_CRC32:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3188 ret = crc_validate(s, b, 32);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3189 if (ret != XZ_STREAM_END)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3190 return ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3191
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3192 s->temp.size = STREAM_HEADER_SIZE;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3193 s->sequence = SEQ_STREAM_FOOTER;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3194
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3195 case SEQ_STREAM_FOOTER:
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3196 if (!fill_temp(s, b))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3197 return XZ_OK;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3198
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3199 return dec_stream_footer(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3200 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3201 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3202
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3203 /* Never reached */
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3204 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3205
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3206 /*
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3207 * xz_dec_run() is a wrapper for dec_main() to handle some special cases in
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3208 * multi-call and single-call decoding.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3209 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3210 * In multi-call mode, we must return XZ_BUF_ERROR when it seems clear that we
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3211 * are not going to make any progress anymore. This is to prevent the caller
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3212 * from calling us infinitely when the input file is truncated or otherwise
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3213 * corrupt. Since zlib-style API allows that the caller fills the input buffer
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3214 * only when the decoder doesn't produce any new output, we have to be careful
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3215 * to avoid returning XZ_BUF_ERROR too easily: XZ_BUF_ERROR is returned only
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3216 * after the second consecutive call to xz_dec_run() that makes no progress.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3217 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3218 * In single-call mode, if we couldn't decode everything and no error
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3219 * occurred, either the input is truncated or the output buffer is too small.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3220 * Since we know that the last input byte never produces any output, we know
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3221 * that if all the input was consumed and decoding wasn't finished, the file
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3222 * must be corrupt. Otherwise the output buffer has to be too small or the
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3223 * file is corrupt in a way that decoding it produces too big output.
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3224 *
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3225 * If single-call decoding fails, we reset b->in_pos and b->out_pos back to
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3226 * their original values. This is because with some filter chains there won't
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3227 * be any valid uncompressed data in the output buffer unless the decoding
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3228 * actually succeeds (that's the price to pay of using the output buffer as
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3229 * the workspace).
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3230 */
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	3231 enum xz_ret xz_dec_run(struct xz_dec s, struct xz_buf b)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3232 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3233 size_t in_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3234 size_t out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3235 enum xz_ret ret;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3236
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3237 if (DEC_IS_SINGLE(s->mode))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3238 xz_dec_reset(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3239
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3240 in_start = b->in_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3241 out_start = b->out_pos;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3242 ret = dec_main(s, b);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3243
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3244 if (DEC_IS_SINGLE(s->mode)) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3245 if (ret == XZ_OK)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3246 ret = b->in_pos == b->in_size
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3247 ? XZ_DATA_ERROR : XZ_BUF_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3248
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3249 if (ret != XZ_STREAM_END) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3250 b->in_pos = in_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3251 b->out_pos = out_start;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3252 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3253
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3254 } else if (ret == XZ_OK && in_start == b->in_pos
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3255 && out_start == b->out_pos) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3256 if (s->allow_buf_error)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3257 ret = XZ_BUF_ERROR;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3258
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3259 s->allow_buf_error = 1;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3260 } else {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3261 s->allow_buf_error = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3262 }
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3263
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3264 return ret;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3265 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3266
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	3267 struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3268 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3269 struct xz_dec s = malloc(sizeof(s));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3270 if (s == NULL)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3271 return NULL;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3272
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3273 s->mode = mode;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3274
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3275 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3276 s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3277 if (s->bcj == NULL)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3278 goto error_bcj;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3279 #endif
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3280
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3281 s->lzma2 = xz_dec_lzma2_create(mode, dict_max);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3282 if (s->lzma2 == NULL)
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3283 goto error_lzma2;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3284
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3285 xz_dec_reset(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3286 return s;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3287
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3288 error_lzma2:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3289 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3290 free(s->bcj);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3291 error_bcj:
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3292 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3293 free(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3294 return NULL;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3295 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3296
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	3297 void xz_dec_reset(struct xz_dec *s)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3298 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3299 s->sequence = SEQ_STREAM_HEADER;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3300 s->allow_buf_error = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3301 s->pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3302 s->crc = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3303 memset(&s->block, 0, sizeof(s->block));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3304 memset(&s->index, 0, sizeof(s->index));
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3305 s->temp.pos = 0;
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3306 s->temp.size = STREAM_HEADER_SIZE;
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3307 }
547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3308
846 e02b4e932cd1 Some xzcat cleanup by Isaac Dunham. Rob Landley <rob@landley.net> parents: 819 diff changeset	3309 void xz_dec_end(struct xz_dec *s)
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3310 {
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3311 if (s != NULL) {
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3312 if (DEC_IS_MULTI((s->lzma2)->dict.mode))
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3313 free((s->lzma2)->dict.buf);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3314 free(s->lzma2);
854 68cdd244f8b1 xzcat: more cleanup and some shrinking. Isaac Dunham <idunham@lavabit.com> parents: 851 diff changeset	3315
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3316 #ifdef XZ_DEC_BCJ
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3317 free(s->bcj);
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3318 #endif
855 88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3319 free(s);
88060f1ff4a4 Convert tabs to spaces. Rob Landley <rob@landley.net> parents: 854 diff changeset	3320 }
819 547f6c1d6972 Isaac Dunham took the public domain xz-embedded code and made an xzcat. I glued all his files together into one big one and threw it in pending. It needs something between cleanup and a complete rewrite. Rob Landley <rob@landley.net> parents: diff changeset	3321 }

Mercurial > hg > toybox

annotate toys/pending/xzcat.c @ 944:b4faf2ae39e8