mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-08 12:44:23 +01:00
Merge branch 'STABLE-BRANCH-1-4' of git+ssh://playfair.gnupg.org/git/gnupg into STABLE-BRANCH-1-4
This commit is contained in:
David Shaw
commit
561d89803b
17
AUTHORS
17
AUTHORS
@ -21,7 +21,7 @@ Daniel Nylander <po@danielnylander.se> [sv]
|
|||||||
David Shaw <dshaw@jabberwocky.com> Assigns past and future changes.
|
David Shaw <dshaw@jabberwocky.com> Assigns past and future changes.
|
||||||
(all in keyserver/,
|
(all in keyserver/,
|
||||||
a lot of changes in g10/ see the ChangeLog,
|
a lot of changes in g10/ see the ChangeLog,
|
||||||
bug fixes here and there)
|
bug fixes here and there)
|
||||||
|
|
||||||
Dokianakis Theofanis <madf@hellug.gr> Translations [el]
|
Dokianakis Theofanis <madf@hellug.gr> Translations [el]
|
||||||
|
|
||||||
@ -73,11 +73,11 @@ Niklas Hernaeus <nh@df.lth.se> Disclaimer
|
|||||||
|
|
||||||
Nilgun Belma Buguner <nilgun@technologist.com> Translations [tr]
|
Nilgun Belma Buguner <nilgun@technologist.com> Translations [tr]
|
||||||
|
|
||||||
Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
|
Nils Ellmenreich <nils 'at' infosun.fmi.uni-passau.de>
|
||||||
Assigns past and future changes
|
Assigns past and future changes
|
||||||
(configure.in, cipher/rndlinux.c, FAQ)
|
(configure.in, cipher/rndlinux.c, FAQ)
|
||||||
|
|
||||||
Paul Eggert <eggert@twinsun.com>
|
Paul Eggert <eggert@twinsun.com>
|
||||||
(configuration macros for LFS)
|
(configuration macros for LFS)
|
||||||
|
|
||||||
Pavel I. Shajdo <pshajdo@gmail.com> Translations [ru]
|
Pavel I. Shajdo <pshajdo@gmail.com> Translations [ru]
|
||||||
@ -125,9 +125,9 @@ Jean-loup Gailly and Mark Adler.
|
|||||||
Most of the stuff in mpi has been taken from the GMP library by
|
Most of the stuff in mpi has been taken from the GMP library by
|
||||||
Torbjorn Granlund <tege@noisy.tmg.se>.
|
Torbjorn Granlund <tege@noisy.tmg.se>.
|
||||||
|
|
||||||
The Rijndael implementation (cipher/rijndael.c) is based on the
|
The Rijndael implementation (cipher/rijndael.c) is based on the
|
||||||
public domain reference code provided for the AES selection process.
|
public domain reference code provided for the AES selection process.
|
||||||
The Rijndael algorithm is due to Joan Daemen and Vincent Rijmen.
|
The Rijndael algorithm is due to Joan Daemen and Vincent Rijmen.
|
||||||
|
|
||||||
The files cipher/rndunix.c and cipher/rndw32.c are based on rndunix.c
|
The files cipher/rndunix.c and cipher/rndw32.c are based on rndunix.c
|
||||||
and rndwin32.c from cryptlib.
|
and rndwin32.c from cryptlib.
|
||||||
@ -143,8 +143,13 @@ several people.
|
|||||||
The files below scripts/conf-w32brg/ is a contribution to GnuPG by
|
The files below scripts/conf-w32brg/ is a contribution to GnuPG by
|
||||||
Brian Gladman and not to be considered a proper part of GnuPG.
|
Brian Gladman and not to be considered a proper part of GnuPG.
|
||||||
|
|
||||||
|
When building for W32, this program uses the included bzip2 code which
|
||||||
|
was written by 1996-2010 Julian R Seward. See bzip/LICENSE for
|
||||||
|
details.
|
||||||
|
|
||||||
Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
|
|
||||||
|
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
||||||
|
2008, 2009, 2010, 2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is free software; as a special exception the author gives
|
This file is free software; as a special exception the author gives
|
||||||
unlimited permission to copy and/or distribute it, with or without
|
unlimited permission to copy and/or distribute it, with or without
|
||||||
|
|||||||
@ -30,7 +30,14 @@ else
|
|||||||
checks = checks
|
checks = checks
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
|
if HAVE_W32_SYSTEM
|
||||||
|
bzlib = bzlib
|
||||||
|
else
|
||||||
|
bzlib =
|
||||||
|
endif
|
||||||
|
|
||||||
|
SUBDIRS = m4 intl zlib ${bzlib} util mpi cipher tools \
|
||||||
|
g10 keyserver po doc ${checks}
|
||||||
|
|
||||||
EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in \
|
EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in \
|
||||||
autogen.sh ChangeLog-2011 po/ChangeLog-2011 \
|
autogen.sh ChangeLog-2011 po/ChangeLog-2011 \
|
||||||
|
|||||||
339
bzlib/CHANGES
Normal file
339
bzlib/CHANGES
Normal file
@ -0,0 +1,339 @@
|
|||||||
|
------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
0.9.0
|
||||||
|
~~~~~
|
||||||
|
First version.
|
||||||
|
|
||||||
|
|
||||||
|
0.9.0a
|
||||||
|
~~~~~~
|
||||||
|
Removed 'ranlib' from Makefile, since most modern Unix-es
|
||||||
|
don't need it, or even know about it.
|
||||||
|
|
||||||
|
|
||||||
|
0.9.0b
|
||||||
|
~~~~~~
|
||||||
|
Fixed a problem with error reporting in bzip2.c. This does not effect
|
||||||
|
the library in any way. Problem is: versions 0.9.0 and 0.9.0a (of the
|
||||||
|
program proper) compress and decompress correctly, but give misleading
|
||||||
|
error messages (internal panics) when an I/O error occurs, instead of
|
||||||
|
reporting the problem correctly. This shouldn't give any data loss
|
||||||
|
(as far as I can see), but is confusing.
|
||||||
|
|
||||||
|
Made the inline declarations disappear for non-GCC compilers.
|
||||||
|
|
||||||
|
|
||||||
|
0.9.0c
|
||||||
|
~~~~~~
|
||||||
|
Fixed some problems in the library pertaining to some boundary cases.
|
||||||
|
This makes the library behave more correctly in those situations. The
|
||||||
|
fixes apply only to features (calls and parameters) not used by
|
||||||
|
bzip2.c, so the non-fixedness of them in previous versions has no
|
||||||
|
effect on reliability of bzip2.c.
|
||||||
|
|
||||||
|
In bzlib.c:
|
||||||
|
* made zero-length BZ_FLUSH work correctly in bzCompress().
|
||||||
|
* fixed bzWrite/bzRead to ignore zero-length requests.
|
||||||
|
* fixed bzread to correctly handle read requests after EOF.
|
||||||
|
* wrong parameter order in call to bzDecompressInit in
|
||||||
|
bzBuffToBuffDecompress. Fixed.
|
||||||
|
|
||||||
|
In compress.c:
|
||||||
|
* changed setting of nGroups in sendMTFValues() so as to
|
||||||
|
do a bit better on small files. This _does_ effect
|
||||||
|
bzip2.c.
|
||||||
|
|
||||||
|
|
||||||
|
0.9.5a
|
||||||
|
~~~~~~
|
||||||
|
Major change: add a fallback sorting algorithm (blocksort.c)
|
||||||
|
to give reasonable behaviour even for very repetitive inputs.
|
||||||
|
Nuked --repetitive-best and --repetitive-fast since they are
|
||||||
|
no longer useful.
|
||||||
|
|
||||||
|
Minor changes: mostly a whole bunch of small changes/
|
||||||
|
bugfixes in the driver (bzip2.c). Changes pertaining to the
|
||||||
|
user interface are:
|
||||||
|
|
||||||
|
allow decompression of symlink'd files to stdout
|
||||||
|
decompress/test files even without .bz2 extension
|
||||||
|
give more accurate error messages for I/O errors
|
||||||
|
when compressing/decompressing to stdout, don't catch control-C
|
||||||
|
read flags from BZIP2 and BZIP environment variables
|
||||||
|
decline to break hard links to a file unless forced with -f
|
||||||
|
allow -c flag even with no filenames
|
||||||
|
preserve file ownerships as far as possible
|
||||||
|
make -s -1 give the expected block size (100k)
|
||||||
|
add a flag -q --quiet to suppress nonessential warnings
|
||||||
|
stop decoding flags after --, so files beginning in - can be handled
|
||||||
|
resolved inconsistent naming: bzcat or bz2cat ?
|
||||||
|
bzip2 --help now returns 0
|
||||||
|
|
||||||
|
Programming-level changes are:
|
||||||
|
|
||||||
|
fixed syntax error in GET_LL4 for Borland C++ 5.02
|
||||||
|
let bzBuffToBuffDecompress return BZ_DATA_ERROR{_MAGIC}
|
||||||
|
fix overshoot of mode-string end in bzopen_or_bzdopen
|
||||||
|
wrapped bzlib.h in #ifdef __cplusplus ... extern "C" { ... }
|
||||||
|
close file handles under all error conditions
|
||||||
|
added minor mods so it compiles with DJGPP out of the box
|
||||||
|
fixed Makefile so it doesn't give problems with BSD make
|
||||||
|
fix uninitialised memory reads in dlltest.c
|
||||||
|
|
||||||
|
0.9.5b
|
||||||
|
~~~~~~
|
||||||
|
Open stdin/stdout in binary mode for DJGPP.
|
||||||
|
|
||||||
|
0.9.5c
|
||||||
|
~~~~~~
|
||||||
|
Changed BZ_N_OVERSHOOT to be ... + 2 instead of ... + 1. The + 1
|
||||||
|
version could cause the sorted order to be wrong in some extremely
|
||||||
|
obscure cases. Also changed setting of quadrant in blocksort.c.
|
||||||
|
|
||||||
|
0.9.5d
|
||||||
|
~~~~~~
|
||||||
|
The only functional change is to make bzlibVersion() in the library
|
||||||
|
return the correct string. This has no effect whatsoever on the
|
||||||
|
functioning of the bzip2 program or library. Added a couple of casts
|
||||||
|
so the library compiles without warnings at level 3 in MS Visual
|
||||||
|
Studio 6.0. Included a Y2K statement in the file Y2K_INFO. All other
|
||||||
|
changes are minor documentation changes.
|
||||||
|
|
||||||
|
1.0
|
||||||
|
~~~
|
||||||
|
Several minor bugfixes and enhancements:
|
||||||
|
|
||||||
|
* Large file support. The library uses 64-bit counters to
|
||||||
|
count the volume of data passing through it. bzip2.c
|
||||||
|
is now compiled with -D_FILE_OFFSET_BITS=64 to get large
|
||||||
|
file support from the C library. -v correctly prints out
|
||||||
|
file sizes greater than 4 gigabytes. All these changes have
|
||||||
|
been made without assuming a 64-bit platform or a C compiler
|
||||||
|
which supports 64-bit ints, so, except for the C library
|
||||||
|
aspect, they are fully portable.
|
||||||
|
|
||||||
|
* Decompression robustness. The library/program should be
|
||||||
|
robust to any corruption of compressed data, detecting and
|
||||||
|
handling _all_ corruption, instead of merely relying on
|
||||||
|
the CRCs. What this means is that the program should
|
||||||
|
never crash, given corrupted data, and the library should
|
||||||
|
always return BZ_DATA_ERROR.
|
||||||
|
|
||||||
|
* Fixed an obscure race-condition bug only ever observed on
|
||||||
|
Solaris, in which, if you were very unlucky and issued
|
||||||
|
control-C at exactly the wrong time, both input and output
|
||||||
|
files would be deleted.
|
||||||
|
|
||||||
|
* Don't run out of file handles on test/decompression when
|
||||||
|
large numbers of files have invalid magic numbers.
|
||||||
|
|
||||||
|
* Avoid library namespace pollution. Prefix all exported
|
||||||
|
symbols with BZ2_.
|
||||||
|
|
||||||
|
* Minor sorting enhancements from my DCC2000 paper.
|
||||||
|
|
||||||
|
* Advance the version number to 1.0, so as to counteract the
|
||||||
|
(false-in-this-case) impression some people have that programs
|
||||||
|
with version numbers less than 1.0 are in some way, experimental,
|
||||||
|
pre-release versions.
|
||||||
|
|
||||||
|
* Create an initial Makefile-libbz2_so to build a shared library.
|
||||||
|
Yes, I know I should really use libtool et al ...
|
||||||
|
|
||||||
|
* Make the program exit with 2 instead of 0 when decompression
|
||||||
|
fails due to a bad magic number (ie, an invalid bzip2 header).
|
||||||
|
Also exit with 1 (as the manual claims :-) whenever a diagnostic
|
||||||
|
message would have been printed AND the corresponding operation
|
||||||
|
is aborted, for example
|
||||||
|
bzip2: Output file xx already exists.
|
||||||
|
When a diagnostic message is printed but the operation is not
|
||||||
|
aborted, for example
|
||||||
|
bzip2: Can't guess original name for wurble -- using wurble.out
|
||||||
|
then the exit value 0 is returned, unless some other problem is
|
||||||
|
also detected.
|
||||||
|
|
||||||
|
I think it corresponds more closely to what the manual claims now.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.1
|
||||||
|
~~~~~
|
||||||
|
* Modified dlltest.c so it uses the new BZ2_ naming scheme.
|
||||||
|
* Modified makefile-msc to fix minor build probs on Win2k.
|
||||||
|
* Updated README.COMPILATION.PROBLEMS.
|
||||||
|
|
||||||
|
There are no functionality changes or bug fixes relative to version
|
||||||
|
1.0.0. This is just a documentation update + a fix for minor Win32
|
||||||
|
build problems. For almost everyone, upgrading from 1.0.0 to 1.0.1 is
|
||||||
|
utterly pointless. Don't bother.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.2
|
||||||
|
~~~~~
|
||||||
|
A bug fix release, addressing various minor issues which have appeared
|
||||||
|
in the 18 or so months since 1.0.1 was released. Most of the fixes
|
||||||
|
are to do with file-handling or documentation bugs. To the best of my
|
||||||
|
knowledge, there have been no data-loss-causing bugs reported in the
|
||||||
|
compression/decompression engine of 1.0.0 or 1.0.1.
|
||||||
|
|
||||||
|
Note that this release does not improve the rather crude build system
|
||||||
|
for Unix platforms. The general plan here is to autoconfiscate/
|
||||||
|
libtoolise 1.0.2 soon after release, and release the result as 1.1.0
|
||||||
|
or perhaps 1.2.0. That, however, is still just a plan at this point.
|
||||||
|
|
||||||
|
Here are the changes in 1.0.2. Bug-reporters and/or patch-senders in
|
||||||
|
parentheses.
|
||||||
|
|
||||||
|
* Fix an infinite segfault loop in 1.0.1 when a directory is
|
||||||
|
encountered in -f (force) mode.
|
||||||
|
(Trond Eivind Glomsrod, Nicholas Nethercote, Volker Schmidt)
|
||||||
|
|
||||||
|
* Avoid double fclose() of output file on certain I/O error paths.
|
||||||
|
(Solar Designer)
|
||||||
|
|
||||||
|
* Don't fail with internal error 1007 when fed a long stream (> 48MB)
|
||||||
|
of byte 251. Also print useful message suggesting that 1007s may be
|
||||||
|
caused by bad memory.
|
||||||
|
(noticed by Juan Pedro Vallejo, fixed by me)
|
||||||
|
|
||||||
|
* Fix uninitialised variable silly bug in demo prog dlltest.c.
|
||||||
|
(Jorj Bauer)
|
||||||
|
|
||||||
|
* Remove 512-MB limitation on recovered file size for bzip2recover
|
||||||
|
on selected platforms which support 64-bit ints. At the moment
|
||||||
|
all GCC supported platforms, and Win32.
|
||||||
|
(me, Alson van der Meulen)
|
||||||
|
|
||||||
|
* Hard-code header byte values, to give correct operation on platforms
|
||||||
|
using EBCDIC as their native character set (IBM's OS/390).
|
||||||
|
(Leland Lucius)
|
||||||
|
|
||||||
|
* Copy file access times correctly.
|
||||||
|
(Marty Leisner)
|
||||||
|
|
||||||
|
* Add distclean and check targets to Makefile.
|
||||||
|
(Michael Carmack)
|
||||||
|
|
||||||
|
* Parameterise use of ar and ranlib in Makefile. Also add $(LDFLAGS).
|
||||||
|
(Rich Ireland, Bo Thorsen)
|
||||||
|
|
||||||
|
* Pass -p (create parent dirs as needed) to mkdir during make install.
|
||||||
|
(Jeremy Fusco)
|
||||||
|
|
||||||
|
* Dereference symlinks when copying file permissions in -f mode.
|
||||||
|
(Volker Schmidt)
|
||||||
|
|
||||||
|
* Majorly simplify implementation of uInt64_qrm10.
|
||||||
|
(Bo Lindbergh)
|
||||||
|
|
||||||
|
* Check the input file still exists before deleting the output one,
|
||||||
|
when aborting in cleanUpAndFail().
|
||||||
|
(Joerg Prante, Robert Linden, Matthias Krings)
|
||||||
|
|
||||||
|
Also a bunch of patches courtesy of Philippe Troin, the Debian maintainer
|
||||||
|
of bzip2:
|
||||||
|
|
||||||
|
* Wrapper scripts (with manpages): bzdiff, bzgrep, bzmore.
|
||||||
|
|
||||||
|
* Spelling changes and minor enhancements in bzip2.1.
|
||||||
|
|
||||||
|
* Avoid race condition between creating the output file and setting its
|
||||||
|
interim permissions safely, by using fopen_output_safely().
|
||||||
|
No changes to bzip2recover since there is no issue with file
|
||||||
|
permissions there.
|
||||||
|
|
||||||
|
* do not print senseless report with -v when compressing an empty
|
||||||
|
file.
|
||||||
|
|
||||||
|
* bzcat -f works on non-bzip2 files.
|
||||||
|
|
||||||
|
* do not try to escape shell meta-characters on unix (the shell takes
|
||||||
|
care of these).
|
||||||
|
|
||||||
|
* added --fast and --best aliases for -1 -9 for gzip compatibility.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.3 (15 Feb 05)
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
Fixes some minor bugs since the last version, 1.0.2.
|
||||||
|
|
||||||
|
* Further robustification against corrupted compressed data.
|
||||||
|
There are currently no known bitstreams which can cause the
|
||||||
|
decompressor to crash, loop or access memory which does not
|
||||||
|
belong to it. If you are using bzip2 or the library to
|
||||||
|
decompress bitstreams from untrusted sources, an upgrade
|
||||||
|
to 1.0.3 is recommended. This fixes CAN-2005-1260.
|
||||||
|
|
||||||
|
* The documentation has been converted to XML, from which html
|
||||||
|
and pdf can be derived.
|
||||||
|
|
||||||
|
* Various minor bugs in the documentation have been fixed.
|
||||||
|
|
||||||
|
* Fixes for various compilation warnings with newer versions of
|
||||||
|
gcc, and on 64-bit platforms.
|
||||||
|
|
||||||
|
* The BZ_NO_STDIO cpp symbol was not properly observed in 1.0.2.
|
||||||
|
This has been fixed.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.4 (20 Dec 06)
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
Fixes some minor bugs since the last version, 1.0.3.
|
||||||
|
|
||||||
|
* Fix file permissions race problem (CAN-2005-0953).
|
||||||
|
|
||||||
|
* Avoid possible segfault in BZ2_bzclose. From Coverity's NetBSD
|
||||||
|
scan.
|
||||||
|
|
||||||
|
* 'const'/prototype cleanups in the C code.
|
||||||
|
|
||||||
|
* Change default install location to /usr/local, and handle multiple
|
||||||
|
'make install's without error.
|
||||||
|
|
||||||
|
* Sanitise file names more carefully in bzgrep. Fixes CAN-2005-0758
|
||||||
|
to the extent that applies to bzgrep.
|
||||||
|
|
||||||
|
* Use 'mktemp' rather than 'tempfile' in bzdiff.
|
||||||
|
|
||||||
|
* Tighten up a couple of assertions in blocksort.c following automated
|
||||||
|
analysis.
|
||||||
|
|
||||||
|
* Fix minor doc/comment bugs.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.5 (10 Dec 07)
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
|
||||||
|
|
||||||
|
|
||||||
|
1.0.6 (6 Sept 10)
|
||||||
|
~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
* Security fix for CVE-2010-0405. This was reported by Mikolaj
|
||||||
|
Izdebski.
|
||||||
|
|
||||||
|
* Make the documentation build on Ubuntu 10.04
|
||||||
|
|
||||||
|
|
||||||
|
1.0.6 (2010-09-23)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* Stripped down by g10 Code GmbH. Tarball renamed to bzip2-1.0.6-g10.tar.gz
|
||||||
|
|
||||||
|
|
||||||
|
1.0.6 (2012-01-13)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* New Makefile and included into the GnuPG 1.4 source.
|
||||||
42
bzlib/LICENSE
Normal file
42
bzlib/LICENSE
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
|
|
||||||
|
This program, "bzip2", the associated library "libbzip2", and all
|
||||||
|
documentation, are copyright (C) 1996-2010 Julian R Seward. All
|
||||||
|
rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions
|
||||||
|
are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
2. The origin of this software must not be misrepresented; you must
|
||||||
|
not claim that you wrote the original software. If you use this
|
||||||
|
software in a product, an acknowledgment in the product
|
||||||
|
documentation would be appreciated but is not required.
|
||||||
|
|
||||||
|
3. Altered source versions must be plainly marked as such, and must
|
||||||
|
not be misrepresented as being the original software.
|
||||||
|
|
||||||
|
4. The name of the author may not be used to endorse or promote
|
||||||
|
products derived from this software without specific prior written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||||
|
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||||
|
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||||
|
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||||
|
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||||
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
Julian Seward, jseward@bzip.org
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
|
||||||
|
--------------------------------------------------------------------------
|
||||||
23
bzlib/Makefile.am
Normal file
23
bzlib/Makefile.am
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
# ------------------------------------------------------------------
|
||||||
|
# This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
# lossless, block-sorting data compression.
|
||||||
|
#
|
||||||
|
# bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
#
|
||||||
|
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
# README file.
|
||||||
|
#
|
||||||
|
# This program is released under the terms of the license contained
|
||||||
|
# in the file LICENSE.
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Modified by g10 Code on 2010-09-23.
|
||||||
|
# Changed to automake by g10 Code on 2012-01-13.
|
||||||
|
|
||||||
|
EXTRA_DIST = README README.1st CHANGES LICENSE
|
||||||
|
|
||||||
|
noinst_LIBRARIES = libbz2.a
|
||||||
|
|
||||||
|
libbz2_a_SOURCES = blocksort.c huffman.c crctable.c randtable.c \
|
||||||
|
compress.c decompress.c bzlib.c bzlib.h bzlib_private.h
|
||||||
214
bzlib/README
Normal file
214
bzlib/README
Normal file
@ -0,0 +1,214 @@
|
|||||||
|
This is the README for bzip2/libzip2.
|
||||||
|
This version is fully compatible with the previous public releases.
|
||||||
|
|
||||||
|
------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------
|
||||||
|
|
||||||
|
Complete documentation is available in Postscript form (manual.ps),
|
||||||
|
PDF (manual.pdf) or html (manual.html). A plain-text version of the
|
||||||
|
manual page is available as bzip2.txt.
|
||||||
|
|
||||||
|
|
||||||
|
HOW TO BUILD -- UNIX
|
||||||
|
|
||||||
|
Type 'make'. This builds the library libbz2.a and then the programs
|
||||||
|
bzip2 and bzip2recover. Six self-tests are run. If the self-tests
|
||||||
|
complete ok, carry on to installation:
|
||||||
|
|
||||||
|
To install in /usr/local/bin, /usr/local/lib, /usr/local/man and
|
||||||
|
/usr/local/include, type
|
||||||
|
|
||||||
|
make install
|
||||||
|
|
||||||
|
To install somewhere else, eg, /xxx/yyy/{bin,lib,man,include}, type
|
||||||
|
|
||||||
|
make install PREFIX=/xxx/yyy
|
||||||
|
|
||||||
|
If you are (justifiably) paranoid and want to see what 'make install'
|
||||||
|
is going to do, you can first do
|
||||||
|
|
||||||
|
make -n install or
|
||||||
|
make -n install PREFIX=/xxx/yyy respectively.
|
||||||
|
|
||||||
|
The -n instructs make to show the commands it would execute, but not
|
||||||
|
actually execute them.
|
||||||
|
|
||||||
|
|
||||||
|
HOW TO BUILD -- UNIX, shared library libbz2.so.
|
||||||
|
|
||||||
|
Do 'make -f Makefile-libbz2_so'. This Makefile seems to work for
|
||||||
|
Linux-ELF (RedHat 7.2 on an x86 box), with gcc. I make no claims
|
||||||
|
that it works for any other platform, though I suspect it probably
|
||||||
|
will work for most platforms employing both ELF and gcc.
|
||||||
|
|
||||||
|
bzip2-shared, a client of the shared library, is also built, but not
|
||||||
|
self-tested. So I suggest you also build using the normal Makefile,
|
||||||
|
since that conducts a self-test. A second reason to prefer the
|
||||||
|
version statically linked to the library is that, on x86 platforms,
|
||||||
|
building shared objects makes a valuable register (%ebx) unavailable
|
||||||
|
to gcc, resulting in a slowdown of 10%-20%, at least for bzip2.
|
||||||
|
|
||||||
|
Important note for people upgrading .so's from 0.9.0/0.9.5 to version
|
||||||
|
1.0.X. All the functions in the library have been renamed, from (eg)
|
||||||
|
bzCompress to BZ2_bzCompress, to avoid namespace pollution.
|
||||||
|
Unfortunately this means that the libbz2.so created by
|
||||||
|
Makefile-libbz2_so will not work with any program which used an older
|
||||||
|
version of the library. I do encourage library clients to make the
|
||||||
|
effort to upgrade to use version 1.0, since it is both faster and more
|
||||||
|
robust than previous versions.
|
||||||
|
|
||||||
|
|
||||||
|
HOW TO BUILD -- Windows 95, NT, DOS, Mac, etc.
|
||||||
|
|
||||||
|
It's difficult for me to support compilation on all these platforms.
|
||||||
|
My approach is to collect binaries for these platforms, and put them
|
||||||
|
on the master web site (http://www.bzip.org). Look there. However
|
||||||
|
(FWIW), bzip2-1.0.X is very standard ANSI C and should compile
|
||||||
|
unmodified with MS Visual C. If you have difficulties building, you
|
||||||
|
might want to read README.COMPILATION.PROBLEMS.
|
||||||
|
|
||||||
|
At least using MS Visual C++ 6, you can build from the unmodified
|
||||||
|
sources by issuing, in a command shell:
|
||||||
|
|
||||||
|
nmake -f makefile.msc
|
||||||
|
|
||||||
|
(you may need to first run the MSVC-provided script VCVARS32.BAT
|
||||||
|
so as to set up paths to the MSVC tools correctly).
|
||||||
|
|
||||||
|
|
||||||
|
VALIDATION
|
||||||
|
|
||||||
|
Correct operation, in the sense that a compressed file can always be
|
||||||
|
decompressed to reproduce the original, is obviously of paramount
|
||||||
|
importance. To validate bzip2, I used a modified version of Mark
|
||||||
|
Nelson's churn program. Churn is an automated test driver which
|
||||||
|
recursively traverses a directory structure, using bzip2 to compress
|
||||||
|
and then decompress each file it encounters, and checking that the
|
||||||
|
decompressed data is the same as the original.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Please read and be aware of the following:
|
||||||
|
|
||||||
|
WARNING:
|
||||||
|
|
||||||
|
This program and library (attempts to) compress data by
|
||||||
|
performing several non-trivial transformations on it.
|
||||||
|
Unless you are 100% familiar with *all* the algorithms
|
||||||
|
contained herein, and with the consequences of modifying them,
|
||||||
|
you should NOT meddle with the compression or decompression
|
||||||
|
machinery. Incorrect changes can and very likely *will*
|
||||||
|
lead to disastrous loss of data.
|
||||||
|
|
||||||
|
|
||||||
|
DISCLAIMER:
|
||||||
|
|
||||||
|
I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE
|
||||||
|
USE OF THIS PROGRAM/LIBRARY, HOWSOEVER CAUSED.
|
||||||
|
|
||||||
|
Every compression of a file implies an assumption that the
|
||||||
|
compressed file can be decompressed to reproduce the original.
|
||||||
|
Great efforts in design, coding and testing have been made to
|
||||||
|
ensure that this program works correctly. However, the complexity
|
||||||
|
of the algorithms, and, in particular, the presence of various
|
||||||
|
special cases in the code which occur with very low but non-zero
|
||||||
|
probability make it impossible to rule out the possibility of bugs
|
||||||
|
remaining in the program. DO NOT COMPRESS ANY DATA WITH THIS
|
||||||
|
PROGRAM UNLESS YOU ARE PREPARED TO ACCEPT THE POSSIBILITY, HOWEVER
|
||||||
|
SMALL, THAT THE DATA WILL NOT BE RECOVERABLE.
|
||||||
|
|
||||||
|
That is not to say this program is inherently unreliable.
|
||||||
|
Indeed, I very much hope the opposite is true. bzip2/libbzip2
|
||||||
|
has been carefully constructed and extensively tested.
|
||||||
|
|
||||||
|
|
||||||
|
PATENTS:
|
||||||
|
|
||||||
|
To the best of my knowledge, bzip2/libbzip2 does not use any
|
||||||
|
patented algorithms. However, I do not have the resources
|
||||||
|
to carry out a patent search. Therefore I cannot give any
|
||||||
|
guarantee of the above statement.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
WHAT'S NEW IN 0.9.0 (as compared to 0.1pl2) ?
|
||||||
|
|
||||||
|
* Approx 10% faster compression, 30% faster decompression
|
||||||
|
* -t (test mode) is a lot quicker
|
||||||
|
* Can decompress concatenated compressed files
|
||||||
|
* Programming interface, so programs can directly read/write .bz2 files
|
||||||
|
* Less restrictive (BSD-style) licensing
|
||||||
|
* Flag handling more compatible with GNU gzip
|
||||||
|
* Much more documentation, i.e., a proper user manual
|
||||||
|
* Hopefully, improved portability (at least of the library)
|
||||||
|
|
||||||
|
WHAT'S NEW IN 0.9.5 ?
|
||||||
|
|
||||||
|
* Compression speed is much less sensitive to the input
|
||||||
|
data than in previous versions. Specifically, the very
|
||||||
|
slow performance caused by repetitive data is fixed.
|
||||||
|
* Many small improvements in file and flag handling.
|
||||||
|
* A Y2K statement.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.0 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.2 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.3 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.4 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.5 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
WHAT'S NEW IN 1.0.6 ?
|
||||||
|
|
||||||
|
See the CHANGES file.
|
||||||
|
|
||||||
|
|
||||||
|
I hope you find bzip2 useful. Feel free to contact me at
|
||||||
|
jseward@bzip.org
|
||||||
|
if you have any suggestions or queries. Many people mailed me with
|
||||||
|
comments, suggestions and patches after the releases of bzip-0.15,
|
||||||
|
bzip-0.21, and bzip2 versions 0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1,
|
||||||
|
1.0.2 and 1.0.3, and the changes in bzip2 are largely a result of this
|
||||||
|
feedback. I thank you for your comments.
|
||||||
|
|
||||||
|
bzip2's "home" is http://www.bzip.org/
|
||||||
|
|
||||||
|
Julian Seward
|
||||||
|
jseward@bzip.org
|
||||||
|
Cambridge, UK.
|
||||||
|
|
||||||
|
18 July 1996 (version 0.15)
|
||||||
|
25 August 1996 (version 0.21)
|
||||||
|
7 August 1997 (bzip2, version 0.1)
|
||||||
|
29 August 1997 (bzip2, version 0.1pl2)
|
||||||
|
23 August 1998 (bzip2, version 0.9.0)
|
||||||
|
8 June 1999 (bzip2, version 0.9.5)
|
||||||
|
4 Sept 1999 (bzip2, version 0.9.5d)
|
||||||
|
5 May 2000 (bzip2, version 1.0pre8)
|
||||||
|
30 December 2001 (bzip2, version 1.0.2pre1)
|
||||||
|
15 February 2005 (bzip2, version 1.0.3)
|
||||||
|
20 December 2006 (bzip2, version 1.0.4)
|
||||||
|
10 December 2007 (bzip2, version 1.0.5)
|
||||||
|
6 Sept 2010 (bzip2, version 1.0.6)
|
||||||
9
bzlib/README.1st
Normal file
9
bzlib/README.1st
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
This is a stripped down version of bzip2 - version 1.0.6.
|
||||||
|
|
||||||
|
It does not include any drivers but merely builds the libbz2.a
|
||||||
|
library. The source has been taken from www.bzip.org on 2010-09-23
|
||||||
|
and stripped down by g10 Code GmbH for use with Gpg4win and to be
|
||||||
|
included into the GnupG 1.4.12 source.
|
||||||
|
|
||||||
|
The only changed files are Makefile and bzlib.h (disabled Windows
|
||||||
|
specific code).
|
||||||
1094
bzlib/blocksort.c
Normal file
1094
bzlib/blocksort.c
Normal file
File diff suppressed because it is too large
Load Diff
1572
bzlib/bzlib.c
Normal file
1572
bzlib/bzlib.c
Normal file
File diff suppressed because it is too large
Load Diff
284
bzlib/bzlib.h
Normal file
284
bzlib/bzlib.h
Normal file
@ -0,0 +1,284 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Public header file for the library. ---*/
|
||||||
|
/*--- bzlib.h ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef _BZLIB_H
|
||||||
|
#define _BZLIB_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define BZ_RUN 0
|
||||||
|
#define BZ_FLUSH 1
|
||||||
|
#define BZ_FINISH 2
|
||||||
|
|
||||||
|
#define BZ_OK 0
|
||||||
|
#define BZ_RUN_OK 1
|
||||||
|
#define BZ_FLUSH_OK 2
|
||||||
|
#define BZ_FINISH_OK 3
|
||||||
|
#define BZ_STREAM_END 4
|
||||||
|
#define BZ_SEQUENCE_ERROR (-1)
|
||||||
|
#define BZ_PARAM_ERROR (-2)
|
||||||
|
#define BZ_MEM_ERROR (-3)
|
||||||
|
#define BZ_DATA_ERROR (-4)
|
||||||
|
#define BZ_DATA_ERROR_MAGIC (-5)
|
||||||
|
#define BZ_IO_ERROR (-6)
|
||||||
|
#define BZ_UNEXPECTED_EOF (-7)
|
||||||
|
#define BZ_OUTBUFF_FULL (-8)
|
||||||
|
#define BZ_CONFIG_ERROR (-9)
|
||||||
|
|
||||||
|
typedef
|
||||||
|
struct {
|
||||||
|
char *next_in;
|
||||||
|
unsigned int avail_in;
|
||||||
|
unsigned int total_in_lo32;
|
||||||
|
unsigned int total_in_hi32;
|
||||||
|
|
||||||
|
char *next_out;
|
||||||
|
unsigned int avail_out;
|
||||||
|
unsigned int total_out_lo32;
|
||||||
|
unsigned int total_out_hi32;
|
||||||
|
|
||||||
|
void *state;
|
||||||
|
|
||||||
|
void *(*bzalloc)(void *,int,int);
|
||||||
|
void (*bzfree)(void *,void *);
|
||||||
|
void *opaque;
|
||||||
|
}
|
||||||
|
bz_stream;
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef BZ_IMPORT
|
||||||
|
#define BZ_EXPORT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef BZ_NO_STDIO
|
||||||
|
/* Need a definitition for FILE */
|
||||||
|
#include <stdio.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* We do not need a DLL and thus we don't want to include the
|
||||||
|
Windows header file. (g10 Code, 2007-08-20) */
|
||||||
|
#if defined( _WIN32 ) && 0
|
||||||
|
# include <windows.h>
|
||||||
|
# ifdef small
|
||||||
|
/* windows.h define small to char */
|
||||||
|
# undef small
|
||||||
|
# endif
|
||||||
|
# ifdef BZ_EXPORT
|
||||||
|
# define BZ_API(func) WINAPI func
|
||||||
|
# define BZ_EXTERN extern
|
||||||
|
# else
|
||||||
|
/* import windows dll dynamically */
|
||||||
|
# define BZ_API(func) (WINAPI * func)
|
||||||
|
# define BZ_EXTERN
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
# define BZ_API(func) func
|
||||||
|
# define BZ_EXTERN extern
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Core (low-level) library functions --*/
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
|
||||||
|
bz_stream* strm,
|
||||||
|
int blockSize100k,
|
||||||
|
int verbosity,
|
||||||
|
int workFactor
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzCompress) (
|
||||||
|
bz_stream* strm,
|
||||||
|
int action
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
|
||||||
|
bz_stream* strm
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
|
||||||
|
bz_stream *strm,
|
||||||
|
int verbosity,
|
||||||
|
int small
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
|
||||||
|
bz_stream* strm
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
|
||||||
|
bz_stream *strm
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- High(er) level library functions --*/
|
||||||
|
|
||||||
|
#ifndef BZ_NO_STDIO
|
||||||
|
#define BZ_MAX_UNUSED 5000
|
||||||
|
|
||||||
|
typedef void BZFILE;
|
||||||
|
|
||||||
|
BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
|
||||||
|
int* bzerror,
|
||||||
|
FILE* f,
|
||||||
|
int verbosity,
|
||||||
|
int small,
|
||||||
|
void* unused,
|
||||||
|
int nUnused
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzReadClose) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b,
|
||||||
|
void** unused,
|
||||||
|
int* nUnused
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzRead) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b,
|
||||||
|
void* buf,
|
||||||
|
int len
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) (
|
||||||
|
int* bzerror,
|
||||||
|
FILE* f,
|
||||||
|
int blockSize100k,
|
||||||
|
int verbosity,
|
||||||
|
int workFactor
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzWrite) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b,
|
||||||
|
void* buf,
|
||||||
|
int len
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzWriteClose) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b,
|
||||||
|
int abandon,
|
||||||
|
unsigned int* nbytes_in,
|
||||||
|
unsigned int* nbytes_out
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
|
||||||
|
int* bzerror,
|
||||||
|
BZFILE* b,
|
||||||
|
int abandon,
|
||||||
|
unsigned int* nbytes_in_lo32,
|
||||||
|
unsigned int* nbytes_in_hi32,
|
||||||
|
unsigned int* nbytes_out_lo32,
|
||||||
|
unsigned int* nbytes_out_hi32
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Utility functions --*/
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) (
|
||||||
|
char* dest,
|
||||||
|
unsigned int* destLen,
|
||||||
|
char* source,
|
||||||
|
unsigned int sourceLen,
|
||||||
|
int blockSize100k,
|
||||||
|
int verbosity,
|
||||||
|
int workFactor
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
|
||||||
|
char* dest,
|
||||||
|
unsigned int* destLen,
|
||||||
|
char* source,
|
||||||
|
unsigned int sourceLen,
|
||||||
|
int small,
|
||||||
|
int verbosity
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
|
||||||
|
to support better zlib compatibility.
|
||||||
|
This code is not _officially_ part of libbzip2 (yet);
|
||||||
|
I haven't tested it, documented it, or considered the
|
||||||
|
threading-safeness of it.
|
||||||
|
If this code breaks, please contact both Yoshioka and me.
|
||||||
|
--*/
|
||||||
|
|
||||||
|
BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
|
||||||
|
void
|
||||||
|
);
|
||||||
|
|
||||||
|
#ifndef BZ_NO_STDIO
|
||||||
|
BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
|
||||||
|
const char *path,
|
||||||
|
const char *mode
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
|
||||||
|
int fd,
|
||||||
|
const char *mode
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzread) (
|
||||||
|
BZFILE* b,
|
||||||
|
void* buf,
|
||||||
|
int len
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzwrite) (
|
||||||
|
BZFILE* b,
|
||||||
|
void* buf,
|
||||||
|
int len
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN int BZ_API(BZ2_bzflush) (
|
||||||
|
BZFILE* b
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN void BZ_API(BZ2_bzclose) (
|
||||||
|
BZFILE* b
|
||||||
|
);
|
||||||
|
|
||||||
|
BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
|
||||||
|
BZFILE *b,
|
||||||
|
int *errnum
|
||||||
|
);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end bzlib.h ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
509
bzlib/bzlib_private.h
Normal file
509
bzlib/bzlib_private.h
Normal file
@ -0,0 +1,509 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Private header file for the library. ---*/
|
||||||
|
/*--- bzlib_private.h ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef _BZLIB_PRIVATE_H
|
||||||
|
#define _BZLIB_PRIVATE_H
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#ifndef BZ_NO_STDIO
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <string.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "bzlib.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- General stuff. --*/
|
||||||
|
|
||||||
|
#define BZ_VERSION "1.0.6, 6-Sept-2010"
|
||||||
|
|
||||||
|
typedef char Char;
|
||||||
|
typedef unsigned char Bool;
|
||||||
|
typedef unsigned char UChar;
|
||||||
|
typedef int Int32;
|
||||||
|
typedef unsigned int UInt32;
|
||||||
|
typedef short Int16;
|
||||||
|
typedef unsigned short UInt16;
|
||||||
|
|
||||||
|
#define True ((Bool)1)
|
||||||
|
#define False ((Bool)0)
|
||||||
|
|
||||||
|
#ifndef __GNUC__
|
||||||
|
#define __inline__ /* */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef BZ_NO_STDIO
|
||||||
|
|
||||||
|
extern void BZ2_bz__AssertH__fail ( int errcode );
|
||||||
|
#define AssertH(cond,errcode) \
|
||||||
|
{ if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
|
||||||
|
|
||||||
|
#if BZ_DEBUG
|
||||||
|
#define AssertD(cond,msg) \
|
||||||
|
{ if (!(cond)) { \
|
||||||
|
fprintf ( stderr, \
|
||||||
|
"\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
|
||||||
|
exit(1); \
|
||||||
|
}}
|
||||||
|
#else
|
||||||
|
#define AssertD(cond,msg) /* */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define VPrintf0(zf) \
|
||||||
|
fprintf(stderr,zf)
|
||||||
|
#define VPrintf1(zf,za1) \
|
||||||
|
fprintf(stderr,zf,za1)
|
||||||
|
#define VPrintf2(zf,za1,za2) \
|
||||||
|
fprintf(stderr,zf,za1,za2)
|
||||||
|
#define VPrintf3(zf,za1,za2,za3) \
|
||||||
|
fprintf(stderr,zf,za1,za2,za3)
|
||||||
|
#define VPrintf4(zf,za1,za2,za3,za4) \
|
||||||
|
fprintf(stderr,zf,za1,za2,za3,za4)
|
||||||
|
#define VPrintf5(zf,za1,za2,za3,za4,za5) \
|
||||||
|
fprintf(stderr,zf,za1,za2,za3,za4,za5)
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
extern void bz_internal_error ( int errcode );
|
||||||
|
#define AssertH(cond,errcode) \
|
||||||
|
{ if (!(cond)) bz_internal_error ( errcode ); }
|
||||||
|
#define AssertD(cond,msg) do { } while (0)
|
||||||
|
#define VPrintf0(zf) do { } while (0)
|
||||||
|
#define VPrintf1(zf,za1) do { } while (0)
|
||||||
|
#define VPrintf2(zf,za1,za2) do { } while (0)
|
||||||
|
#define VPrintf3(zf,za1,za2,za3) do { } while (0)
|
||||||
|
#define VPrintf4(zf,za1,za2,za3,za4) do { } while (0)
|
||||||
|
#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
|
||||||
|
#define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp))
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Header bytes. --*/
|
||||||
|
|
||||||
|
#define BZ_HDR_B 0x42 /* 'B' */
|
||||||
|
#define BZ_HDR_Z 0x5a /* 'Z' */
|
||||||
|
#define BZ_HDR_h 0x68 /* 'h' */
|
||||||
|
#define BZ_HDR_0 0x30 /* '0' */
|
||||||
|
|
||||||
|
/*-- Constants for the back end. --*/
|
||||||
|
|
||||||
|
#define BZ_MAX_ALPHA_SIZE 258
|
||||||
|
#define BZ_MAX_CODE_LEN 23
|
||||||
|
|
||||||
|
#define BZ_RUNA 0
|
||||||
|
#define BZ_RUNB 1
|
||||||
|
|
||||||
|
#define BZ_N_GROUPS 6
|
||||||
|
#define BZ_G_SIZE 50
|
||||||
|
#define BZ_N_ITERS 4
|
||||||
|
|
||||||
|
#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Stuff for randomising repetitive blocks. --*/
|
||||||
|
|
||||||
|
extern Int32 BZ2_rNums[512];
|
||||||
|
|
||||||
|
#define BZ_RAND_DECLS \
|
||||||
|
Int32 rNToGo; \
|
||||||
|
Int32 rTPos \
|
||||||
|
|
||||||
|
#define BZ_RAND_INIT_MASK \
|
||||||
|
s->rNToGo = 0; \
|
||||||
|
s->rTPos = 0 \
|
||||||
|
|
||||||
|
#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
|
||||||
|
|
||||||
|
#define BZ_RAND_UPD_MASK \
|
||||||
|
if (s->rNToGo == 0) { \
|
||||||
|
s->rNToGo = BZ2_rNums[s->rTPos]; \
|
||||||
|
s->rTPos++; \
|
||||||
|
if (s->rTPos == 512) s->rTPos = 0; \
|
||||||
|
} \
|
||||||
|
s->rNToGo--;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Stuff for doing CRCs. --*/
|
||||||
|
|
||||||
|
extern UInt32 BZ2_crc32Table[256];
|
||||||
|
|
||||||
|
#define BZ_INITIALISE_CRC(crcVar) \
|
||||||
|
{ \
|
||||||
|
crcVar = 0xffffffffL; \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define BZ_FINALISE_CRC(crcVar) \
|
||||||
|
{ \
|
||||||
|
crcVar = ~(crcVar); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define BZ_UPDATE_CRC(crcVar,cha) \
|
||||||
|
{ \
|
||||||
|
crcVar = (crcVar << 8) ^ \
|
||||||
|
BZ2_crc32Table[(crcVar >> 24) ^ \
|
||||||
|
((UChar)cha)]; \
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- States and modes for compression. --*/
|
||||||
|
|
||||||
|
#define BZ_M_IDLE 1
|
||||||
|
#define BZ_M_RUNNING 2
|
||||||
|
#define BZ_M_FLUSHING 3
|
||||||
|
#define BZ_M_FINISHING 4
|
||||||
|
|
||||||
|
#define BZ_S_OUTPUT 1
|
||||||
|
#define BZ_S_INPUT 2
|
||||||
|
|
||||||
|
#define BZ_N_RADIX 2
|
||||||
|
#define BZ_N_QSORT 12
|
||||||
|
#define BZ_N_SHELL 18
|
||||||
|
#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Structure holding all the compression-side stuff. --*/
|
||||||
|
|
||||||
|
typedef
|
||||||
|
struct {
|
||||||
|
/* pointer back to the struct bz_stream */
|
||||||
|
bz_stream* strm;
|
||||||
|
|
||||||
|
/* mode this stream is in, and whether inputting */
|
||||||
|
/* or outputting data */
|
||||||
|
Int32 mode;
|
||||||
|
Int32 state;
|
||||||
|
|
||||||
|
/* remembers avail_in when flush/finish requested */
|
||||||
|
UInt32 avail_in_expect;
|
||||||
|
|
||||||
|
/* for doing the block sorting */
|
||||||
|
UInt32* arr1;
|
||||||
|
UInt32* arr2;
|
||||||
|
UInt32* ftab;
|
||||||
|
Int32 origPtr;
|
||||||
|
|
||||||
|
/* aliases for arr1 and arr2 */
|
||||||
|
UInt32* ptr;
|
||||||
|
UChar* block;
|
||||||
|
UInt16* mtfv;
|
||||||
|
UChar* zbits;
|
||||||
|
|
||||||
|
/* for deciding when to use the fallback sorting algorithm */
|
||||||
|
Int32 workFactor;
|
||||||
|
|
||||||
|
/* run-length-encoding of the input */
|
||||||
|
UInt32 state_in_ch;
|
||||||
|
Int32 state_in_len;
|
||||||
|
BZ_RAND_DECLS;
|
||||||
|
|
||||||
|
/* input and output limits and current posns */
|
||||||
|
Int32 nblock;
|
||||||
|
Int32 nblockMAX;
|
||||||
|
Int32 numZ;
|
||||||
|
Int32 state_out_pos;
|
||||||
|
|
||||||
|
/* map of bytes used in block */
|
||||||
|
Int32 nInUse;
|
||||||
|
Bool inUse[256];
|
||||||
|
UChar unseqToSeq[256];
|
||||||
|
|
||||||
|
/* the buffer for bit stream creation */
|
||||||
|
UInt32 bsBuff;
|
||||||
|
Int32 bsLive;
|
||||||
|
|
||||||
|
/* block and combined CRCs */
|
||||||
|
UInt32 blockCRC;
|
||||||
|
UInt32 combinedCRC;
|
||||||
|
|
||||||
|
/* misc administratium */
|
||||||
|
Int32 verbosity;
|
||||||
|
Int32 blockNo;
|
||||||
|
Int32 blockSize100k;
|
||||||
|
|
||||||
|
/* stuff for coding the MTF values */
|
||||||
|
Int32 nMTF;
|
||||||
|
Int32 mtfFreq [BZ_MAX_ALPHA_SIZE];
|
||||||
|
UChar selector [BZ_MAX_SELECTORS];
|
||||||
|
UChar selectorMtf[BZ_MAX_SELECTORS];
|
||||||
|
|
||||||
|
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 rfreq [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
/* second dimension: only 3 needed; 4 makes index calculations faster */
|
||||||
|
UInt32 len_pack[BZ_MAX_ALPHA_SIZE][4];
|
||||||
|
|
||||||
|
}
|
||||||
|
EState;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- externs for compression. --*/
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_blockSort ( EState* );
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_compressBlock ( EState*, Bool );
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_bsInitWrite ( EState* );
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- states for decompression. --*/
|
||||||
|
|
||||||
|
#define BZ_X_IDLE 1
|
||||||
|
#define BZ_X_OUTPUT 2
|
||||||
|
|
||||||
|
#define BZ_X_MAGIC_1 10
|
||||||
|
#define BZ_X_MAGIC_2 11
|
||||||
|
#define BZ_X_MAGIC_3 12
|
||||||
|
#define BZ_X_MAGIC_4 13
|
||||||
|
#define BZ_X_BLKHDR_1 14
|
||||||
|
#define BZ_X_BLKHDR_2 15
|
||||||
|
#define BZ_X_BLKHDR_3 16
|
||||||
|
#define BZ_X_BLKHDR_4 17
|
||||||
|
#define BZ_X_BLKHDR_5 18
|
||||||
|
#define BZ_X_BLKHDR_6 19
|
||||||
|
#define BZ_X_BCRC_1 20
|
||||||
|
#define BZ_X_BCRC_2 21
|
||||||
|
#define BZ_X_BCRC_3 22
|
||||||
|
#define BZ_X_BCRC_4 23
|
||||||
|
#define BZ_X_RANDBIT 24
|
||||||
|
#define BZ_X_ORIGPTR_1 25
|
||||||
|
#define BZ_X_ORIGPTR_2 26
|
||||||
|
#define BZ_X_ORIGPTR_3 27
|
||||||
|
#define BZ_X_MAPPING_1 28
|
||||||
|
#define BZ_X_MAPPING_2 29
|
||||||
|
#define BZ_X_SELECTOR_1 30
|
||||||
|
#define BZ_X_SELECTOR_2 31
|
||||||
|
#define BZ_X_SELECTOR_3 32
|
||||||
|
#define BZ_X_CODING_1 33
|
||||||
|
#define BZ_X_CODING_2 34
|
||||||
|
#define BZ_X_CODING_3 35
|
||||||
|
#define BZ_X_MTF_1 36
|
||||||
|
#define BZ_X_MTF_2 37
|
||||||
|
#define BZ_X_MTF_3 38
|
||||||
|
#define BZ_X_MTF_4 39
|
||||||
|
#define BZ_X_MTF_5 40
|
||||||
|
#define BZ_X_MTF_6 41
|
||||||
|
#define BZ_X_ENDHDR_2 42
|
||||||
|
#define BZ_X_ENDHDR_3 43
|
||||||
|
#define BZ_X_ENDHDR_4 44
|
||||||
|
#define BZ_X_ENDHDR_5 45
|
||||||
|
#define BZ_X_ENDHDR_6 46
|
||||||
|
#define BZ_X_CCRC_1 47
|
||||||
|
#define BZ_X_CCRC_2 48
|
||||||
|
#define BZ_X_CCRC_3 49
|
||||||
|
#define BZ_X_CCRC_4 50
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Constants for the fast MTF decoder. --*/
|
||||||
|
|
||||||
|
#define MTFA_SIZE 4096
|
||||||
|
#define MTFL_SIZE 16
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Structure holding all the decompression-side stuff. --*/
|
||||||
|
|
||||||
|
typedef
|
||||||
|
struct {
|
||||||
|
/* pointer back to the struct bz_stream */
|
||||||
|
bz_stream* strm;
|
||||||
|
|
||||||
|
/* state indicator for this stream */
|
||||||
|
Int32 state;
|
||||||
|
|
||||||
|
/* for doing the final run-length decoding */
|
||||||
|
UChar state_out_ch;
|
||||||
|
Int32 state_out_len;
|
||||||
|
Bool blockRandomised;
|
||||||
|
BZ_RAND_DECLS;
|
||||||
|
|
||||||
|
/* the buffer for bit stream reading */
|
||||||
|
UInt32 bsBuff;
|
||||||
|
Int32 bsLive;
|
||||||
|
|
||||||
|
/* misc administratium */
|
||||||
|
Int32 blockSize100k;
|
||||||
|
Bool smallDecompress;
|
||||||
|
Int32 currBlockNo;
|
||||||
|
Int32 verbosity;
|
||||||
|
|
||||||
|
/* for undoing the Burrows-Wheeler transform */
|
||||||
|
Int32 origPtr;
|
||||||
|
UInt32 tPos;
|
||||||
|
Int32 k0;
|
||||||
|
Int32 unzftab[256];
|
||||||
|
Int32 nblock_used;
|
||||||
|
Int32 cftab[257];
|
||||||
|
Int32 cftabCopy[257];
|
||||||
|
|
||||||
|
/* for undoing the Burrows-Wheeler transform (FAST) */
|
||||||
|
UInt32 *tt;
|
||||||
|
|
||||||
|
/* for undoing the Burrows-Wheeler transform (SMALL) */
|
||||||
|
UInt16 *ll16;
|
||||||
|
UChar *ll4;
|
||||||
|
|
||||||
|
/* stored and calculated CRCs */
|
||||||
|
UInt32 storedBlockCRC;
|
||||||
|
UInt32 storedCombinedCRC;
|
||||||
|
UInt32 calculatedBlockCRC;
|
||||||
|
UInt32 calculatedCombinedCRC;
|
||||||
|
|
||||||
|
/* map of bytes used in block */
|
||||||
|
Int32 nInUse;
|
||||||
|
Bool inUse[256];
|
||||||
|
Bool inUse16[16];
|
||||||
|
UChar seqToUnseq[256];
|
||||||
|
|
||||||
|
/* for decoding the MTF values */
|
||||||
|
UChar mtfa [MTFA_SIZE];
|
||||||
|
Int32 mtfbase[256 / MTFL_SIZE];
|
||||||
|
UChar selector [BZ_MAX_SELECTORS];
|
||||||
|
UChar selectorMtf[BZ_MAX_SELECTORS];
|
||||||
|
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
|
||||||
|
Int32 limit [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 base [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 perm [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 minLens[BZ_N_GROUPS];
|
||||||
|
|
||||||
|
/* save area for scalars in the main decompress code */
|
||||||
|
Int32 save_i;
|
||||||
|
Int32 save_j;
|
||||||
|
Int32 save_t;
|
||||||
|
Int32 save_alphaSize;
|
||||||
|
Int32 save_nGroups;
|
||||||
|
Int32 save_nSelectors;
|
||||||
|
Int32 save_EOB;
|
||||||
|
Int32 save_groupNo;
|
||||||
|
Int32 save_groupPos;
|
||||||
|
Int32 save_nextSym;
|
||||||
|
Int32 save_nblockMAX;
|
||||||
|
Int32 save_nblock;
|
||||||
|
Int32 save_es;
|
||||||
|
Int32 save_N;
|
||||||
|
Int32 save_curr;
|
||||||
|
Int32 save_zt;
|
||||||
|
Int32 save_zn;
|
||||||
|
Int32 save_zvec;
|
||||||
|
Int32 save_zj;
|
||||||
|
Int32 save_gSel;
|
||||||
|
Int32 save_gMinlen;
|
||||||
|
Int32* save_gLimit;
|
||||||
|
Int32* save_gBase;
|
||||||
|
Int32* save_gPerm;
|
||||||
|
|
||||||
|
}
|
||||||
|
DState;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*-- Macros for decompression. --*/
|
||||||
|
|
||||||
|
#define BZ_GET_FAST(cccc) \
|
||||||
|
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
||||||
|
if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
|
||||||
|
s->tPos = s->tt[s->tPos]; \
|
||||||
|
cccc = (UChar)(s->tPos & 0xff); \
|
||||||
|
s->tPos >>= 8;
|
||||||
|
|
||||||
|
#define BZ_GET_FAST_C(cccc) \
|
||||||
|
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
||||||
|
if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
|
||||||
|
c_tPos = c_tt[c_tPos]; \
|
||||||
|
cccc = (UChar)(c_tPos & 0xff); \
|
||||||
|
c_tPos >>= 8;
|
||||||
|
|
||||||
|
#define SET_LL4(i,n) \
|
||||||
|
{ if (((i) & 0x1) == 0) \
|
||||||
|
s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \
|
||||||
|
s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define GET_LL4(i) \
|
||||||
|
((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
|
||||||
|
|
||||||
|
#define SET_LL(i,n) \
|
||||||
|
{ s->ll16[i] = (UInt16)(n & 0x0000ffff); \
|
||||||
|
SET_LL4(i, n >> 16); \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define GET_LL(i) \
|
||||||
|
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
|
||||||
|
|
||||||
|
#define BZ_GET_SMALL(cccc) \
|
||||||
|
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
||||||
|
if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
|
||||||
|
cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
|
||||||
|
s->tPos = GET_LL(s->tPos);
|
||||||
|
|
||||||
|
|
||||||
|
/*-- externs for decompression. --*/
|
||||||
|
|
||||||
|
extern Int32
|
||||||
|
BZ2_indexIntoF ( Int32, Int32* );
|
||||||
|
|
||||||
|
extern Int32
|
||||||
|
BZ2_decompress ( DState* );
|
||||||
|
|
||||||
|
extern void
|
||||||
|
BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
|
||||||
|
Int32, Int32, Int32 );
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
|
||||||
|
|
||||||
|
#ifdef BZ_NO_STDIO
|
||||||
|
#ifndef NULL
|
||||||
|
#define NULL 0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end bzlib_private.h ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
672
bzlib/compress.c
Normal file
672
bzlib/compress.c
Normal file
@ -0,0 +1,672 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Compression machinery (not incl block sorting) ---*/
|
||||||
|
/*--- compress.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
/* CHANGES
|
||||||
|
0.9.0 -- original version.
|
||||||
|
0.9.0a/b -- no changes in this file.
|
||||||
|
0.9.0c -- changed setting of nGroups in sendMTFValues()
|
||||||
|
so as to do a bit better on small files
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "bzlib_private.h"
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
/*--- Bit stream I/O ---*/
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
void BZ2_bsInitWrite ( EState* s )
|
||||||
|
{
|
||||||
|
s->bsLive = 0;
|
||||||
|
s->bsBuff = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void bsFinishWrite ( EState* s )
|
||||||
|
{
|
||||||
|
while (s->bsLive > 0) {
|
||||||
|
s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
|
||||||
|
s->numZ++;
|
||||||
|
s->bsBuff <<= 8;
|
||||||
|
s->bsLive -= 8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
#define bsNEEDW(nz) \
|
||||||
|
{ \
|
||||||
|
while (s->bsLive >= 8) { \
|
||||||
|
s->zbits[s->numZ] \
|
||||||
|
= (UChar)(s->bsBuff >> 24); \
|
||||||
|
s->numZ++; \
|
||||||
|
s->bsBuff <<= 8; \
|
||||||
|
s->bsLive -= 8; \
|
||||||
|
} \
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
__inline__
|
||||||
|
void bsW ( EState* s, Int32 n, UInt32 v )
|
||||||
|
{
|
||||||
|
bsNEEDW ( n );
|
||||||
|
s->bsBuff |= (v << (32 - s->bsLive - n));
|
||||||
|
s->bsLive += n;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void bsPutUInt32 ( EState* s, UInt32 u )
|
||||||
|
{
|
||||||
|
bsW ( s, 8, (u >> 24) & 0xffL );
|
||||||
|
bsW ( s, 8, (u >> 16) & 0xffL );
|
||||||
|
bsW ( s, 8, (u >> 8) & 0xffL );
|
||||||
|
bsW ( s, 8, u & 0xffL );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void bsPutUChar ( EState* s, UChar c )
|
||||||
|
{
|
||||||
|
bsW( s, 8, (UInt32)c );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
/*--- The back end proper ---*/
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void makeMaps_e ( EState* s )
|
||||||
|
{
|
||||||
|
Int32 i;
|
||||||
|
s->nInUse = 0;
|
||||||
|
for (i = 0; i < 256; i++)
|
||||||
|
if (s->inUse[i]) {
|
||||||
|
s->unseqToSeq[i] = s->nInUse;
|
||||||
|
s->nInUse++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void generateMTFValues ( EState* s )
|
||||||
|
{
|
||||||
|
UChar yy[256];
|
||||||
|
Int32 i, j;
|
||||||
|
Int32 zPend;
|
||||||
|
Int32 wr;
|
||||||
|
Int32 EOB;
|
||||||
|
|
||||||
|
/*
|
||||||
|
After sorting (eg, here),
|
||||||
|
s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
|
||||||
|
and
|
||||||
|
((UChar*)s->arr2) [ 0 .. s->nblock-1 ]
|
||||||
|
holds the original block data.
|
||||||
|
|
||||||
|
The first thing to do is generate the MTF values,
|
||||||
|
and put them in
|
||||||
|
((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
|
||||||
|
Because there are strictly fewer or equal MTF values
|
||||||
|
than block values, ptr values in this area are overwritten
|
||||||
|
with MTF values only when they are no longer needed.
|
||||||
|
|
||||||
|
The final compressed bitstream is generated into the
|
||||||
|
area starting at
|
||||||
|
(UChar*) (&((UChar*)s->arr2)[s->nblock])
|
||||||
|
|
||||||
|
These storage aliases are set up in bzCompressInit(),
|
||||||
|
except for the last one, which is arranged in
|
||||||
|
compressBlock().
|
||||||
|
*/
|
||||||
|
UInt32* ptr = s->ptr;
|
||||||
|
UChar* block = s->block;
|
||||||
|
UInt16* mtfv = s->mtfv;
|
||||||
|
|
||||||
|
makeMaps_e ( s );
|
||||||
|
EOB = s->nInUse+1;
|
||||||
|
|
||||||
|
for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
|
||||||
|
|
||||||
|
wr = 0;
|
||||||
|
zPend = 0;
|
||||||
|
for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
|
||||||
|
|
||||||
|
for (i = 0; i < s->nblock; i++) {
|
||||||
|
UChar ll_i;
|
||||||
|
AssertD ( wr <= i, "generateMTFValues(1)" );
|
||||||
|
j = ptr[i]-1; if (j < 0) j += s->nblock;
|
||||||
|
ll_i = s->unseqToSeq[block[j]];
|
||||||
|
AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
|
||||||
|
|
||||||
|
if (yy[0] == ll_i) {
|
||||||
|
zPend++;
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (zPend > 0) {
|
||||||
|
zPend--;
|
||||||
|
while (True) {
|
||||||
|
if (zPend & 1) {
|
||||||
|
mtfv[wr] = BZ_RUNB; wr++;
|
||||||
|
s->mtfFreq[BZ_RUNB]++;
|
||||||
|
} else {
|
||||||
|
mtfv[wr] = BZ_RUNA; wr++;
|
||||||
|
s->mtfFreq[BZ_RUNA]++;
|
||||||
|
}
|
||||||
|
if (zPend < 2) break;
|
||||||
|
zPend = (zPend - 2) / 2;
|
||||||
|
};
|
||||||
|
zPend = 0;
|
||||||
|
}
|
||||||
|
{
|
||||||
|
register UChar rtmp;
|
||||||
|
register UChar* ryy_j;
|
||||||
|
register UChar rll_i;
|
||||||
|
rtmp = yy[1];
|
||||||
|
yy[1] = yy[0];
|
||||||
|
ryy_j = &(yy[1]);
|
||||||
|
rll_i = ll_i;
|
||||||
|
while ( rll_i != rtmp ) {
|
||||||
|
register UChar rtmp2;
|
||||||
|
ryy_j++;
|
||||||
|
rtmp2 = rtmp;
|
||||||
|
rtmp = *ryy_j;
|
||||||
|
*ryy_j = rtmp2;
|
||||||
|
};
|
||||||
|
yy[0] = rtmp;
|
||||||
|
j = ryy_j - &(yy[0]);
|
||||||
|
mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (zPend > 0) {
|
||||||
|
zPend--;
|
||||||
|
while (True) {
|
||||||
|
if (zPend & 1) {
|
||||||
|
mtfv[wr] = BZ_RUNB; wr++;
|
||||||
|
s->mtfFreq[BZ_RUNB]++;
|
||||||
|
} else {
|
||||||
|
mtfv[wr] = BZ_RUNA; wr++;
|
||||||
|
s->mtfFreq[BZ_RUNA]++;
|
||||||
|
}
|
||||||
|
if (zPend < 2) break;
|
||||||
|
zPend = (zPend - 2) / 2;
|
||||||
|
};
|
||||||
|
zPend = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
|
||||||
|
|
||||||
|
s->nMTF = wr;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
#define BZ_LESSER_ICOST 0
|
||||||
|
#define BZ_GREATER_ICOST 15
|
||||||
|
|
||||||
|
static
|
||||||
|
void sendMTFValues ( EState* s )
|
||||||
|
{
|
||||||
|
Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
|
||||||
|
Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
|
||||||
|
Int32 nGroups, nBytes;
|
||||||
|
|
||||||
|
/*--
|
||||||
|
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
is a global since the decoder also needs it.
|
||||||
|
|
||||||
|
Int32 code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
Int32 rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
||||||
|
are also globals only used in this proc.
|
||||||
|
Made global to keep stack frame size small.
|
||||||
|
--*/
|
||||||
|
|
||||||
|
|
||||||
|
UInt16 cost[BZ_N_GROUPS];
|
||||||
|
Int32 fave[BZ_N_GROUPS];
|
||||||
|
|
||||||
|
UInt16* mtfv = s->mtfv;
|
||||||
|
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf3( " %d in block, %d after MTF & 1-2 coding, "
|
||||||
|
"%d+2 syms in use\n",
|
||||||
|
s->nblock, s->nMTF, s->nInUse );
|
||||||
|
|
||||||
|
alphaSize = s->nInUse+2;
|
||||||
|
for (t = 0; t < BZ_N_GROUPS; t++)
|
||||||
|
for (v = 0; v < alphaSize; v++)
|
||||||
|
s->len[t][v] = BZ_GREATER_ICOST;
|
||||||
|
|
||||||
|
/*--- Decide how many coding tables to use ---*/
|
||||||
|
AssertH ( s->nMTF > 0, 3001 );
|
||||||
|
if (s->nMTF < 200) nGroups = 2; else
|
||||||
|
if (s->nMTF < 600) nGroups = 3; else
|
||||||
|
if (s->nMTF < 1200) nGroups = 4; else
|
||||||
|
if (s->nMTF < 2400) nGroups = 5; else
|
||||||
|
nGroups = 6;
|
||||||
|
|
||||||
|
/*--- Generate an initial set of coding tables ---*/
|
||||||
|
{
|
||||||
|
Int32 nPart, remF, tFreq, aFreq;
|
||||||
|
|
||||||
|
nPart = nGroups;
|
||||||
|
remF = s->nMTF;
|
||||||
|
gs = 0;
|
||||||
|
while (nPart > 0) {
|
||||||
|
tFreq = remF / nPart;
|
||||||
|
ge = gs-1;
|
||||||
|
aFreq = 0;
|
||||||
|
while (aFreq < tFreq && ge < alphaSize-1) {
|
||||||
|
ge++;
|
||||||
|
aFreq += s->mtfFreq[ge];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ge > gs
|
||||||
|
&& nPart != nGroups && nPart != 1
|
||||||
|
&& ((nGroups-nPart) % 2 == 1)) {
|
||||||
|
aFreq -= s->mtfFreq[ge];
|
||||||
|
ge--;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf5( " initial group %d, [%d .. %d], "
|
||||||
|
"has %d syms (%4.1f%%)\n",
|
||||||
|
nPart, gs, ge, aFreq,
|
||||||
|
(100.0 * (float)aFreq) / (float)(s->nMTF) );
|
||||||
|
|
||||||
|
for (v = 0; v < alphaSize; v++)
|
||||||
|
if (v >= gs && v <= ge)
|
||||||
|
s->len[nPart-1][v] = BZ_LESSER_ICOST; else
|
||||||
|
s->len[nPart-1][v] = BZ_GREATER_ICOST;
|
||||||
|
|
||||||
|
nPart--;
|
||||||
|
gs = ge+1;
|
||||||
|
remF -= aFreq;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*---
|
||||||
|
Iterate up to BZ_N_ITERS times to improve the tables.
|
||||||
|
---*/
|
||||||
|
for (iter = 0; iter < BZ_N_ITERS; iter++) {
|
||||||
|
|
||||||
|
for (t = 0; t < nGroups; t++) fave[t] = 0;
|
||||||
|
|
||||||
|
for (t = 0; t < nGroups; t++)
|
||||||
|
for (v = 0; v < alphaSize; v++)
|
||||||
|
s->rfreq[t][v] = 0;
|
||||||
|
|
||||||
|
/*---
|
||||||
|
Set up an auxiliary length table which is used to fast-track
|
||||||
|
the common case (nGroups == 6).
|
||||||
|
---*/
|
||||||
|
if (nGroups == 6) {
|
||||||
|
for (v = 0; v < alphaSize; v++) {
|
||||||
|
s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
|
||||||
|
s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
|
||||||
|
s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
nSelectors = 0;
|
||||||
|
totc = 0;
|
||||||
|
gs = 0;
|
||||||
|
while (True) {
|
||||||
|
|
||||||
|
/*--- Set group start & end marks. --*/
|
||||||
|
if (gs >= s->nMTF) break;
|
||||||
|
ge = gs + BZ_G_SIZE - 1;
|
||||||
|
if (ge >= s->nMTF) ge = s->nMTF-1;
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Calculate the cost of this group as coded
|
||||||
|
by each of the coding tables.
|
||||||
|
--*/
|
||||||
|
for (t = 0; t < nGroups; t++) cost[t] = 0;
|
||||||
|
|
||||||
|
if (nGroups == 6 && 50 == ge-gs+1) {
|
||||||
|
/*--- fast track the common case ---*/
|
||||||
|
register UInt32 cost01, cost23, cost45;
|
||||||
|
register UInt16 icv;
|
||||||
|
cost01 = cost23 = cost45 = 0;
|
||||||
|
|
||||||
|
# define BZ_ITER(nn) \
|
||||||
|
icv = mtfv[gs+(nn)]; \
|
||||||
|
cost01 += s->len_pack[icv][0]; \
|
||||||
|
cost23 += s->len_pack[icv][1]; \
|
||||||
|
cost45 += s->len_pack[icv][2]; \
|
||||||
|
|
||||||
|
BZ_ITER(0); BZ_ITER(1); BZ_ITER(2); BZ_ITER(3); BZ_ITER(4);
|
||||||
|
BZ_ITER(5); BZ_ITER(6); BZ_ITER(7); BZ_ITER(8); BZ_ITER(9);
|
||||||
|
BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
|
||||||
|
BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
|
||||||
|
BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
|
||||||
|
BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
|
||||||
|
BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
|
||||||
|
BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
|
||||||
|
BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
|
||||||
|
BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
|
||||||
|
|
||||||
|
# undef BZ_ITER
|
||||||
|
|
||||||
|
cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
|
||||||
|
cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
|
||||||
|
cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/*--- slow version which correctly handles all situations ---*/
|
||||||
|
for (i = gs; i <= ge; i++) {
|
||||||
|
UInt16 icv = mtfv[i];
|
||||||
|
for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Find the coding table which is best for this group,
|
||||||
|
and record its identity in the selector table.
|
||||||
|
--*/
|
||||||
|
bc = 999999999; bt = -1;
|
||||||
|
for (t = 0; t < nGroups; t++)
|
||||||
|
if (cost[t] < bc) { bc = cost[t]; bt = t; };
|
||||||
|
totc += bc;
|
||||||
|
fave[bt]++;
|
||||||
|
s->selector[nSelectors] = bt;
|
||||||
|
nSelectors++;
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Increment the symbol frequencies for the selected table.
|
||||||
|
--*/
|
||||||
|
if (nGroups == 6 && 50 == ge-gs+1) {
|
||||||
|
/*--- fast track the common case ---*/
|
||||||
|
|
||||||
|
# define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
|
||||||
|
|
||||||
|
BZ_ITUR(0); BZ_ITUR(1); BZ_ITUR(2); BZ_ITUR(3); BZ_ITUR(4);
|
||||||
|
BZ_ITUR(5); BZ_ITUR(6); BZ_ITUR(7); BZ_ITUR(8); BZ_ITUR(9);
|
||||||
|
BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
|
||||||
|
BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
|
||||||
|
BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
|
||||||
|
BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
|
||||||
|
BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
|
||||||
|
BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
|
||||||
|
BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
|
||||||
|
BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
|
||||||
|
|
||||||
|
# undef BZ_ITUR
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/*--- slow version which correctly handles all situations ---*/
|
||||||
|
for (i = gs; i <= ge; i++)
|
||||||
|
s->rfreq[bt][ mtfv[i] ]++;
|
||||||
|
}
|
||||||
|
|
||||||
|
gs = ge+1;
|
||||||
|
}
|
||||||
|
if (s->verbosity >= 3) {
|
||||||
|
VPrintf2 ( " pass %d: size is %d, grp uses are ",
|
||||||
|
iter+1, totc/8 );
|
||||||
|
for (t = 0; t < nGroups; t++)
|
||||||
|
VPrintf1 ( "%d ", fave[t] );
|
||||||
|
VPrintf0 ( "\n" );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Recompute the tables based on the accumulated frequencies.
|
||||||
|
--*/
|
||||||
|
/* maxLen was changed from 20 to 17 in bzip2-1.0.3. See
|
||||||
|
comment in huffman.c for details. */
|
||||||
|
for (t = 0; t < nGroups; t++)
|
||||||
|
BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
|
||||||
|
alphaSize, 17 /*20*/ );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
AssertH( nGroups < 8, 3002 );
|
||||||
|
AssertH( nSelectors < 32768 &&
|
||||||
|
nSelectors <= (2 + (900000 / BZ_G_SIZE)),
|
||||||
|
3003 );
|
||||||
|
|
||||||
|
|
||||||
|
/*--- Compute MTF values for the selectors. ---*/
|
||||||
|
{
|
||||||
|
UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
|
||||||
|
for (i = 0; i < nGroups; i++) pos[i] = i;
|
||||||
|
for (i = 0; i < nSelectors; i++) {
|
||||||
|
ll_i = s->selector[i];
|
||||||
|
j = 0;
|
||||||
|
tmp = pos[j];
|
||||||
|
while ( ll_i != tmp ) {
|
||||||
|
j++;
|
||||||
|
tmp2 = tmp;
|
||||||
|
tmp = pos[j];
|
||||||
|
pos[j] = tmp2;
|
||||||
|
};
|
||||||
|
pos[0] = tmp;
|
||||||
|
s->selectorMtf[i] = j;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/*--- Assign actual codes for the tables. --*/
|
||||||
|
for (t = 0; t < nGroups; t++) {
|
||||||
|
minLen = 32;
|
||||||
|
maxLen = 0;
|
||||||
|
for (i = 0; i < alphaSize; i++) {
|
||||||
|
if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
|
||||||
|
if (s->len[t][i] < minLen) minLen = s->len[t][i];
|
||||||
|
}
|
||||||
|
AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
|
||||||
|
AssertH ( !(minLen < 1), 3005 );
|
||||||
|
BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
|
||||||
|
minLen, maxLen, alphaSize );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Transmit the mapping table. ---*/
|
||||||
|
{
|
||||||
|
Bool inUse16[16];
|
||||||
|
for (i = 0; i < 16; i++) {
|
||||||
|
inUse16[i] = False;
|
||||||
|
for (j = 0; j < 16; j++)
|
||||||
|
if (s->inUse[i * 16 + j]) inUse16[i] = True;
|
||||||
|
}
|
||||||
|
|
||||||
|
nBytes = s->numZ;
|
||||||
|
for (i = 0; i < 16; i++)
|
||||||
|
if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
|
||||||
|
|
||||||
|
for (i = 0; i < 16; i++)
|
||||||
|
if (inUse16[i])
|
||||||
|
for (j = 0; j < 16; j++) {
|
||||||
|
if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf1( " bytes: mapping %d, ", s->numZ-nBytes );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Now the selectors. ---*/
|
||||||
|
nBytes = s->numZ;
|
||||||
|
bsW ( s, 3, nGroups );
|
||||||
|
bsW ( s, 15, nSelectors );
|
||||||
|
for (i = 0; i < nSelectors; i++) {
|
||||||
|
for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
|
||||||
|
bsW(s,1,0);
|
||||||
|
}
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf1( "selectors %d, ", s->numZ-nBytes );
|
||||||
|
|
||||||
|
/*--- Now the coding tables. ---*/
|
||||||
|
nBytes = s->numZ;
|
||||||
|
|
||||||
|
for (t = 0; t < nGroups; t++) {
|
||||||
|
Int32 curr = s->len[t][0];
|
||||||
|
bsW ( s, 5, curr );
|
||||||
|
for (i = 0; i < alphaSize; i++) {
|
||||||
|
while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
|
||||||
|
while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
|
||||||
|
bsW ( s, 1, 0 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
|
||||||
|
|
||||||
|
/*--- And finally, the block data proper ---*/
|
||||||
|
nBytes = s->numZ;
|
||||||
|
selCtr = 0;
|
||||||
|
gs = 0;
|
||||||
|
while (True) {
|
||||||
|
if (gs >= s->nMTF) break;
|
||||||
|
ge = gs + BZ_G_SIZE - 1;
|
||||||
|
if (ge >= s->nMTF) ge = s->nMTF-1;
|
||||||
|
AssertH ( s->selector[selCtr] < nGroups, 3006 );
|
||||||
|
|
||||||
|
if (nGroups == 6 && 50 == ge-gs+1) {
|
||||||
|
/*--- fast track the common case ---*/
|
||||||
|
UInt16 mtfv_i;
|
||||||
|
UChar* s_len_sel_selCtr
|
||||||
|
= &(s->len[s->selector[selCtr]][0]);
|
||||||
|
Int32* s_code_sel_selCtr
|
||||||
|
= &(s->code[s->selector[selCtr]][0]);
|
||||||
|
|
||||||
|
# define BZ_ITAH(nn) \
|
||||||
|
mtfv_i = mtfv[gs+(nn)]; \
|
||||||
|
bsW ( s, \
|
||||||
|
s_len_sel_selCtr[mtfv_i], \
|
||||||
|
s_code_sel_selCtr[mtfv_i] )
|
||||||
|
|
||||||
|
BZ_ITAH(0); BZ_ITAH(1); BZ_ITAH(2); BZ_ITAH(3); BZ_ITAH(4);
|
||||||
|
BZ_ITAH(5); BZ_ITAH(6); BZ_ITAH(7); BZ_ITAH(8); BZ_ITAH(9);
|
||||||
|
BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
|
||||||
|
BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
|
||||||
|
BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
|
||||||
|
BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
|
||||||
|
BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
|
||||||
|
BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
|
||||||
|
BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
|
||||||
|
BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
|
||||||
|
|
||||||
|
# undef BZ_ITAH
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/*--- slow version which correctly handles all situations ---*/
|
||||||
|
for (i = gs; i <= ge; i++) {
|
||||||
|
bsW ( s,
|
||||||
|
s->len [s->selector[selCtr]] [mtfv[i]],
|
||||||
|
s->code [s->selector[selCtr]] [mtfv[i]] );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
gs = ge+1;
|
||||||
|
selCtr++;
|
||||||
|
}
|
||||||
|
AssertH( selCtr == nSelectors, 3007 );
|
||||||
|
|
||||||
|
if (s->verbosity >= 3)
|
||||||
|
VPrintf1( "codes %d\n", s->numZ-nBytes );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
void BZ2_compressBlock ( EState* s, Bool is_last_block )
|
||||||
|
{
|
||||||
|
if (s->nblock > 0) {
|
||||||
|
|
||||||
|
BZ_FINALISE_CRC ( s->blockCRC );
|
||||||
|
s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
|
||||||
|
s->combinedCRC ^= s->blockCRC;
|
||||||
|
if (s->blockNo > 1) s->numZ = 0;
|
||||||
|
|
||||||
|
if (s->verbosity >= 2)
|
||||||
|
VPrintf4( " block %d: crc = 0x%08x, "
|
||||||
|
"combined CRC = 0x%08x, size = %d\n",
|
||||||
|
s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
|
||||||
|
|
||||||
|
BZ2_blockSort ( s );
|
||||||
|
}
|
||||||
|
|
||||||
|
s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
|
||||||
|
|
||||||
|
/*-- If this is the first block, create the stream header. --*/
|
||||||
|
if (s->blockNo == 1) {
|
||||||
|
BZ2_bsInitWrite ( s );
|
||||||
|
bsPutUChar ( s, BZ_HDR_B );
|
||||||
|
bsPutUChar ( s, BZ_HDR_Z );
|
||||||
|
bsPutUChar ( s, BZ_HDR_h );
|
||||||
|
bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->nblock > 0) {
|
||||||
|
|
||||||
|
bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
|
||||||
|
bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
|
||||||
|
bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
|
||||||
|
|
||||||
|
/*-- Now the block's CRC, so it is in a known place. --*/
|
||||||
|
bsPutUInt32 ( s, s->blockCRC );
|
||||||
|
|
||||||
|
/*--
|
||||||
|
Now a single bit indicating (non-)randomisation.
|
||||||
|
As of version 0.9.5, we use a better sorting algorithm
|
||||||
|
which makes randomisation unnecessary. So always set
|
||||||
|
the randomised bit to 'no'. Of course, the decoder
|
||||||
|
still needs to be able to handle randomised blocks
|
||||||
|
so as to maintain backwards compatibility with
|
||||||
|
older versions of bzip2.
|
||||||
|
--*/
|
||||||
|
bsW(s,1,0);
|
||||||
|
|
||||||
|
bsW ( s, 24, s->origPtr );
|
||||||
|
generateMTFValues ( s );
|
||||||
|
sendMTFValues ( s );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*-- If this is the last block, add the stream trailer. --*/
|
||||||
|
if (is_last_block) {
|
||||||
|
|
||||||
|
bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
|
||||||
|
bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
|
||||||
|
bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
|
||||||
|
bsPutUInt32 ( s, s->combinedCRC );
|
||||||
|
if (s->verbosity >= 2)
|
||||||
|
VPrintf1( " final combined CRC = 0x%08x\n ", s->combinedCRC );
|
||||||
|
bsFinishWrite ( s );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end compress.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
104
bzlib/crctable.c
Normal file
104
bzlib/crctable.c
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Table for doing CRCs ---*/
|
||||||
|
/*--- crctable.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#include "bzlib_private.h"
|
||||||
|
|
||||||
|
/*--
|
||||||
|
I think this is an implementation of the AUTODIN-II,
|
||||||
|
Ethernet & FDDI 32-bit CRC standard. Vaguely derived
|
||||||
|
from code by Rob Warnock, in Section 51 of the
|
||||||
|
comp.compression FAQ.
|
||||||
|
--*/
|
||||||
|
|
||||||
|
UInt32 BZ2_crc32Table[256] = {
|
||||||
|
|
||||||
|
/*-- Ugly, innit? --*/
|
||||||
|
|
||||||
|
0x00000000L, 0x04c11db7L, 0x09823b6eL, 0x0d4326d9L,
|
||||||
|
0x130476dcL, 0x17c56b6bL, 0x1a864db2L, 0x1e475005L,
|
||||||
|
0x2608edb8L, 0x22c9f00fL, 0x2f8ad6d6L, 0x2b4bcb61L,
|
||||||
|
0x350c9b64L, 0x31cd86d3L, 0x3c8ea00aL, 0x384fbdbdL,
|
||||||
|
0x4c11db70L, 0x48d0c6c7L, 0x4593e01eL, 0x4152fda9L,
|
||||||
|
0x5f15adacL, 0x5bd4b01bL, 0x569796c2L, 0x52568b75L,
|
||||||
|
0x6a1936c8L, 0x6ed82b7fL, 0x639b0da6L, 0x675a1011L,
|
||||||
|
0x791d4014L, 0x7ddc5da3L, 0x709f7b7aL, 0x745e66cdL,
|
||||||
|
0x9823b6e0L, 0x9ce2ab57L, 0x91a18d8eL, 0x95609039L,
|
||||||
|
0x8b27c03cL, 0x8fe6dd8bL, 0x82a5fb52L, 0x8664e6e5L,
|
||||||
|
0xbe2b5b58L, 0xbaea46efL, 0xb7a96036L, 0xb3687d81L,
|
||||||
|
0xad2f2d84L, 0xa9ee3033L, 0xa4ad16eaL, 0xa06c0b5dL,
|
||||||
|
0xd4326d90L, 0xd0f37027L, 0xddb056feL, 0xd9714b49L,
|
||||||
|
0xc7361b4cL, 0xc3f706fbL, 0xceb42022L, 0xca753d95L,
|
||||||
|
0xf23a8028L, 0xf6fb9d9fL, 0xfbb8bb46L, 0xff79a6f1L,
|
||||||
|
0xe13ef6f4L, 0xe5ffeb43L, 0xe8bccd9aL, 0xec7dd02dL,
|
||||||
|
0x34867077L, 0x30476dc0L, 0x3d044b19L, 0x39c556aeL,
|
||||||
|
0x278206abL, 0x23431b1cL, 0x2e003dc5L, 0x2ac12072L,
|
||||||
|
0x128e9dcfL, 0x164f8078L, 0x1b0ca6a1L, 0x1fcdbb16L,
|
||||||
|
0x018aeb13L, 0x054bf6a4L, 0x0808d07dL, 0x0cc9cdcaL,
|
||||||
|
0x7897ab07L, 0x7c56b6b0L, 0x71159069L, 0x75d48ddeL,
|
||||||
|
0x6b93dddbL, 0x6f52c06cL, 0x6211e6b5L, 0x66d0fb02L,
|
||||||
|
0x5e9f46bfL, 0x5a5e5b08L, 0x571d7dd1L, 0x53dc6066L,
|
||||||
|
0x4d9b3063L, 0x495a2dd4L, 0x44190b0dL, 0x40d816baL,
|
||||||
|
0xaca5c697L, 0xa864db20L, 0xa527fdf9L, 0xa1e6e04eL,
|
||||||
|
0xbfa1b04bL, 0xbb60adfcL, 0xb6238b25L, 0xb2e29692L,
|
||||||
|
0x8aad2b2fL, 0x8e6c3698L, 0x832f1041L, 0x87ee0df6L,
|
||||||
|
0x99a95df3L, 0x9d684044L, 0x902b669dL, 0x94ea7b2aL,
|
||||||
|
0xe0b41de7L, 0xe4750050L, 0xe9362689L, 0xedf73b3eL,
|
||||||
|
0xf3b06b3bL, 0xf771768cL, 0xfa325055L, 0xfef34de2L,
|
||||||
|
0xc6bcf05fL, 0xc27dede8L, 0xcf3ecb31L, 0xcbffd686L,
|
||||||
|
0xd5b88683L, 0xd1799b34L, 0xdc3abdedL, 0xd8fba05aL,
|
||||||
|
0x690ce0eeL, 0x6dcdfd59L, 0x608edb80L, 0x644fc637L,
|
||||||
|
0x7a089632L, 0x7ec98b85L, 0x738aad5cL, 0x774bb0ebL,
|
||||||
|
0x4f040d56L, 0x4bc510e1L, 0x46863638L, 0x42472b8fL,
|
||||||
|
0x5c007b8aL, 0x58c1663dL, 0x558240e4L, 0x51435d53L,
|
||||||
|
0x251d3b9eL, 0x21dc2629L, 0x2c9f00f0L, 0x285e1d47L,
|
||||||
|
0x36194d42L, 0x32d850f5L, 0x3f9b762cL, 0x3b5a6b9bL,
|
||||||
|
0x0315d626L, 0x07d4cb91L, 0x0a97ed48L, 0x0e56f0ffL,
|
||||||
|
0x1011a0faL, 0x14d0bd4dL, 0x19939b94L, 0x1d528623L,
|
||||||
|
0xf12f560eL, 0xf5ee4bb9L, 0xf8ad6d60L, 0xfc6c70d7L,
|
||||||
|
0xe22b20d2L, 0xe6ea3d65L, 0xeba91bbcL, 0xef68060bL,
|
||||||
|
0xd727bbb6L, 0xd3e6a601L, 0xdea580d8L, 0xda649d6fL,
|
||||||
|
0xc423cd6aL, 0xc0e2d0ddL, 0xcda1f604L, 0xc960ebb3L,
|
||||||
|
0xbd3e8d7eL, 0xb9ff90c9L, 0xb4bcb610L, 0xb07daba7L,
|
||||||
|
0xae3afba2L, 0xaafbe615L, 0xa7b8c0ccL, 0xa379dd7bL,
|
||||||
|
0x9b3660c6L, 0x9ff77d71L, 0x92b45ba8L, 0x9675461fL,
|
||||||
|
0x8832161aL, 0x8cf30badL, 0x81b02d74L, 0x857130c3L,
|
||||||
|
0x5d8a9099L, 0x594b8d2eL, 0x5408abf7L, 0x50c9b640L,
|
||||||
|
0x4e8ee645L, 0x4a4ffbf2L, 0x470cdd2bL, 0x43cdc09cL,
|
||||||
|
0x7b827d21L, 0x7f436096L, 0x7200464fL, 0x76c15bf8L,
|
||||||
|
0x68860bfdL, 0x6c47164aL, 0x61043093L, 0x65c52d24L,
|
||||||
|
0x119b4be9L, 0x155a565eL, 0x18197087L, 0x1cd86d30L,
|
||||||
|
0x029f3d35L, 0x065e2082L, 0x0b1d065bL, 0x0fdc1becL,
|
||||||
|
0x3793a651L, 0x3352bbe6L, 0x3e119d3fL, 0x3ad08088L,
|
||||||
|
0x2497d08dL, 0x2056cd3aL, 0x2d15ebe3L, 0x29d4f654L,
|
||||||
|
0xc5a92679L, 0xc1683bceL, 0xcc2b1d17L, 0xc8ea00a0L,
|
||||||
|
0xd6ad50a5L, 0xd26c4d12L, 0xdf2f6bcbL, 0xdbee767cL,
|
||||||
|
0xe3a1cbc1L, 0xe760d676L, 0xea23f0afL, 0xeee2ed18L,
|
||||||
|
0xf0a5bd1dL, 0xf464a0aaL, 0xf9278673L, 0xfde69bc4L,
|
||||||
|
0x89b8fd09L, 0x8d79e0beL, 0x803ac667L, 0x84fbdbd0L,
|
||||||
|
0x9abc8bd5L, 0x9e7d9662L, 0x933eb0bbL, 0x97ffad0cL,
|
||||||
|
0xafb010b1L, 0xab710d06L, 0xa6322bdfL, 0xa2f33668L,
|
||||||
|
0xbcb4666dL, 0xb8757bdaL, 0xb5365d03L, 0xb1f740b4L
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end crctable.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
646
bzlib/decompress.c
Normal file
646
bzlib/decompress.c
Normal file
@ -0,0 +1,646 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Decompression machinery ---*/
|
||||||
|
/*--- decompress.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#include "bzlib_private.h"
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
static
|
||||||
|
void makeMaps_d ( DState* s )
|
||||||
|
{
|
||||||
|
Int32 i;
|
||||||
|
s->nInUse = 0;
|
||||||
|
for (i = 0; i < 256; i++)
|
||||||
|
if (s->inUse[i]) {
|
||||||
|
s->seqToUnseq[s->nInUse] = i;
|
||||||
|
s->nInUse++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
#define RETURN(rrr) \
|
||||||
|
{ retVal = rrr; goto save_state_and_return; };
|
||||||
|
|
||||||
|
#define GET_BITS(lll,vvv,nnn) \
|
||||||
|
case lll: s->state = lll; \
|
||||||
|
while (True) { \
|
||||||
|
if (s->bsLive >= nnn) { \
|
||||||
|
UInt32 v; \
|
||||||
|
v = (s->bsBuff >> \
|
||||||
|
(s->bsLive-nnn)) & ((1 << nnn)-1); \
|
||||||
|
s->bsLive -= nnn; \
|
||||||
|
vvv = v; \
|
||||||
|
break; \
|
||||||
|
} \
|
||||||
|
if (s->strm->avail_in == 0) RETURN(BZ_OK); \
|
||||||
|
s->bsBuff \
|
||||||
|
= (s->bsBuff << 8) | \
|
||||||
|
((UInt32) \
|
||||||
|
(*((UChar*)(s->strm->next_in)))); \
|
||||||
|
s->bsLive += 8; \
|
||||||
|
s->strm->next_in++; \
|
||||||
|
s->strm->avail_in--; \
|
||||||
|
s->strm->total_in_lo32++; \
|
||||||
|
if (s->strm->total_in_lo32 == 0) \
|
||||||
|
s->strm->total_in_hi32++; \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define GET_UCHAR(lll,uuu) \
|
||||||
|
GET_BITS(lll,uuu,8)
|
||||||
|
|
||||||
|
#define GET_BIT(lll,uuu) \
|
||||||
|
GET_BITS(lll,uuu,1)
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
#define GET_MTF_VAL(label1,label2,lval) \
|
||||||
|
{ \
|
||||||
|
if (groupPos == 0) { \
|
||||||
|
groupNo++; \
|
||||||
|
if (groupNo >= nSelectors) \
|
||||||
|
RETURN(BZ_DATA_ERROR); \
|
||||||
|
groupPos = BZ_G_SIZE; \
|
||||||
|
gSel = s->selector[groupNo]; \
|
||||||
|
gMinlen = s->minLens[gSel]; \
|
||||||
|
gLimit = &(s->limit[gSel][0]); \
|
||||||
|
gPerm = &(s->perm[gSel][0]); \
|
||||||
|
gBase = &(s->base[gSel][0]); \
|
||||||
|
} \
|
||||||
|
groupPos--; \
|
||||||
|
zn = gMinlen; \
|
||||||
|
GET_BITS(label1, zvec, zn); \
|
||||||
|
while (1) { \
|
||||||
|
if (zn > 20 /* the longest code */) \
|
||||||
|
RETURN(BZ_DATA_ERROR); \
|
||||||
|
if (zvec <= gLimit[zn]) break; \
|
||||||
|
zn++; \
|
||||||
|
GET_BIT(label2, zj); \
|
||||||
|
zvec = (zvec << 1) | zj; \
|
||||||
|
}; \
|
||||||
|
if (zvec - gBase[zn] < 0 \
|
||||||
|
|| zvec - gBase[zn] >= BZ_MAX_ALPHA_SIZE) \
|
||||||
|
RETURN(BZ_DATA_ERROR); \
|
||||||
|
lval = gPerm[zvec - gBase[zn]]; \
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
Int32 BZ2_decompress ( DState* s )
|
||||||
|
{
|
||||||
|
UChar uc;
|
||||||
|
Int32 retVal;
|
||||||
|
Int32 minLen, maxLen;
|
||||||
|
bz_stream* strm = s->strm;
|
||||||
|
|
||||||
|
/* stuff that needs to be saved/restored */
|
||||||
|
Int32 i;
|
||||||
|
Int32 j;
|
||||||
|
Int32 t;
|
||||||
|
Int32 alphaSize;
|
||||||
|
Int32 nGroups;
|
||||||
|
Int32 nSelectors;
|
||||||
|
Int32 EOB;
|
||||||
|
Int32 groupNo;
|
||||||
|
Int32 groupPos;
|
||||||
|
Int32 nextSym;
|
||||||
|
Int32 nblockMAX;
|
||||||
|
Int32 nblock;
|
||||||
|
Int32 es;
|
||||||
|
Int32 N;
|
||||||
|
Int32 curr;
|
||||||
|
Int32 zt;
|
||||||
|
Int32 zn;
|
||||||
|
Int32 zvec;
|
||||||
|
Int32 zj;
|
||||||
|
Int32 gSel;
|
||||||
|
Int32 gMinlen;
|
||||||
|
Int32* gLimit;
|
||||||
|
Int32* gBase;
|
||||||
|
Int32* gPerm;
|
||||||
|
|
||||||
|
if (s->state == BZ_X_MAGIC_1) {
|
||||||
|
/*initialise the save area*/
|
||||||
|
s->save_i = 0;
|
||||||
|
s->save_j = 0;
|
||||||
|
s->save_t = 0;
|
||||||
|
s->save_alphaSize = 0;
|
||||||
|
s->save_nGroups = 0;
|
||||||
|
s->save_nSelectors = 0;
|
||||||
|
s->save_EOB = 0;
|
||||||
|
s->save_groupNo = 0;
|
||||||
|
s->save_groupPos = 0;
|
||||||
|
s->save_nextSym = 0;
|
||||||
|
s->save_nblockMAX = 0;
|
||||||
|
s->save_nblock = 0;
|
||||||
|
s->save_es = 0;
|
||||||
|
s->save_N = 0;
|
||||||
|
s->save_curr = 0;
|
||||||
|
s->save_zt = 0;
|
||||||
|
s->save_zn = 0;
|
||||||
|
s->save_zvec = 0;
|
||||||
|
s->save_zj = 0;
|
||||||
|
s->save_gSel = 0;
|
||||||
|
s->save_gMinlen = 0;
|
||||||
|
s->save_gLimit = NULL;
|
||||||
|
s->save_gBase = NULL;
|
||||||
|
s->save_gPerm = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*restore from the save area*/
|
||||||
|
i = s->save_i;
|
||||||
|
j = s->save_j;
|
||||||
|
t = s->save_t;
|
||||||
|
alphaSize = s->save_alphaSize;
|
||||||
|
nGroups = s->save_nGroups;
|
||||||
|
nSelectors = s->save_nSelectors;
|
||||||
|
EOB = s->save_EOB;
|
||||||
|
groupNo = s->save_groupNo;
|
||||||
|
groupPos = s->save_groupPos;
|
||||||
|
nextSym = s->save_nextSym;
|
||||||
|
nblockMAX = s->save_nblockMAX;
|
||||||
|
nblock = s->save_nblock;
|
||||||
|
es = s->save_es;
|
||||||
|
N = s->save_N;
|
||||||
|
curr = s->save_curr;
|
||||||
|
zt = s->save_zt;
|
||||||
|
zn = s->save_zn;
|
||||||
|
zvec = s->save_zvec;
|
||||||
|
zj = s->save_zj;
|
||||||
|
gSel = s->save_gSel;
|
||||||
|
gMinlen = s->save_gMinlen;
|
||||||
|
gLimit = s->save_gLimit;
|
||||||
|
gBase = s->save_gBase;
|
||||||
|
gPerm = s->save_gPerm;
|
||||||
|
|
||||||
|
retVal = BZ_OK;
|
||||||
|
|
||||||
|
switch (s->state) {
|
||||||
|
|
||||||
|
GET_UCHAR(BZ_X_MAGIC_1, uc);
|
||||||
|
if (uc != BZ_HDR_B) RETURN(BZ_DATA_ERROR_MAGIC);
|
||||||
|
|
||||||
|
GET_UCHAR(BZ_X_MAGIC_2, uc);
|
||||||
|
if (uc != BZ_HDR_Z) RETURN(BZ_DATA_ERROR_MAGIC);
|
||||||
|
|
||||||
|
GET_UCHAR(BZ_X_MAGIC_3, uc)
|
||||||
|
if (uc != BZ_HDR_h) RETURN(BZ_DATA_ERROR_MAGIC);
|
||||||
|
|
||||||
|
GET_BITS(BZ_X_MAGIC_4, s->blockSize100k, 8)
|
||||||
|
if (s->blockSize100k < (BZ_HDR_0 + 1) ||
|
||||||
|
s->blockSize100k > (BZ_HDR_0 + 9)) RETURN(BZ_DATA_ERROR_MAGIC);
|
||||||
|
s->blockSize100k -= BZ_HDR_0;
|
||||||
|
|
||||||
|
if (s->smallDecompress) {
|
||||||
|
s->ll16 = BZALLOC( s->blockSize100k * 100000 * sizeof(UInt16) );
|
||||||
|
s->ll4 = BZALLOC(
|
||||||
|
((1 + s->blockSize100k * 100000) >> 1) * sizeof(UChar)
|
||||||
|
);
|
||||||
|
if (s->ll16 == NULL || s->ll4 == NULL) RETURN(BZ_MEM_ERROR);
|
||||||
|
} else {
|
||||||
|
s->tt = BZALLOC( s->blockSize100k * 100000 * sizeof(Int32) );
|
||||||
|
if (s->tt == NULL) RETURN(BZ_MEM_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_1, uc);
|
||||||
|
|
||||||
|
if (uc == 0x17) goto endhdr_2;
|
||||||
|
if (uc != 0x31) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_2, uc);
|
||||||
|
if (uc != 0x41) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_3, uc);
|
||||||
|
if (uc != 0x59) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_4, uc);
|
||||||
|
if (uc != 0x26) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_5, uc);
|
||||||
|
if (uc != 0x53) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_BLKHDR_6, uc);
|
||||||
|
if (uc != 0x59) RETURN(BZ_DATA_ERROR);
|
||||||
|
|
||||||
|
s->currBlockNo++;
|
||||||
|
if (s->verbosity >= 2)
|
||||||
|
VPrintf1 ( "\n [%d: huff+mtf ", s->currBlockNo );
|
||||||
|
|
||||||
|
s->storedBlockCRC = 0;
|
||||||
|
GET_UCHAR(BZ_X_BCRC_1, uc);
|
||||||
|
s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_BCRC_2, uc);
|
||||||
|
s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_BCRC_3, uc);
|
||||||
|
s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_BCRC_4, uc);
|
||||||
|
s->storedBlockCRC = (s->storedBlockCRC << 8) | ((UInt32)uc);
|
||||||
|
|
||||||
|
GET_BITS(BZ_X_RANDBIT, s->blockRandomised, 1);
|
||||||
|
|
||||||
|
s->origPtr = 0;
|
||||||
|
GET_UCHAR(BZ_X_ORIGPTR_1, uc);
|
||||||
|
s->origPtr = (s->origPtr << 8) | ((Int32)uc);
|
||||||
|
GET_UCHAR(BZ_X_ORIGPTR_2, uc);
|
||||||
|
s->origPtr = (s->origPtr << 8) | ((Int32)uc);
|
||||||
|
GET_UCHAR(BZ_X_ORIGPTR_3, uc);
|
||||||
|
s->origPtr = (s->origPtr << 8) | ((Int32)uc);
|
||||||
|
|
||||||
|
if (s->origPtr < 0)
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
if (s->origPtr > 10 + 100000*s->blockSize100k)
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
|
||||||
|
/*--- Receive the mapping table ---*/
|
||||||
|
for (i = 0; i < 16; i++) {
|
||||||
|
GET_BIT(BZ_X_MAPPING_1, uc);
|
||||||
|
if (uc == 1)
|
||||||
|
s->inUse16[i] = True; else
|
||||||
|
s->inUse16[i] = False;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 256; i++) s->inUse[i] = False;
|
||||||
|
|
||||||
|
for (i = 0; i < 16; i++)
|
||||||
|
if (s->inUse16[i])
|
||||||
|
for (j = 0; j < 16; j++) {
|
||||||
|
GET_BIT(BZ_X_MAPPING_2, uc);
|
||||||
|
if (uc == 1) s->inUse[i * 16 + j] = True;
|
||||||
|
}
|
||||||
|
makeMaps_d ( s );
|
||||||
|
if (s->nInUse == 0) RETURN(BZ_DATA_ERROR);
|
||||||
|
alphaSize = s->nInUse+2;
|
||||||
|
|
||||||
|
/*--- Now the selectors ---*/
|
||||||
|
GET_BITS(BZ_X_SELECTOR_1, nGroups, 3);
|
||||||
|
if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15);
|
||||||
|
if (nSelectors < 1) RETURN(BZ_DATA_ERROR);
|
||||||
|
for (i = 0; i < nSelectors; i++) {
|
||||||
|
j = 0;
|
||||||
|
while (True) {
|
||||||
|
GET_BIT(BZ_X_SELECTOR_3, uc);
|
||||||
|
if (uc == 0) break;
|
||||||
|
j++;
|
||||||
|
if (j >= nGroups) RETURN(BZ_DATA_ERROR);
|
||||||
|
}
|
||||||
|
s->selectorMtf[i] = j;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Undo the MTF values for the selectors. ---*/
|
||||||
|
{
|
||||||
|
UChar pos[BZ_N_GROUPS], tmp, v;
|
||||||
|
for (v = 0; v < nGroups; v++) pos[v] = v;
|
||||||
|
|
||||||
|
for (i = 0; i < nSelectors; i++) {
|
||||||
|
v = s->selectorMtf[i];
|
||||||
|
tmp = pos[v];
|
||||||
|
while (v > 0) { pos[v] = pos[v-1]; v--; }
|
||||||
|
pos[0] = tmp;
|
||||||
|
s->selector[i] = tmp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Now the coding tables ---*/
|
||||||
|
for (t = 0; t < nGroups; t++) {
|
||||||
|
GET_BITS(BZ_X_CODING_1, curr, 5);
|
||||||
|
for (i = 0; i < alphaSize; i++) {
|
||||||
|
while (True) {
|
||||||
|
if (curr < 1 || curr > 20) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_BIT(BZ_X_CODING_2, uc);
|
||||||
|
if (uc == 0) break;
|
||||||
|
GET_BIT(BZ_X_CODING_3, uc);
|
||||||
|
if (uc == 0) curr++; else curr--;
|
||||||
|
}
|
||||||
|
s->len[t][i] = curr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Create the Huffman decoding tables ---*/
|
||||||
|
for (t = 0; t < nGroups; t++) {
|
||||||
|
minLen = 32;
|
||||||
|
maxLen = 0;
|
||||||
|
for (i = 0; i < alphaSize; i++) {
|
||||||
|
if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
|
||||||
|
if (s->len[t][i] < minLen) minLen = s->len[t][i];
|
||||||
|
}
|
||||||
|
BZ2_hbCreateDecodeTables (
|
||||||
|
&(s->limit[t][0]),
|
||||||
|
&(s->base[t][0]),
|
||||||
|
&(s->perm[t][0]),
|
||||||
|
&(s->len[t][0]),
|
||||||
|
minLen, maxLen, alphaSize
|
||||||
|
);
|
||||||
|
s->minLens[t] = minLen;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*--- Now the MTF values ---*/
|
||||||
|
|
||||||
|
EOB = s->nInUse+1;
|
||||||
|
nblockMAX = 100000 * s->blockSize100k;
|
||||||
|
groupNo = -1;
|
||||||
|
groupPos = 0;
|
||||||
|
|
||||||
|
for (i = 0; i <= 255; i++) s->unzftab[i] = 0;
|
||||||
|
|
||||||
|
/*-- MTF init --*/
|
||||||
|
{
|
||||||
|
Int32 ii, jj, kk;
|
||||||
|
kk = MTFA_SIZE-1;
|
||||||
|
for (ii = 256 / MTFL_SIZE - 1; ii >= 0; ii--) {
|
||||||
|
for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
|
||||||
|
s->mtfa[kk] = (UChar)(ii * MTFL_SIZE + jj);
|
||||||
|
kk--;
|
||||||
|
}
|
||||||
|
s->mtfbase[ii] = kk + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*-- end MTF init --*/
|
||||||
|
|
||||||
|
nblock = 0;
|
||||||
|
GET_MTF_VAL(BZ_X_MTF_1, BZ_X_MTF_2, nextSym);
|
||||||
|
|
||||||
|
while (True) {
|
||||||
|
|
||||||
|
if (nextSym == EOB) break;
|
||||||
|
|
||||||
|
if (nextSym == BZ_RUNA || nextSym == BZ_RUNB) {
|
||||||
|
|
||||||
|
es = -1;
|
||||||
|
N = 1;
|
||||||
|
do {
|
||||||
|
/* Check that N doesn't get too big, so that es doesn't
|
||||||
|
go negative. The maximum value that can be
|
||||||
|
RUNA/RUNB encoded is equal to the block size (post
|
||||||
|
the initial RLE), viz, 900k, so bounding N at 2
|
||||||
|
million should guard against overflow without
|
||||||
|
rejecting any legitimate inputs. */
|
||||||
|
if (N >= 2*1024*1024) RETURN(BZ_DATA_ERROR);
|
||||||
|
if (nextSym == BZ_RUNA) es = es + (0+1) * N; else
|
||||||
|
if (nextSym == BZ_RUNB) es = es + (1+1) * N;
|
||||||
|
N = N * 2;
|
||||||
|
GET_MTF_VAL(BZ_X_MTF_3, BZ_X_MTF_4, nextSym);
|
||||||
|
}
|
||||||
|
while (nextSym == BZ_RUNA || nextSym == BZ_RUNB);
|
||||||
|
|
||||||
|
es++;
|
||||||
|
uc = s->seqToUnseq[ s->mtfa[s->mtfbase[0]] ];
|
||||||
|
s->unzftab[uc] += es;
|
||||||
|
|
||||||
|
if (s->smallDecompress)
|
||||||
|
while (es > 0) {
|
||||||
|
if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
|
||||||
|
s->ll16[nblock] = (UInt16)uc;
|
||||||
|
nblock++;
|
||||||
|
es--;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
while (es > 0) {
|
||||||
|
if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
|
||||||
|
s->tt[nblock] = (UInt32)uc;
|
||||||
|
nblock++;
|
||||||
|
es--;
|
||||||
|
};
|
||||||
|
|
||||||
|
continue;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (nblock >= nblockMAX) RETURN(BZ_DATA_ERROR);
|
||||||
|
|
||||||
|
/*-- uc = MTF ( nextSym-1 ) --*/
|
||||||
|
{
|
||||||
|
Int32 ii, jj, kk, pp, lno, off;
|
||||||
|
UInt32 nn;
|
||||||
|
nn = (UInt32)(nextSym - 1);
|
||||||
|
|
||||||
|
if (nn < MTFL_SIZE) {
|
||||||
|
/* avoid general-case expense */
|
||||||
|
pp = s->mtfbase[0];
|
||||||
|
uc = s->mtfa[pp+nn];
|
||||||
|
while (nn > 3) {
|
||||||
|
Int32 z = pp+nn;
|
||||||
|
s->mtfa[(z) ] = s->mtfa[(z)-1];
|
||||||
|
s->mtfa[(z)-1] = s->mtfa[(z)-2];
|
||||||
|
s->mtfa[(z)-2] = s->mtfa[(z)-3];
|
||||||
|
s->mtfa[(z)-3] = s->mtfa[(z)-4];
|
||||||
|
nn -= 4;
|
||||||
|
}
|
||||||
|
while (nn > 0) {
|
||||||
|
s->mtfa[(pp+nn)] = s->mtfa[(pp+nn)-1]; nn--;
|
||||||
|
};
|
||||||
|
s->mtfa[pp] = uc;
|
||||||
|
} else {
|
||||||
|
/* general case */
|
||||||
|
lno = nn / MTFL_SIZE;
|
||||||
|
off = nn % MTFL_SIZE;
|
||||||
|
pp = s->mtfbase[lno] + off;
|
||||||
|
uc = s->mtfa[pp];
|
||||||
|
while (pp > s->mtfbase[lno]) {
|
||||||
|
s->mtfa[pp] = s->mtfa[pp-1]; pp--;
|
||||||
|
};
|
||||||
|
s->mtfbase[lno]++;
|
||||||
|
while (lno > 0) {
|
||||||
|
s->mtfbase[lno]--;
|
||||||
|
s->mtfa[s->mtfbase[lno]]
|
||||||
|
= s->mtfa[s->mtfbase[lno-1] + MTFL_SIZE - 1];
|
||||||
|
lno--;
|
||||||
|
}
|
||||||
|
s->mtfbase[0]--;
|
||||||
|
s->mtfa[s->mtfbase[0]] = uc;
|
||||||
|
if (s->mtfbase[0] == 0) {
|
||||||
|
kk = MTFA_SIZE-1;
|
||||||
|
for (ii = 256 / MTFL_SIZE-1; ii >= 0; ii--) {
|
||||||
|
for (jj = MTFL_SIZE-1; jj >= 0; jj--) {
|
||||||
|
s->mtfa[kk] = s->mtfa[s->mtfbase[ii] + jj];
|
||||||
|
kk--;
|
||||||
|
}
|
||||||
|
s->mtfbase[ii] = kk + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*-- end uc = MTF ( nextSym-1 ) --*/
|
||||||
|
|
||||||
|
s->unzftab[s->seqToUnseq[uc]]++;
|
||||||
|
if (s->smallDecompress)
|
||||||
|
s->ll16[nblock] = (UInt16)(s->seqToUnseq[uc]); else
|
||||||
|
s->tt[nblock] = (UInt32)(s->seqToUnseq[uc]);
|
||||||
|
nblock++;
|
||||||
|
|
||||||
|
GET_MTF_VAL(BZ_X_MTF_5, BZ_X_MTF_6, nextSym);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now we know what nblock is, we can do a better sanity
|
||||||
|
check on s->origPtr.
|
||||||
|
*/
|
||||||
|
if (s->origPtr < 0 || s->origPtr >= nblock)
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
|
||||||
|
/*-- Set up cftab to facilitate generation of T^(-1) --*/
|
||||||
|
/* Check: unzftab entries in range. */
|
||||||
|
for (i = 0; i <= 255; i++) {
|
||||||
|
if (s->unzftab[i] < 0 || s->unzftab[i] > nblock)
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
}
|
||||||
|
/* Actually generate cftab. */
|
||||||
|
s->cftab[0] = 0;
|
||||||
|
for (i = 1; i <= 256; i++) s->cftab[i] = s->unzftab[i-1];
|
||||||
|
for (i = 1; i <= 256; i++) s->cftab[i] += s->cftab[i-1];
|
||||||
|
/* Check: cftab entries in range. */
|
||||||
|
for (i = 0; i <= 256; i++) {
|
||||||
|
if (s->cftab[i] < 0 || s->cftab[i] > nblock) {
|
||||||
|
/* s->cftab[i] can legitimately be == nblock */
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Check: cftab entries non-descending. */
|
||||||
|
for (i = 1; i <= 256; i++) {
|
||||||
|
if (s->cftab[i-1] > s->cftab[i]) {
|
||||||
|
RETURN(BZ_DATA_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
s->state_out_len = 0;
|
||||||
|
s->state_out_ch = 0;
|
||||||
|
BZ_INITIALISE_CRC ( s->calculatedBlockCRC );
|
||||||
|
s->state = BZ_X_OUTPUT;
|
||||||
|
if (s->verbosity >= 2) VPrintf0 ( "rt+rld" );
|
||||||
|
|
||||||
|
if (s->smallDecompress) {
|
||||||
|
|
||||||
|
/*-- Make a copy of cftab, used in generation of T --*/
|
||||||
|
for (i = 0; i <= 256; i++) s->cftabCopy[i] = s->cftab[i];
|
||||||
|
|
||||||
|
/*-- compute the T vector --*/
|
||||||
|
for (i = 0; i < nblock; i++) {
|
||||||
|
uc = (UChar)(s->ll16[i]);
|
||||||
|
SET_LL(i, s->cftabCopy[uc]);
|
||||||
|
s->cftabCopy[uc]++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*-- Compute T^(-1) by pointer reversal on T --*/
|
||||||
|
i = s->origPtr;
|
||||||
|
j = GET_LL(i);
|
||||||
|
do {
|
||||||
|
Int32 tmp = GET_LL(j);
|
||||||
|
SET_LL(j, i);
|
||||||
|
i = j;
|
||||||
|
j = tmp;
|
||||||
|
}
|
||||||
|
while (i != s->origPtr);
|
||||||
|
|
||||||
|
s->tPos = s->origPtr;
|
||||||
|
s->nblock_used = 0;
|
||||||
|
if (s->blockRandomised) {
|
||||||
|
BZ_RAND_INIT_MASK;
|
||||||
|
BZ_GET_SMALL(s->k0); s->nblock_used++;
|
||||||
|
BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK;
|
||||||
|
} else {
|
||||||
|
BZ_GET_SMALL(s->k0); s->nblock_used++;
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
/*-- compute the T^(-1) vector --*/
|
||||||
|
for (i = 0; i < nblock; i++) {
|
||||||
|
uc = (UChar)(s->tt[i] & 0xff);
|
||||||
|
s->tt[s->cftab[uc]] |= (i << 8);
|
||||||
|
s->cftab[uc]++;
|
||||||
|
}
|
||||||
|
|
||||||
|
s->tPos = s->tt[s->origPtr] >> 8;
|
||||||
|
s->nblock_used = 0;
|
||||||
|
if (s->blockRandomised) {
|
||||||
|
BZ_RAND_INIT_MASK;
|
||||||
|
BZ_GET_FAST(s->k0); s->nblock_used++;
|
||||||
|
BZ_RAND_UPD_MASK; s->k0 ^= BZ_RAND_MASK;
|
||||||
|
} else {
|
||||||
|
BZ_GET_FAST(s->k0); s->nblock_used++;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
RETURN(BZ_OK);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
endhdr_2:
|
||||||
|
|
||||||
|
GET_UCHAR(BZ_X_ENDHDR_2, uc);
|
||||||
|
if (uc != 0x72) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_ENDHDR_3, uc);
|
||||||
|
if (uc != 0x45) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_ENDHDR_4, uc);
|
||||||
|
if (uc != 0x38) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_ENDHDR_5, uc);
|
||||||
|
if (uc != 0x50) RETURN(BZ_DATA_ERROR);
|
||||||
|
GET_UCHAR(BZ_X_ENDHDR_6, uc);
|
||||||
|
if (uc != 0x90) RETURN(BZ_DATA_ERROR);
|
||||||
|
|
||||||
|
s->storedCombinedCRC = 0;
|
||||||
|
GET_UCHAR(BZ_X_CCRC_1, uc);
|
||||||
|
s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_CCRC_2, uc);
|
||||||
|
s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_CCRC_3, uc);
|
||||||
|
s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
|
||||||
|
GET_UCHAR(BZ_X_CCRC_4, uc);
|
||||||
|
s->storedCombinedCRC = (s->storedCombinedCRC << 8) | ((UInt32)uc);
|
||||||
|
|
||||||
|
s->state = BZ_X_IDLE;
|
||||||
|
RETURN(BZ_STREAM_END);
|
||||||
|
|
||||||
|
default: AssertH ( False, 4001 );
|
||||||
|
}
|
||||||
|
|
||||||
|
AssertH ( False, 4002 );
|
||||||
|
|
||||||
|
save_state_and_return:
|
||||||
|
|
||||||
|
s->save_i = i;
|
||||||
|
s->save_j = j;
|
||||||
|
s->save_t = t;
|
||||||
|
s->save_alphaSize = alphaSize;
|
||||||
|
s->save_nGroups = nGroups;
|
||||||
|
s->save_nSelectors = nSelectors;
|
||||||
|
s->save_EOB = EOB;
|
||||||
|
s->save_groupNo = groupNo;
|
||||||
|
s->save_groupPos = groupPos;
|
||||||
|
s->save_nextSym = nextSym;
|
||||||
|
s->save_nblockMAX = nblockMAX;
|
||||||
|
s->save_nblock = nblock;
|
||||||
|
s->save_es = es;
|
||||||
|
s->save_N = N;
|
||||||
|
s->save_curr = curr;
|
||||||
|
s->save_zt = zt;
|
||||||
|
s->save_zn = zn;
|
||||||
|
s->save_zvec = zvec;
|
||||||
|
s->save_zj = zj;
|
||||||
|
s->save_gSel = gSel;
|
||||||
|
s->save_gMinlen = gMinlen;
|
||||||
|
s->save_gLimit = gLimit;
|
||||||
|
s->save_gBase = gBase;
|
||||||
|
s->save_gPerm = gPerm;
|
||||||
|
|
||||||
|
return retVal;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end decompress.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
205
bzlib/huffman.c
Normal file
205
bzlib/huffman.c
Normal file
@ -0,0 +1,205 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Huffman coding low-level stuff ---*/
|
||||||
|
/*--- huffman.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#include "bzlib_private.h"
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
#define WEIGHTOF(zz0) ((zz0) & 0xffffff00)
|
||||||
|
#define DEPTHOF(zz1) ((zz1) & 0x000000ff)
|
||||||
|
#define MYMAX(zz2,zz3) ((zz2) > (zz3) ? (zz2) : (zz3))
|
||||||
|
|
||||||
|
#define ADDWEIGHTS(zw1,zw2) \
|
||||||
|
(WEIGHTOF(zw1)+WEIGHTOF(zw2)) | \
|
||||||
|
(1 + MYMAX(DEPTHOF(zw1),DEPTHOF(zw2)))
|
||||||
|
|
||||||
|
#define UPHEAP(z) \
|
||||||
|
{ \
|
||||||
|
Int32 zz, tmp; \
|
||||||
|
zz = z; tmp = heap[zz]; \
|
||||||
|
while (weight[tmp] < weight[heap[zz >> 1]]) { \
|
||||||
|
heap[zz] = heap[zz >> 1]; \
|
||||||
|
zz >>= 1; \
|
||||||
|
} \
|
||||||
|
heap[zz] = tmp; \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define DOWNHEAP(z) \
|
||||||
|
{ \
|
||||||
|
Int32 zz, yy, tmp; \
|
||||||
|
zz = z; tmp = heap[zz]; \
|
||||||
|
while (True) { \
|
||||||
|
yy = zz << 1; \
|
||||||
|
if (yy > nHeap) break; \
|
||||||
|
if (yy < nHeap && \
|
||||||
|
weight[heap[yy+1]] < weight[heap[yy]]) \
|
||||||
|
yy++; \
|
||||||
|
if (weight[tmp] < weight[heap[yy]]) break; \
|
||||||
|
heap[zz] = heap[yy]; \
|
||||||
|
zz = yy; \
|
||||||
|
} \
|
||||||
|
heap[zz] = tmp; \
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
void BZ2_hbMakeCodeLengths ( UChar *len,
|
||||||
|
Int32 *freq,
|
||||||
|
Int32 alphaSize,
|
||||||
|
Int32 maxLen )
|
||||||
|
{
|
||||||
|
/*--
|
||||||
|
Nodes and heap entries run from 1. Entry 0
|
||||||
|
for both the heap and nodes is a sentinel.
|
||||||
|
--*/
|
||||||
|
Int32 nNodes, nHeap, n1, n2, i, j, k;
|
||||||
|
Bool tooLong;
|
||||||
|
|
||||||
|
Int32 heap [ BZ_MAX_ALPHA_SIZE + 2 ];
|
||||||
|
Int32 weight [ BZ_MAX_ALPHA_SIZE * 2 ];
|
||||||
|
Int32 parent [ BZ_MAX_ALPHA_SIZE * 2 ];
|
||||||
|
|
||||||
|
for (i = 0; i < alphaSize; i++)
|
||||||
|
weight[i+1] = (freq[i] == 0 ? 1 : freq[i]) << 8;
|
||||||
|
|
||||||
|
while (True) {
|
||||||
|
|
||||||
|
nNodes = alphaSize;
|
||||||
|
nHeap = 0;
|
||||||
|
|
||||||
|
heap[0] = 0;
|
||||||
|
weight[0] = 0;
|
||||||
|
parent[0] = -2;
|
||||||
|
|
||||||
|
for (i = 1; i <= alphaSize; i++) {
|
||||||
|
parent[i] = -1;
|
||||||
|
nHeap++;
|
||||||
|
heap[nHeap] = i;
|
||||||
|
UPHEAP(nHeap);
|
||||||
|
}
|
||||||
|
|
||||||
|
AssertH( nHeap < (BZ_MAX_ALPHA_SIZE+2), 2001 );
|
||||||
|
|
||||||
|
while (nHeap > 1) {
|
||||||
|
n1 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
|
||||||
|
n2 = heap[1]; heap[1] = heap[nHeap]; nHeap--; DOWNHEAP(1);
|
||||||
|
nNodes++;
|
||||||
|
parent[n1] = parent[n2] = nNodes;
|
||||||
|
weight[nNodes] = ADDWEIGHTS(weight[n1], weight[n2]);
|
||||||
|
parent[nNodes] = -1;
|
||||||
|
nHeap++;
|
||||||
|
heap[nHeap] = nNodes;
|
||||||
|
UPHEAP(nHeap);
|
||||||
|
}
|
||||||
|
|
||||||
|
AssertH( nNodes < (BZ_MAX_ALPHA_SIZE * 2), 2002 );
|
||||||
|
|
||||||
|
tooLong = False;
|
||||||
|
for (i = 1; i <= alphaSize; i++) {
|
||||||
|
j = 0;
|
||||||
|
k = i;
|
||||||
|
while (parent[k] >= 0) { k = parent[k]; j++; }
|
||||||
|
len[i-1] = j;
|
||||||
|
if (j > maxLen) tooLong = True;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! tooLong) break;
|
||||||
|
|
||||||
|
/* 17 Oct 04: keep-going condition for the following loop used
|
||||||
|
to be 'i < alphaSize', which missed the last element,
|
||||||
|
theoretically leading to the possibility of the compressor
|
||||||
|
looping. However, this count-scaling step is only needed if
|
||||||
|
one of the generated Huffman code words is longer than
|
||||||
|
maxLen, which up to and including version 1.0.2 was 20 bits,
|
||||||
|
which is extremely unlikely. In version 1.0.3 maxLen was
|
||||||
|
changed to 17 bits, which has minimal effect on compression
|
||||||
|
ratio, but does mean this scaling step is used from time to
|
||||||
|
time, enough to verify that it works.
|
||||||
|
|
||||||
|
This means that bzip2-1.0.3 and later will only produce
|
||||||
|
Huffman codes with a maximum length of 17 bits. However, in
|
||||||
|
order to preserve backwards compatibility with bitstreams
|
||||||
|
produced by versions pre-1.0.3, the decompressor must still
|
||||||
|
handle lengths of up to 20. */
|
||||||
|
|
||||||
|
for (i = 1; i <= alphaSize; i++) {
|
||||||
|
j = weight[i] >> 8;
|
||||||
|
j = 1 + (j / 2);
|
||||||
|
weight[i] = j << 8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
void BZ2_hbAssignCodes ( Int32 *code,
|
||||||
|
UChar *length,
|
||||||
|
Int32 minLen,
|
||||||
|
Int32 maxLen,
|
||||||
|
Int32 alphaSize )
|
||||||
|
{
|
||||||
|
Int32 n, vec, i;
|
||||||
|
|
||||||
|
vec = 0;
|
||||||
|
for (n = minLen; n <= maxLen; n++) {
|
||||||
|
for (i = 0; i < alphaSize; i++)
|
||||||
|
if (length[i] == n) { code[i] = vec; vec++; };
|
||||||
|
vec <<= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------------*/
|
||||||
|
void BZ2_hbCreateDecodeTables ( Int32 *limit,
|
||||||
|
Int32 *base,
|
||||||
|
Int32 *perm,
|
||||||
|
UChar *length,
|
||||||
|
Int32 minLen,
|
||||||
|
Int32 maxLen,
|
||||||
|
Int32 alphaSize )
|
||||||
|
{
|
||||||
|
Int32 pp, i, j, vec;
|
||||||
|
|
||||||
|
pp = 0;
|
||||||
|
for (i = minLen; i <= maxLen; i++)
|
||||||
|
for (j = 0; j < alphaSize; j++)
|
||||||
|
if (length[j] == i) { perm[pp] = j; pp++; };
|
||||||
|
|
||||||
|
for (i = 0; i < BZ_MAX_CODE_LEN; i++) base[i] = 0;
|
||||||
|
for (i = 0; i < alphaSize; i++) base[length[i]+1]++;
|
||||||
|
|
||||||
|
for (i = 1; i < BZ_MAX_CODE_LEN; i++) base[i] += base[i-1];
|
||||||
|
|
||||||
|
for (i = 0; i < BZ_MAX_CODE_LEN; i++) limit[i] = 0;
|
||||||
|
vec = 0;
|
||||||
|
|
||||||
|
for (i = minLen; i <= maxLen; i++) {
|
||||||
|
vec += (base[i+1] - base[i]);
|
||||||
|
limit[i] = vec-1;
|
||||||
|
vec <<= 1;
|
||||||
|
}
|
||||||
|
for (i = minLen + 1; i <= maxLen; i++)
|
||||||
|
base[i] = ((limit[i-1] + 1) << 1) - base[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end huffman.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
84
bzlib/randtable.c
Normal file
84
bzlib/randtable.c
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- Table for randomising repetitive blocks ---*/
|
||||||
|
/*--- randtable.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
|
||||||
|
/* ------------------------------------------------------------------
|
||||||
|
This file is part of bzip2/libbzip2, a program and library for
|
||||||
|
lossless, block-sorting data compression.
|
||||||
|
|
||||||
|
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
||||||
|
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
||||||
|
|
||||||
|
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
||||||
|
README file.
|
||||||
|
|
||||||
|
This program is released under the terms of the license contained
|
||||||
|
in the file LICENSE.
|
||||||
|
------------------------------------------------------------------ */
|
||||||
|
|
||||||
|
|
||||||
|
#include "bzlib_private.h"
|
||||||
|
|
||||||
|
|
||||||
|
/*---------------------------------------------*/
|
||||||
|
Int32 BZ2_rNums[512] = {
|
||||||
|
619, 720, 127, 481, 931, 816, 813, 233, 566, 247,
|
||||||
|
985, 724, 205, 454, 863, 491, 741, 242, 949, 214,
|
||||||
|
733, 859, 335, 708, 621, 574, 73, 654, 730, 472,
|
||||||
|
419, 436, 278, 496, 867, 210, 399, 680, 480, 51,
|
||||||
|
878, 465, 811, 169, 869, 675, 611, 697, 867, 561,
|
||||||
|
862, 687, 507, 283, 482, 129, 807, 591, 733, 623,
|
||||||
|
150, 238, 59, 379, 684, 877, 625, 169, 643, 105,
|
||||||
|
170, 607, 520, 932, 727, 476, 693, 425, 174, 647,
|
||||||
|
73, 122, 335, 530, 442, 853, 695, 249, 445, 515,
|
||||||
|
909, 545, 703, 919, 874, 474, 882, 500, 594, 612,
|
||||||
|
641, 801, 220, 162, 819, 984, 589, 513, 495, 799,
|
||||||
|
161, 604, 958, 533, 221, 400, 386, 867, 600, 782,
|
||||||
|
382, 596, 414, 171, 516, 375, 682, 485, 911, 276,
|
||||||
|
98, 553, 163, 354, 666, 933, 424, 341, 533, 870,
|
||||||
|
227, 730, 475, 186, 263, 647, 537, 686, 600, 224,
|
||||||
|
469, 68, 770, 919, 190, 373, 294, 822, 808, 206,
|
||||||
|
184, 943, 795, 384, 383, 461, 404, 758, 839, 887,
|
||||||
|
715, 67, 618, 276, 204, 918, 873, 777, 604, 560,
|
||||||
|
951, 160, 578, 722, 79, 804, 96, 409, 713, 940,
|
||||||
|
652, 934, 970, 447, 318, 353, 859, 672, 112, 785,
|
||||||
|
645, 863, 803, 350, 139, 93, 354, 99, 820, 908,
|
||||||
|
609, 772, 154, 274, 580, 184, 79, 626, 630, 742,
|
||||||
|
653, 282, 762, 623, 680, 81, 927, 626, 789, 125,
|
||||||
|
411, 521, 938, 300, 821, 78, 343, 175, 128, 250,
|
||||||
|
170, 774, 972, 275, 999, 639, 495, 78, 352, 126,
|
||||||
|
857, 956, 358, 619, 580, 124, 737, 594, 701, 612,
|
||||||
|
669, 112, 134, 694, 363, 992, 809, 743, 168, 974,
|
||||||
|
944, 375, 748, 52, 600, 747, 642, 182, 862, 81,
|
||||||
|
344, 805, 988, 739, 511, 655, 814, 334, 249, 515,
|
||||||
|
897, 955, 664, 981, 649, 113, 974, 459, 893, 228,
|
||||||
|
433, 837, 553, 268, 926, 240, 102, 654, 459, 51,
|
||||||
|
686, 754, 806, 760, 493, 403, 415, 394, 687, 700,
|
||||||
|
946, 670, 656, 610, 738, 392, 760, 799, 887, 653,
|
||||||
|
978, 321, 576, 617, 626, 502, 894, 679, 243, 440,
|
||||||
|
680, 879, 194, 572, 640, 724, 926, 56, 204, 700,
|
||||||
|
707, 151, 457, 449, 797, 195, 791, 558, 945, 679,
|
||||||
|
297, 59, 87, 824, 713, 663, 412, 693, 342, 606,
|
||||||
|
134, 108, 571, 364, 631, 212, 174, 643, 304, 329,
|
||||||
|
343, 97, 430, 751, 497, 314, 983, 374, 822, 928,
|
||||||
|
140, 206, 73, 263, 980, 736, 876, 478, 430, 305,
|
||||||
|
170, 514, 364, 692, 829, 82, 855, 953, 676, 246,
|
||||||
|
369, 970, 294, 750, 807, 827, 150, 790, 288, 923,
|
||||||
|
804, 378, 215, 828, 592, 281, 565, 555, 710, 82,
|
||||||
|
896, 831, 547, 261, 524, 462, 293, 465, 502, 56,
|
||||||
|
661, 821, 976, 991, 658, 869, 905, 758, 745, 193,
|
||||||
|
768, 550, 608, 933, 378, 286, 215, 979, 792, 961,
|
||||||
|
61, 688, 793, 644, 986, 403, 106, 366, 905, 644,
|
||||||
|
372, 567, 466, 434, 645, 210, 389, 550, 919, 135,
|
||||||
|
780, 773, 635, 389, 707, 100, 626, 958, 165, 504,
|
||||||
|
920, 176, 193, 713, 857, 265, 203, 50, 668, 108,
|
||||||
|
645, 990, 626, 197, 510, 357, 358, 850, 858, 364,
|
||||||
|
936, 638
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
|
/*--- end randtable.c ---*/
|
||||||
|
/*-------------------------------------------------------------*/
|
||||||
@ -61,8 +61,9 @@ get_entropy_count( int fd )
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/****************
|
/*
|
||||||
* Used to open the /dev/random devices (Linux, xBSD, Solaris (if it exists), ...)
|
* Used to open the /dev/random devices (Linux, xBSD, Solaris (if it
|
||||||
|
* exists), ...)
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
open_device( const char *name, int minor )
|
open_device( const char *name, int minor )
|
||||||
@ -82,7 +83,7 @@ open_device( const char *name, int minor )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/****************
|
/*
|
||||||
* Note: Using a level of 0 should never block and better add nothing
|
* Note: Using a level of 0 should never block and better add nothing
|
||||||
* to the pool. This is easy to accomplish with /dev/urandom.
|
* to the pool. This is easy to accomplish with /dev/urandom.
|
||||||
*/
|
*/
|
||||||
@ -103,8 +104,8 @@ rndlinux_gather_random( void (*add)(const void*, size_t, int), int requester,
|
|||||||
fd = fd_random;
|
fd = fd_random;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* this will also be used for elve 0 but by using /dev/urandom
|
/* This will also be used for level 0. By using /dev/urandom
|
||||||
* we can be sure that oit will never block. */
|
* we can be sure that it will never block. */
|
||||||
if( fd_urandom == -1 )
|
if( fd_urandom == -1 )
|
||||||
fd_urandom = open_device( NAME_OF_DEV_URANDOM, 9 );
|
fd_urandom = open_device( NAME_OF_DEV_URANDOM, 9 );
|
||||||
fd = fd_urandom;
|
fd = fd_urandom;
|
||||||
|
|||||||
24
configure.ac
24
configure.ac
@ -594,6 +594,14 @@ case "${host}" in
|
|||||||
agent_support=no
|
agent_support=no
|
||||||
use_simple_gettext=yes
|
use_simple_gettext=yes
|
||||||
have_w32_system=yes
|
have_w32_system=yes
|
||||||
|
# gcc 4.6 uses by default -fomit-frame-pointer. This
|
||||||
|
# conflicts with mingw runtime's setjmp/longjmp usage. The
|
||||||
|
# actual bug we notice is a segv related to the dlopened
|
||||||
|
# iconv.dll: After returning from set_native_charset the stack
|
||||||
|
# frame is corrupt.
|
||||||
|
if test -n "$GCC" ; then
|
||||||
|
CFLAGS="$CFLAGS -fno-omit-frame-pointer"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
i?86-emx-os2 | i?86-*-os2*emx )
|
i?86-emx-os2 | i?86-*-os2*emx )
|
||||||
# OS/2 with the EMX environment
|
# OS/2 with the EMX environment
|
||||||
@ -1321,7 +1329,16 @@ fi
|
|||||||
|
|
||||||
AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, test "$use_local_zlib" = yes)
|
AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, test "$use_local_zlib" = yes)
|
||||||
|
|
||||||
if test "$use_bzip2" = yes ; then
|
|
||||||
|
# Under W32 we force the use ofthe included bzip2 code.
|
||||||
|
if test x"$have_w32_system" = xyes ; then
|
||||||
|
have_bz2=yes
|
||||||
|
AC_DEFINE(HAVE_BZIP2,1,
|
||||||
|
[Defined if the bz2 compression library is available])
|
||||||
|
AC_CONFIG_LINKS(bzlib.h:bzlib/bzlib.h)
|
||||||
|
ZLIBS="$ZLIBS ../bzlib/libbz2.a"
|
||||||
|
else
|
||||||
|
if test "$use_bzip2" = yes ; then
|
||||||
_cppflags="${CPPFLAGS}"
|
_cppflags="${CPPFLAGS}"
|
||||||
_ldflags="${LDFLAGS}"
|
_ldflags="${LDFLAGS}"
|
||||||
AC_ARG_WITH(bzip2,
|
AC_ARG_WITH(bzip2,
|
||||||
@ -1343,12 +1360,12 @@ if test "$use_bzip2" = yes ; then
|
|||||||
[
|
[
|
||||||
have_bz2=yes
|
have_bz2=yes
|
||||||
ZLIBS="$ZLIBS -lbz2"
|
ZLIBS="$ZLIBS -lbz2"
|
||||||
AC_DEFINE(HAVE_BZIP2,1,
|
AC_DEFINE(HAVE_BZIP2,1)
|
||||||
[Defined if the bz2 compression library is available])
|
|
||||||
],
|
],
|
||||||
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
|
||||||
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags},[#include <stdio.h>])
|
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags},[#include <stdio.h>])
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
|
AM_CONDITIONAL(ENABLE_BZIP2_SUPPORT,test x"$have_bz2" = "xyes")
|
||||||
@ -1470,6 +1487,7 @@ doc/Makefile
|
|||||||
tools/Makefile
|
tools/Makefile
|
||||||
tools/gpg-zip
|
tools/gpg-zip
|
||||||
zlib/Makefile
|
zlib/Makefile
|
||||||
|
bzlib/Makefile
|
||||||
checks/Makefile
|
checks/Makefile
|
||||||
])
|
])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|||||||
@ -101,21 +101,29 @@ directory with the changes relative to the generic version.
|
|||||||
|
|
||||||
The source is distributed as a BZIP2 or GZIP compressed tar archive.
|
The source is distributed as a BZIP2 or GZIP compressed tar archive.
|
||||||
See the instructions in file README on how to check the integrity of
|
See the instructions in file README on how to check the integrity of
|
||||||
that file. Wir a properly setup build environment, you unpack the
|
that file. With a properly setup build environment, you unpack the
|
||||||
tarball change to the created directory and run
|
tarball change to the created directory and run
|
||||||
|
|
||||||
$ ./autogen.sh --build-w32
|
$ ./autogen.sh --build-w32
|
||||||
$ make
|
$ make
|
||||||
$ cp g10/gpg*.exe /some_windows_drive/
|
$ cp g10/gpg*.exe /some_windows_drive/
|
||||||
|
|
||||||
Building a version with the installer is a bit more complex and
|
Building a version with the installer requires an install NSIS tool
|
||||||
basically works by creating a top directory, unpacking in that top
|
and a directory with the iconv files. The script mk-w32-dist does the
|
||||||
directory, switching to the gnupg-1.x.y directory, running
|
entire build from the tarball and checks most prerequisites; example:
|
||||||
"./autogen.sh --build-w32" and "make", switching back to the top
|
|
||||||
directory, running a "mkdir dist-w32; mkdir iconv", copying the
|
$ scripts/mk-w32-dist $(pwd)/gnupg-1.4.3.tar.gz
|
||||||
required iconv files (iconv.dll, README.iconv, COPYING.LIB) into the
|
|
||||||
iconv directory, running gnupg-1.x.y/scripts/mk-w32-dist and voila,
|
If you installed the iconv files in a non-standard place you may use
|
||||||
the installer package will be available in the dist-w32 directory.
|
|
||||||
|
$ scripts/mk-w32-dist --iconv-dir /foo/bar/ $(pwd)/gnupg-1.4.3.tar.gz
|
||||||
|
|
||||||
|
If you need to patch the standard tarball, you can supply a patch file:
|
||||||
|
|
||||||
|
$ scripts/mk-w32-dist $(pwd)/gnupg-1.4.3.tar.gz mypatches
|
||||||
|
|
||||||
|
That patch file will then be part of the installer.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Copying:
|
Copying:
|
||||||
@ -123,8 +131,9 @@ Copying:
|
|||||||
|
|
||||||
GnuPG is
|
GnuPG is
|
||||||
|
|
||||||
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||||
2005, 2006, 2007 Free Software Foundation, Inc.
|
2005, 2006, 2007, 2008, 2009,
|
||||||
|
2010, 2012 Free Software Foundation, Inc.
|
||||||
|
|
||||||
GnuPG is free software; you can redistribute it and/or modify it
|
GnuPG is free software; you can redistribute it and/or modify it
|
||||||
under the terms of the GNU General Public License as published by
|
under the terms of the GNU General Public License as published by
|
||||||
@ -145,7 +154,7 @@ information and bug reporting addresses pertaining to GnuPG.
|
|||||||
|
|
||||||
For copying conditions of the GNU LIBICONV library see the file
|
For copying conditions of the GNU LIBICONV library see the file
|
||||||
README.iconv.
|
README.iconv.
|
||||||
|
|
||||||
The installer software used to create the official binary packages for
|
The installer software used to create the official binary packages for
|
||||||
W32 is NSIS (http://nsis.sourceforge.net/):
|
W32 is NSIS (http://nsis.sourceforge.net/):
|
||||||
|
|
||||||
|
|||||||
@ -30,7 +30,7 @@
|
|||||||
#include "cipher.h"
|
#include "cipher.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
#include "status.h"
|
||||||
|
|
||||||
static int mdc_decode_filter( void *opaque, int control, IOBUF a,
|
static int mdc_decode_filter( void *opaque, int control, IOBUF a,
|
||||||
byte *buf, size_t *ret_len);
|
byte *buf, size_t *ret_len);
|
||||||
@ -91,6 +91,15 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||||||
log_info(_("encrypted with unknown algorithm %d\n"), dek->algo );
|
log_info(_("encrypted with unknown algorithm %d\n"), dek->algo );
|
||||||
dek->algo_info_printed = 1;
|
dek->algo_info_printed = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
{
|
||||||
|
char buf[20];
|
||||||
|
|
||||||
|
snprintf (buf, sizeof buf, "%d %d", ed->mdc_method, dek->algo);
|
||||||
|
write_status_text (STATUS_DECRYPTION_INFO, buf);
|
||||||
|
}
|
||||||
|
|
||||||
if( (rc=check_cipher_algo(dek->algo)) )
|
if( (rc=check_cipher_algo(dek->algo)) )
|
||||||
goto leave;
|
goto leave;
|
||||||
blocksize = cipher_get_blocksize(dek->algo);
|
blocksize = cipher_get_blocksize(dek->algo);
|
||||||
@ -120,7 +129,7 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||||||
{
|
{
|
||||||
log_error("key setup failed: %s\n", g10_errstr(rc) );
|
log_error("key setup failed: %s\n", g10_errstr(rc) );
|
||||||
goto leave;
|
goto leave;
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!ed->buf) {
|
if (!ed->buf) {
|
||||||
log_error(_("problem handling encrypted packet\n"));
|
log_error(_("problem handling encrypted packet\n"));
|
||||||
@ -199,7 +208,7 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
|
|||||||
/*log_hexdump("MDC calculated:",md_read( dfx->mdc_hash, 0), datalen);*/
|
/*log_hexdump("MDC calculated:",md_read( dfx->mdc_hash, 0), datalen);*/
|
||||||
/*log_hexdump("MDC message :", dfx->defer, 20);*/
|
/*log_hexdump("MDC message :", dfx->defer, 20);*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
leave:
|
leave:
|
||||||
release_dfx_context (dfx);
|
release_dfx_context (dfx);
|
||||||
|
|||||||
29
g10/status.c
29
g10/status.c
@ -75,7 +75,7 @@ progress_cb ( void *ctx, int c )
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
get_status_string ( int no )
|
get_status_string ( int no )
|
||||||
{
|
{
|
||||||
const char *s;
|
const char *s;
|
||||||
|
|
||||||
@ -165,6 +165,7 @@ get_status_string ( int no )
|
|||||||
case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break;
|
case STATUS_PKA_TRUST_GOOD : s = "PKA_TRUST_GOOD"; break;
|
||||||
case STATUS_BEGIN_SIGNING : s = "BEGIN_SIGNING"; break;
|
case STATUS_BEGIN_SIGNING : s = "BEGIN_SIGNING"; break;
|
||||||
case STATUS_ERROR : s = "ERROR"; break;
|
case STATUS_ERROR : s = "ERROR"; break;
|
||||||
|
case STATUS_DECRYPTION_INFO: s = "DECRYPTION_INFO"; break;
|
||||||
default: s = "?"; break;
|
default: s = "?"; break;
|
||||||
}
|
}
|
||||||
return s;
|
return s;
|
||||||
@ -187,13 +188,13 @@ status_currently_allowed (int no)
|
|||||||
prompt the user. */
|
prompt the user. */
|
||||||
switch (no)
|
switch (no)
|
||||||
{
|
{
|
||||||
case STATUS_GET_BOOL:
|
case STATUS_GET_BOOL:
|
||||||
case STATUS_GET_LINE:
|
case STATUS_GET_LINE:
|
||||||
case STATUS_GET_HIDDEN:
|
case STATUS_GET_HIDDEN:
|
||||||
case STATUS_GOT_IT:
|
case STATUS_GOT_IT:
|
||||||
case STATUS_IMPORTED:
|
case STATUS_IMPORTED:
|
||||||
case STATUS_IMPORT_OK:
|
case STATUS_IMPORT_OK:
|
||||||
case STATUS_IMPORT_CHECK:
|
case STATUS_IMPORT_CHECK:
|
||||||
case STATUS_IMPORT_RES:
|
case STATUS_IMPORT_RES:
|
||||||
return 1; /* Yes. */
|
return 1; /* Yes. */
|
||||||
default:
|
default:
|
||||||
@ -214,7 +215,7 @@ set_status_fd ( int fd )
|
|||||||
if ( statusfp && statusfp != stdout && statusfp != stderr )
|
if ( statusfp && statusfp != stdout && statusfp != stderr )
|
||||||
fclose (statusfp);
|
fclose (statusfp);
|
||||||
statusfp = NULL;
|
statusfp = NULL;
|
||||||
if ( fd == -1 )
|
if ( fd == -1 )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if( fd == 1 )
|
if( fd == 1 )
|
||||||
@ -260,7 +261,7 @@ write_status_text ( int no, const char *text)
|
|||||||
fputs ( "\\n", statusfp );
|
fputs ( "\\n", statusfp );
|
||||||
else if (*text == '\r')
|
else if (*text == '\r')
|
||||||
fputs ( "\\r", statusfp );
|
fputs ( "\\r", statusfp );
|
||||||
else
|
else
|
||||||
putc ( *(const byte *)text, statusfp );
|
putc ( *(const byte *)text, statusfp );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -287,7 +288,7 @@ write_status_text_and_buffer ( int no, const char *string,
|
|||||||
|
|
||||||
if( !statusfp || !status_currently_allowed (no) )
|
if( !statusfp || !status_currently_allowed (no) )
|
||||||
return; /* Not enabled or allowed. */
|
return; /* Not enabled or allowed. */
|
||||||
|
|
||||||
if (wrap == -1) {
|
if (wrap == -1) {
|
||||||
lower_limit--;
|
lower_limit--;
|
||||||
wrap = 0;
|
wrap = 0;
|
||||||
@ -306,8 +307,8 @@ write_status_text_and_buffer ( int no, const char *string,
|
|||||||
first = 0;
|
first = 0;
|
||||||
}
|
}
|
||||||
for (esc=0, s=buffer, n=len; n && !esc; s++, n-- ) {
|
for (esc=0, s=buffer, n=len; n && !esc; s++, n-- ) {
|
||||||
if ( *s == '%' || *(const byte*)s <= lower_limit
|
if ( *s == '%' || *(const byte*)s <= lower_limit
|
||||||
|| *(const byte*)s == 127 )
|
|| *(const byte*)s == 127 )
|
||||||
esc = 1;
|
esc = 1;
|
||||||
if ( wrap && ++count > wrap ) {
|
if ( wrap && ++count > wrap ) {
|
||||||
dowrap=1;
|
dowrap=1;
|
||||||
@ -317,7 +318,7 @@ write_status_text_and_buffer ( int no, const char *string,
|
|||||||
if (esc) {
|
if (esc) {
|
||||||
s--; n++;
|
s--; n++;
|
||||||
}
|
}
|
||||||
if (s != buffer)
|
if (s != buffer)
|
||||||
fwrite (buffer, s-buffer, 1, statusfp );
|
fwrite (buffer, s-buffer, 1, statusfp );
|
||||||
if ( esc ) {
|
if ( esc ) {
|
||||||
fprintf (statusfp, "%%%02X", *(const byte*)s );
|
fprintf (statusfp, "%%%02X", *(const byte*)s );
|
||||||
@ -535,7 +536,7 @@ myread(int fd, void *buf, size_t count)
|
|||||||
raise (SIGHUP); /* no more input data */
|
raise (SIGHUP); /* no more input data */
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -120,6 +120,8 @@
|
|||||||
|
|
||||||
#define STATUS_ERROR 85
|
#define STATUS_ERROR 85
|
||||||
|
|
||||||
|
#define STATUS_DECRYPTION_INFO 86
|
||||||
|
|
||||||
|
|
||||||
/*-- status.c --*/
|
/*-- status.c --*/
|
||||||
void set_status_fd ( int fd );
|
void set_status_fd ( int fd );
|
||||||
|
|||||||
@ -57,10 +57,7 @@ struct trust_record {
|
|||||||
byte min_cert_level;
|
byte min_cert_level;
|
||||||
ulong created; /* timestamp of trustdb creation */
|
ulong created; /* timestamp of trustdb creation */
|
||||||
ulong nextcheck; /* timestamp of next scheduled check */
|
ulong nextcheck; /* timestamp of next scheduled check */
|
||||||
ulong reserved;
|
|
||||||
ulong reserved2;
|
|
||||||
ulong firstfree;
|
ulong firstfree;
|
||||||
ulong reserved3;
|
|
||||||
ulong trusthashtbl;
|
ulong trusthashtbl;
|
||||||
} ver;
|
} ver;
|
||||||
struct { /* free record */
|
struct { /* free record */
|
||||||
@ -82,7 +79,7 @@ struct trust_record {
|
|||||||
} trust;
|
} trust;
|
||||||
struct {
|
struct {
|
||||||
byte namehash[20];
|
byte namehash[20];
|
||||||
ulong next;
|
ulong next;
|
||||||
byte validity;
|
byte validity;
|
||||||
byte full_count;
|
byte full_count;
|
||||||
byte marginal_count;
|
byte marginal_count;
|
||||||
|
|||||||
@ -66,6 +66,20 @@
|
|||||||
#include "util.h"
|
#include "util.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_W32_SYSTEM
|
||||||
|
# if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW32_MAJOR_VERSION)
|
||||||
|
/* This is mingw32 with bogus ldap definitions; i.e. Unix style
|
||||||
|
LDAP definitions. */
|
||||||
|
# define my_ldap_start_tls_s(a,b,c) ldap_start_tls_sA ((a),(b),(c))
|
||||||
|
# else
|
||||||
|
/* Standard Microsoft or mingw64. */
|
||||||
|
# define my_ldap_start_tls_s(a,b,c) ldap_start_tls_sA ((a),NULL, NULL,(b),(c))
|
||||||
|
# endif
|
||||||
|
#else /*!W32*/
|
||||||
|
# define my_ldap_start_tls_s(a,b,c) ldap_start_tls_s ((a),(b),(c))
|
||||||
|
#endif /*!W32*/
|
||||||
|
|
||||||
|
|
||||||
extern char *optarg;
|
extern char *optarg;
|
||||||
extern int optind;
|
extern int optind;
|
||||||
|
|
||||||
@ -460,7 +474,7 @@ build_attrs(LDAPMod ***modlist,char *line)
|
|||||||
case 'R':
|
case 'R':
|
||||||
revoked=1;
|
revoked=1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'd':
|
case 'd':
|
||||||
case 'D':
|
case 'D':
|
||||||
disabled=1;
|
disabled=1;
|
||||||
@ -1043,7 +1057,7 @@ get_key(char *getkey)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* short key id */
|
/* short key id */
|
||||||
|
|
||||||
sprintf(search,"(pgpkeyid=%.8s)",getkey);
|
sprintf(search,"(pgpkeyid=%.8s)",getkey);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1773,12 +1787,12 @@ find_basekeyspacedn(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
ldap_msgfree(si_res);
|
ldap_msgfree(si_res);
|
||||||
}
|
}
|
||||||
|
|
||||||
return LDAP_SUCCESS;
|
return LDAP_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
show_help (FILE *fp)
|
show_help (FILE *fp)
|
||||||
{
|
{
|
||||||
fprintf (fp,"-h, --help\thelp\n");
|
fprintf (fp,"-h, --help\thelp\n");
|
||||||
@ -2195,7 +2209,7 @@ main(int argc,char *argv[])
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(err==LDAP_SUCCESS)
|
if(err==LDAP_SUCCESS)
|
||||||
err=ldap_start_tls_s(ldap,NULL,NULL);
|
err = my_ldap_start_tls_s (ldap, NULL, NULL);
|
||||||
|
|
||||||
if(err!=LDAP_SUCCESS)
|
if(err!=LDAP_SUCCESS)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -56,7 +56,7 @@ if test "$1" = "--build-w32"; then
|
|||||||
|
|
||||||
# Locate the cross compiler
|
# Locate the cross compiler
|
||||||
crossbindir=
|
crossbindir=
|
||||||
for host in i586-mingw32msvc i386-mingw32msvc; do
|
for host in i686-w64-mingw32 i586-mingw32msvc i386-mingw32msvc; do
|
||||||
if ${host}-gcc --version >/dev/null 2>&1 ; then
|
if ${host}-gcc --version >/dev/null 2>&1 ; then
|
||||||
crossbindir=/usr/${host}/bin
|
crossbindir=/usr/${host}/bin
|
||||||
conf_CC="CC=${host}-gcc"
|
conf_CC="CC=${host}-gcc"
|
||||||
@ -95,8 +95,7 @@ if test "$1" = "--build-w32"; then
|
|||||||
[ $DIE = yes ] && exit 1
|
[ $DIE = yes ] && exit 1
|
||||||
|
|
||||||
$tsdir/configure ${conf_CC} --build=${build} --host=${host} \
|
$tsdir/configure ${conf_CC} --build=${build} --host=${host} \
|
||||||
--with-bzip2=${w32root} \
|
${disable_foo_tests} $*
|
||||||
${disable_foo_tests} $*
|
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +0,0 @@
|
|||||||
Files useful for building W32 versions.
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
To include support for BZIP2 compression in GunPG for W32, the patch
|
|
||||||
below should be applied to a stock bzip2-1.0.6 source. The Build as
|
|
||||||
usual using the mingw32 cross compiler package from Debian and install
|
|
||||||
the library and header file on top of the cross compiler installation
|
|
||||||
(/usr/i586-mingw32msvc/lib/). Note that for ease of maintenance we
|
|
||||||
don't use a DLL. [wk 2005-03-14]
|
|
||||||
|
|
||||||
|
|
||||||
diff -u orig/bzip2-1.0.2/Makefile bzip2-1.0.2/Makefile
|
|
||||||
--- orig/bzip2-1.0.2/Makefile 2002-01-26 00:34:53.000000000 +0100
|
|
||||||
+++ bzip2-1.0.2/Makefile 2004-11-03 14:10:45.000000000 +0100
|
|
||||||
@@ -2,9 +2,9 @@
|
|
||||||
SHELL=/bin/sh
|
|
||||||
|
|
||||||
# To assist in cross-compiling
|
|
||||||
-CC=gcc
|
|
||||||
-AR=ar
|
|
||||||
-RANLIB=ranlib
|
|
||||||
+CC=i586-mingw32msvc-gcc
|
|
||||||
+AR=i586-mingw32msvc-ar
|
|
||||||
+RANLIB=i586-mingw32msvc-ranlib
|
|
||||||
LDFLAGS=
|
|
||||||
|
|
||||||
# Suitably paranoid flags to avoid bugs in gcc-2.7
|
|
||||||
diff -u orig/bzip2-1.0.2/bzlib.h bzip2-1.0.2/bzlib.h
|
|
||||||
--- orig/bzip2-1.0.2/bzlib.h 2001-12-30 03:19:45.000000000 +0100
|
|
||||||
+++ bzip2-1.0.2/bzlib.h 2004-11-03 14:32:41.000000000 +0100
|
|
||||||
@@ -113,7 +114,7 @@
|
|
||||||
/* Need a definitition for FILE */
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
-#ifdef _WIN32
|
|
||||||
+#if defined( _WIN32 ) && 0
|
|
||||||
# include <windows.h>
|
|
||||||
# ifdef small
|
|
||||||
/* windows.h define small to char */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
|
# Copyright (C) 2000, 2001, 2002, 2004, 2005,
|
||||||
|
# 2012 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is free software; as a special exception the author gives
|
# This file is free software; as a special exception the author gives
|
||||||
# unlimited permission to copy and/or distribute it, with or without
|
# unlimited permission to copy and/or distribute it, with or without
|
||||||
@ -11,30 +12,9 @@
|
|||||||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
cd dist-w32
|
|
||||||
|
|
||||||
tmp="`echo $0 | sed 's,.*gnupg-\([^/]*\)/.*,\1,'`"
|
PGM="mk-w32-dist"
|
||||||
|
[ -z "$w32root" ] && w32root="$HOME/w32root"
|
||||||
topdir=
|
|
||||||
bindir=..
|
|
||||||
|
|
||||||
if [ -f "../gnupg-$tmp/README" ]; then
|
|
||||||
srcdir="../gnupg-$tmp"
|
|
||||||
bindir="../gnupg-$tmp"
|
|
||||||
topdir=".."
|
|
||||||
elif [ -f ../README ]; then
|
|
||||||
srcdir=..
|
|
||||||
elif [ -f ../../README ]; then
|
|
||||||
srcdir=../..
|
|
||||||
bindir=..
|
|
||||||
elif [ -f ../../gnupg-stable/README ]; then
|
|
||||||
srcdir=../../gnupg-stable
|
|
||||||
elif [ -f ../../../gnupg-stable/README ]; then
|
|
||||||
srcdir=../../../gnupg-stable
|
|
||||||
else
|
|
||||||
echo "cannot figure out the source dir" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Windows uses an internal build number. We use the last day of the
|
# Windows uses an internal build number. We use the last day of the
|
||||||
# year concatenated with the hour. for it. If it happens that a new
|
# year concatenated with the hour. for it. If it happens that a new
|
||||||
@ -43,24 +23,113 @@ fi
|
|||||||
# of days.
|
# of days.
|
||||||
if [ "$1" = "--build-number" -a -n "$2" ]; then
|
if [ "$1" = "--build-number" -a -n "$2" ]; then
|
||||||
build_number="$2"
|
build_number="$2"
|
||||||
shift
|
shift
|
||||||
shift
|
shift
|
||||||
else
|
else
|
||||||
build_number=$(date -u '+%j%H' | sed 's/^0*\(.*\)/\1/')
|
build_number=$(date -u '+%j%H' | sed 's/^0*\(.*\)/\1/')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" = "--iconv-dir" -a -n "$2" ]; then
|
||||||
|
iconvdir="$2"
|
||||||
|
shift
|
||||||
|
shift
|
||||||
|
else
|
||||||
|
iconvdir="${w32root}/share/gnupg-1-extra/iconv"
|
||||||
|
fi
|
||||||
|
|
||||||
if i586-mingw32msvc-strip --version >/dev/null 2>&1 ; then
|
if [ $# -lt 1 -o $# -gt 2 -o "$1" = "--help" ]; then
|
||||||
|
echo "usage: $PGM [options] TARBALL [PATCHFILE]" >&2
|
||||||
|
echo " Options:" >&2
|
||||||
|
echo " --build-number N Windows build number" >&2
|
||||||
|
echo " --iconv-dir DIR Directory with inconv files" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ ! -d "$iconvdir" ]; then
|
||||||
|
echo "$PGM: iconv directory does not exists (use option --iconv-dir)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
( set +e
|
||||||
|
cd "${iconvdir}"
|
||||||
|
cat <<EOF | sha1sum -c >/dev/null
|
||||||
|
44f7289042b71631acac29b2f143330d2da2479e COPYING.LIB
|
||||||
|
3f4262714a3b508cf20428f046d511f7bfb9fd89 README.iconv
|
||||||
|
a21c860b81ed158e91b2b921b752f48fda6d6f1e iconv.dll
|
||||||
|
EOF
|
||||||
|
if [ $? != 0 ]; then
|
||||||
|
echo "$PGM: iconv files are not available or not correct" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
set -e
|
||||||
|
)
|
||||||
|
|
||||||
|
here="$(pwd)"
|
||||||
|
builddir=w32-build-root
|
||||||
|
tarball="$1"
|
||||||
|
patchfile="$2"
|
||||||
|
|
||||||
|
if [ ! -f "$tarball" ]; then
|
||||||
|
echo "$PGM: tarball does not exist" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
[ "$(echo "$tarball" | head -c 1)" != "/" ] && tarball="$(pwd)/$tarball"
|
||||||
|
|
||||||
|
if [ -n "$patchfile" -a ! -f "$patchfile" ]; then
|
||||||
|
echo "$PGM: patchfile does not exist" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! makensis -version >/dev/null 2>&1 ; then
|
||||||
|
echo "$PGM: error: makensis is not installed" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if i686-w64-mingw32-strip --version >/dev/null 2>&1 ; then
|
||||||
|
STRIP=i686-w64-mingw32-strip
|
||||||
|
elif i586-mingw32msvc-strip --version >/dev/null 2>&1 ; then
|
||||||
STRIP=i586-mingw32msvc-strip
|
STRIP=i586-mingw32msvc-strip
|
||||||
else
|
else
|
||||||
STRIP="mingw32 strip"
|
echo "$PGM: error: strip tool not found" >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If we don't have an installer we don't need to prepare for it.
|
echo "tarball: $tarball" >&2
|
||||||
if ! makensis -version >/dev/null 2>&1 ; then
|
version="$(echo "$tarball" | sed 's,.*/gnupg-\(.*\)\.tar\.gz$,\1,')"
|
||||||
topdir=
|
prod_version=$(echo "$version"|awk -F'[^0-9]' '{print $1 "." $2 "." $3 }')
|
||||||
|
prod_version="${prod_version}.${build_number}"
|
||||||
|
echo "version: $version ($prod_version)" >&2
|
||||||
|
|
||||||
|
[ -n "$patchfile" ] && echo "patchfile: $patchfile" >&2
|
||||||
|
echo "workdir: $builddir" >&2
|
||||||
|
|
||||||
|
echo "preparing work directory ..." >&2
|
||||||
|
[ -d "$builddir" ] && rm -rf "$builddir"
|
||||||
|
mkdir "$builddir"
|
||||||
|
cd "$builddir"
|
||||||
|
mkdir dist-w32
|
||||||
|
|
||||||
|
echo "unpacking tarball ..." >&2
|
||||||
|
tar xzf "$tarball"
|
||||||
|
cd gnupg-"$version"
|
||||||
|
|
||||||
|
if [ -n "$patchfile" ]; then
|
||||||
|
echo "applying patchfile ..." >&2
|
||||||
|
patch -p1 -t < "$patchfile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "running configure ..." >&2
|
||||||
|
./autogen.sh --build-w32 --silent
|
||||||
|
|
||||||
|
echo "running make ..." >&2
|
||||||
|
make -s
|
||||||
|
|
||||||
|
|
||||||
|
cd ../dist-w32
|
||||||
|
srcdir="../gnupg-$version"
|
||||||
|
bindir="../gnupg-$version"
|
||||||
|
|
||||||
|
|
||||||
# A function to return a plain ASCII (or Latin-1) encoded description
|
# A function to return a plain ASCII (or Latin-1) encoded description
|
||||||
# text for a language identifier. We need this to display the list of
|
# text for a language identifier. We need this to display the list of
|
||||||
@ -103,30 +172,18 @@ get_langname () {
|
|||||||
echo "$r"
|
echo "$r"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo "copying files ..." >&2
|
||||||
# Figure out the version
|
|
||||||
version=$(sed -n 's/^#[ ]*define[ ][ ]*VERSION[ ][ ]*\"\([0-9.a-z-]*\)\"/\1/p' $bindir/config.h)
|
|
||||||
prod_version=$(echo "$version"|awk -F'[^0-9]' '{print $1 "." $2 "." $3 }')
|
|
||||||
prod_version="${prod_version}.${build_number}"
|
|
||||||
echo "building version $version ($prod_version)"
|
|
||||||
|
|
||||||
rm * >/dev/null 2>/dev/null || true
|
|
||||||
|
|
||||||
cp ${bindir}/g10/gpg.exe gpg.exe
|
cp ${bindir}/g10/gpg.exe gpg.exe
|
||||||
$STRIP gpg.exe
|
$STRIP gpg.exe
|
||||||
cp ${bindir}/g10/gpgv.exe gpgv.exe
|
cp ${bindir}/g10/gpgv.exe gpgv.exe
|
||||||
$STRIP gpgv.exe
|
$STRIP gpgv.exe
|
||||||
for name in hkp curl ldap finger; do
|
for name in hkp curl ldap finger; do
|
||||||
cp ${bindir}/keyserver/gpgkeys_$name.exe gpgkeys_$name.exe
|
cp ${bindir}/keyserver/gpgkeys_$name.exe gpgkeys_$name.exe
|
||||||
$STRIP gpgkeys_$name.exe
|
$STRIP gpgkeys_$name.exe
|
||||||
done
|
done
|
||||||
cp ${bindir}/tools/gpgsplit.exe gpgsplit.exe
|
cp ${bindir}/tools/gpgsplit.exe gpgsplit.exe
|
||||||
$STRIP gpgsplit.exe
|
$STRIP gpgsplit.exe
|
||||||
|
|
||||||
for i in FAQ; do
|
|
||||||
cp ${bindir}/doc/$i $i.txt
|
|
||||||
todos $i.txt
|
|
||||||
done
|
|
||||||
man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/_\b//g;s/\b.//g"` >gpg.man
|
man -Tlatin1 -l ${srcdir}/doc/gpg.1 | sed `printf "s/_\b//g;s/\b.//g"` >gpg.man
|
||||||
todos gpg.man
|
todos gpg.man
|
||||||
man -Tlatin1 -l ${srcdir}/doc/gpgv.1 | sed `printf "s/_\b//g;s/\b.//g"` >gpgv.man
|
man -Tlatin1 -l ${srcdir}/doc/gpgv.1 | sed `printf "s/_\b//g;s/\b.//g"` >gpgv.man
|
||||||
@ -141,15 +198,16 @@ done
|
|||||||
cp ${srcdir}/doc/README.W32 README-W32.txt
|
cp ${srcdir}/doc/README.W32 README-W32.txt
|
||||||
todos README-W32.txt
|
todos README-W32.txt
|
||||||
|
|
||||||
patches_defs=
|
if [ -n "$patchfile" ]; then
|
||||||
for i in `find "$topdir/patches" -type f \( -name '*.diff' -o -name '*.tar.gz' \)`; do
|
echo "copying patch file ..." >&2
|
||||||
cp $i .
|
cp $patchfile patches.diff
|
||||||
patches_defs="-DWITH_PATCHES"
|
patches_defs="-DWITH_PATCHES"
|
||||||
done
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
echo "converting MO files ..." >&2
|
||||||
# We must distribute the MO files in UTF-8, the conversion is done by
|
# We must distribute the MO files in UTF-8, the conversion is done by
|
||||||
# gpg at runtime. To include English at the right position in the list we
|
# gpg at runtime. To include English at the right position in the list we
|
||||||
# need a special case.
|
# need a special case.
|
||||||
langlist=""
|
langlist=""
|
||||||
langdesclist=""
|
langdesclist=""
|
||||||
@ -158,15 +216,15 @@ for i in `(ls ${srcdir}/po/*.po; echo ${srcdir}/po/en.po) | sort`; do
|
|||||||
if [ $lang != "en" ]; then
|
if [ $lang != "en" ]; then
|
||||||
grep -s $lang ${srcdir}/po/LINGUAS >/dev/null || continue
|
grep -s $lang ${srcdir}/po/LINGUAS >/dev/null || continue
|
||||||
[ -f$lang.mo -a $lang.mo -nt $i ] && continue
|
[ -f$lang.mo -a $lang.mo -nt $i ] && continue
|
||||||
|
|
||||||
fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
|
fromset=`sed -n '/^"Content-Type:/ s/.*charset=\([a-zA-Z0-9_-]*\).*/\1/p' $i`
|
||||||
case "$fromset" in
|
case "$fromset" in
|
||||||
utf8|utf-8|UTF8|UTF-8)
|
utf8|utf-8|UTF8|UTF-8)
|
||||||
echo "$lang: keeping $fromset" >&2
|
echo "$lang: keeping $fromset" >&2
|
||||||
msgfmt --output-file=$lang.mo $i
|
msgfmt --output-file=$lang.mo $i
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "$lang: converting from $fromset to utf-8" >&2
|
echo "$lang: converting from $fromset to utf-8" >&2
|
||||||
iconv --silent --from-code=$fromset --to-code=utf-8 < $i | \
|
iconv --silent --from-code=$fromset --to-code=utf-8 < $i | \
|
||||||
sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=utf-8/"|\
|
sed "/^\"Content-Type:/ s/charset=[a-zA-Z0-9_-]*/charset=utf-8/"|\
|
||||||
msgfmt --output-file=$lang.mo -
|
msgfmt --output-file=$lang.mo -
|
||||||
@ -195,107 +253,26 @@ ListItems="$langdesclist"
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
# If we have a topdir, assume the full build environment and
|
src_defs=
|
||||||
# prepare the installer
|
buildinfo="`date -u '+%Y-%m-%d %H:%M UTC'`"
|
||||||
if [ -n "$topdir" ]; then
|
|
||||||
winpt_defs=
|
|
||||||
src_defs=
|
|
||||||
buildinfo="`date -u '+%Y-%m-%d %H:%M UTC'`"
|
|
||||||
|
|
||||||
# iconv.dll is a hard requirement
|
echo "copying iconv ..." >&2
|
||||||
if [ ! -f "$topdir/iconv/iconv.dll" ]; then
|
cp "${iconvdir}/iconv.dll" iconv.dll
|
||||||
echo "iconv.dll not available" >&2
|
for i in COPYING.LIB README.iconv; do
|
||||||
exit 1
|
cp ${iconvdir}/$i $i.txt
|
||||||
fi
|
todos $i.txt
|
||||||
ln "$topdir/iconv/iconv.dll" iconv.dll
|
done
|
||||||
for i in COPYING.LIB README.iconv; do
|
|
||||||
cp ${topdir}/iconv/$i $i.txt
|
|
||||||
todos $i.txt
|
|
||||||
done
|
|
||||||
|
|
||||||
# WinPT is optional
|
|
||||||
if [ -f "$topdir/winpt/WinPT.exe" ]; then
|
|
||||||
ln "$topdir/winpt/WinPT.exe" WinPT.exe
|
|
||||||
ln "$topdir/winpt/PTD.dll" PTD.dll
|
|
||||||
cp "$topdir/winpt/README-0.9.txt" README.winpt.txt
|
|
||||||
cp "$topdir/winpt/NEWS-0.9.txt" NEWS.winpt.txt
|
|
||||||
cp "$topdir/winpt/keyserver.conf" keyserver.conf
|
|
||||||
winpt_defs="-DWITH_WINPT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# See whether we should include the source and figure out the
|
# Now run the installer
|
||||||
# version numbers of the source files.
|
echo "invoking installer as:"
|
||||||
if [ -d "$topdir/tarballs" ]; then
|
echo makensis -v0 -nocd -DVERSION="${version}" \
|
||||||
have_gnupg_src=no
|
-DPROD_VERSION="${prod_version}" \
|
||||||
have_libiconv_src=no
|
-DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
|
||||||
have_winpt_src=no
|
${patches_defs} ${srcdir}/scripts/w32installer.nsi
|
||||||
for i in `find "$topdir/tarballs" -type f -name '*.tar.gz'`; do
|
BUILDINFO=$buildinfo makensis -v0 -nocd -DVERSION="${version}" \
|
||||||
fname=$(basename "$i" .gz)
|
-DPROD_VERSION="${prod_version}" \
|
||||||
zcat "$i" > "$fname"
|
-DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
|
||||||
case "$fname" in
|
${patches_defs} ${srcdir}/scripts/w32installer.nsi
|
||||||
gnupg-*)
|
mv gnupg-w32cli-${version}.exe "${here}"/
|
||||||
tmp=$(echo "$fname" | \
|
cd "${here}"
|
||||||
sed -n 's/^[^-]*-\([0-9.a-z-]*\)\.tar$/\1/p')
|
echo "gnupg-w32cli-${version}.exe ready." >&2
|
||||||
echo "gnupg source version is $tmp" >&2
|
|
||||||
if [ "$version" != "$tmp" ]; then
|
|
||||||
echo "gnupg source version does not match" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
have_gnupg_src=yes
|
|
||||||
;;
|
|
||||||
libiconv-*)
|
|
||||||
tmp=$(echo "$fname" | \
|
|
||||||
sed -n 's/^[^-]*-\([0-9.a-z-]*\)\.tar$/\1/p')
|
|
||||||
echo "libiconv source version is $tmp" >&2
|
|
||||||
src_defs="$src_defs -DLIBICONV_VERSION=$tmp"
|
|
||||||
have_libiconv_src=yes
|
|
||||||
;;
|
|
||||||
winpt-*)
|
|
||||||
tmp=$(echo "$fname" | \
|
|
||||||
sed -n 's/^[^-]*-\([0-9.a-z-]*\)\.tar$/\1/p')
|
|
||||||
echo "winpt source version is $tmp" >&2
|
|
||||||
src_defs="$src_defs -DWINPT_VERSION=$tmp"
|
|
||||||
have_winpt_src=yes
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
echo "WARNING: unknown source file $fname ignored" >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
if [ -n "$src_defs" ]; then
|
|
||||||
if [ $have_gnupg_src = "no" ]; then
|
|
||||||
echo "gnupg source missing" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ $have_libiconv_src = "no" ]; then
|
|
||||||
echo "libiconv source missing" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ -n "$winpt_defs" ]; then
|
|
||||||
if [ $have_winpt_src = "no" ]; then
|
|
||||||
echo "winpt source missing" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
src_defs="$src_defs -DWITH_SOURCE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Now run the installer
|
|
||||||
echo "invoking installer as:"
|
|
||||||
echo makensis -v0 -nocd -DVERSION="${version}" \
|
|
||||||
-DPROD_VERSION="${prod_version}" \
|
|
||||||
-DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
|
|
||||||
${patches_defs} ${srcdir}/scripts/w32installer.nsi
|
|
||||||
BUILDINFO=$buildinfo makensis -v0 -nocd -DVERSION="${version}" \
|
|
||||||
-DPROD_VERSION="${prod_version}" \
|
|
||||||
-DGNUPG_SRCDIR="${srcdir}" ${winpt_defs} ${src_defs} \
|
|
||||||
${patches_defs} ${srcdir}/scripts/w32installer.nsi
|
|
||||||
echo "Installer created" >&2
|
|
||||||
else
|
|
||||||
zip -9 "gnupg-w32cli-${version}.zip" *
|
|
||||||
echo "ZIP archive created" >&2
|
|
||||||
fi
|
|
||||||
|
|||||||
@ -68,12 +68,12 @@ Var STARTMENU_FOLDER
|
|||||||
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
|
!define MUI_UNFINISHPAGE_NOAUTOCLOSE
|
||||||
|
|
||||||
; Remember the installer language
|
; Remember the installer language
|
||||||
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
|
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
|
||||||
!define MUI_LANGDLL_REGISTRY_KEY "Software\GNU\GnuPG"
|
!define MUI_LANGDLL_REGISTRY_KEY "Software\GNU\GnuPG"
|
||||||
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
|
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
|
||||||
|
|
||||||
; -----
|
; -----
|
||||||
; Pages
|
; Pages
|
||||||
; -----
|
; -----
|
||||||
|
|
||||||
!define MUI_WELCOMEPAGE_TEXT "$(T_About)"
|
!define MUI_WELCOMEPAGE_TEXT "$(T_About)"
|
||||||
@ -96,10 +96,10 @@ Page custom CustomPageOptions
|
|||||||
|
|
||||||
!insertmacro MUI_PAGE_DIRECTORY
|
!insertmacro MUI_PAGE_DIRECTORY
|
||||||
|
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GNU\GnuPG"
|
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\GNU\GnuPG"
|
||||||
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
|
||||||
|
|
||||||
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
|
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
|
||||||
|
|
||||||
!insertmacro MUI_PAGE_INSTFILES
|
!insertmacro MUI_PAGE_INSTFILES
|
||||||
@ -110,7 +110,7 @@ Page custom CustomPageOptions
|
|||||||
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.gnupg.org/"
|
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.gnupg.org/"
|
||||||
!insertmacro MUI_PAGE_FINISH
|
!insertmacro MUI_PAGE_FINISH
|
||||||
|
|
||||||
|
|
||||||
!insertmacro MUI_UNPAGE_CONFIRM
|
!insertmacro MUI_UNPAGE_CONFIRM
|
||||||
!insertmacro MUI_UNPAGE_INSTFILES
|
!insertmacro MUI_UNPAGE_INSTFILES
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ Page custom CustomPageOptions
|
|||||||
|
|
||||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||||
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
|
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
|
||||||
ReserveFile "opt.ini"
|
ReserveFile "opt.ini"
|
||||||
ReserveFile "COPYING.txt"
|
ReserveFile "COPYING.txt"
|
||||||
ReserveFile "README-W32.txt"
|
ReserveFile "README-W32.txt"
|
||||||
#ReserveFile "${NSISDIR}/Plugins/System.dll"
|
#ReserveFile "${NSISDIR}/Plugins/System.dll"
|
||||||
@ -220,7 +220,6 @@ Section "Documentation" SecDoc
|
|||||||
File "gpg.man"
|
File "gpg.man"
|
||||||
File "gpgv.man"
|
File "gpgv.man"
|
||||||
File "NEWS.txt"
|
File "NEWS.txt"
|
||||||
File "FAQ.txt"
|
|
||||||
|
|
||||||
!ifdef WITH_WINPT
|
!ifdef WITH_WINPT
|
||||||
File "NEWS.winpt.txt"
|
File "NEWS.winpt.txt"
|
||||||
@ -228,8 +227,7 @@ Section "Documentation" SecDoc
|
|||||||
|
|
||||||
!ifdef WITH_PATCHES
|
!ifdef WITH_PATCHES
|
||||||
SetOutPath "$INSTDIR\Src"
|
SetOutPath "$INSTDIR\Src"
|
||||||
File '*.diff'
|
File 'patches.diff'
|
||||||
File '*.tar.gz'
|
|
||||||
!endif
|
!endif
|
||||||
|
|
||||||
SectionEnd ; Section Documentation
|
SectionEnd ; Section Documentation
|
||||||
@ -285,7 +283,7 @@ Section "-Finish"
|
|||||||
;; Create Menu entries
|
;; Create Menu entries
|
||||||
;;---------------------
|
;;---------------------
|
||||||
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
|
||||||
|
|
||||||
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
|
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
|
||||||
|
|
||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.lnk" \
|
||||||
@ -295,25 +293,25 @@ Section "-Finish"
|
|||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG NEWS.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG NEWS.lnk" \
|
||||||
"$INSTDIR\Doc\NEWS.txt"
|
"$INSTDIR\Doc\NEWS.txt"
|
||||||
|
|
||||||
SectionGetFlags ${SecDoc} $R0
|
SectionGetFlags ${SecDoc} $R0
|
||||||
IntOp $R0 $R0 & ${SF_SELECTED}
|
IntOp $R0 $R0 & ${SF_SELECTED}
|
||||||
IntCmp $R0 ${SF_SELECTED} 0 +2
|
IntCmp $R0 ${SF_SELECTED} 0 +2
|
||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG Manual Page.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG Manual Page.lnk" \
|
||||||
"$INSTDIR\Doc\gpg.man"
|
"$INSTDIR\Doc\gpg.man"
|
||||||
|
|
||||||
|
|
||||||
!ifdef WITH_WINPT
|
!ifdef WITH_WINPT
|
||||||
SectionGetFlags ${SecWinPT} $R0
|
SectionGetFlags ${SecWinPT} $R0
|
||||||
IntOp $R0 $R0 & ${SF_SELECTED}
|
IntOp $R0 $R0 & ${SF_SELECTED}
|
||||||
IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu
|
IntCmp $R0 ${SF_SELECTED} 0 no_winpt_menu
|
||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\winpt.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\winpt.lnk" \
|
||||||
"$INSTDIR\winpt.exe"
|
"$INSTDIR\winpt.exe"
|
||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT README.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT README.lnk" \
|
||||||
"$INSTDIR\Doc\README.winpt.txt"
|
"$INSTDIR\Doc\README.winpt.txt"
|
||||||
|
|
||||||
SectionGetFlags ${SecDoc} $R0
|
SectionGetFlags ${SecDoc} $R0
|
||||||
IntOp $R0 $R0 & ${SF_SELECTED}
|
IntOp $R0 $R0 & ${SF_SELECTED}
|
||||||
IntCmp $R0 ${SF_SELECTED} 0 +2
|
IntCmp $R0 ${SF_SELECTED} 0 +2
|
||||||
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT NEWS.lnk" \
|
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\WinPT NEWS.lnk" \
|
||||||
"$INSTDIR\Doc\NEWS.winpt.txt"
|
"$INSTDIR\Doc\NEWS.winpt.txt"
|
||||||
|
|
||||||
@ -330,17 +328,17 @@ Section "-Finish"
|
|||||||
;;-----------------
|
;;-----------------
|
||||||
;; Set the language
|
;; Set the language
|
||||||
;;-----------------
|
;;-----------------
|
||||||
SectionGetFlags ${SecNLS} $R0
|
SectionGetFlags ${SecNLS} $R0
|
||||||
IntOp $R0 $R0 & ${SF_SELECTED}
|
IntOp $R0 $R0 & ${SF_SELECTED}
|
||||||
IntCmp $R0 ${SF_SELECTED} 0 lang_none
|
IntCmp $R0 ${SF_SELECTED} 0 lang_none
|
||||||
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "opt.ini" "Field 1" "ListItems"
|
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "opt.ini" "Field 1" "ListItems"
|
||||||
DetailPrint "Available languages: $R0"
|
DetailPrint "Available languages: $R0"
|
||||||
!insertmacro MUI_INSTALLOPTIONS_READ $R1 "opt.ini" "Field 1" "State"
|
!insertmacro MUI_INSTALLOPTIONS_READ $R1 "opt.ini" "Field 1" "State"
|
||||||
DetailPrint "Selected language: $R1"
|
DetailPrint "Selected language: $R1"
|
||||||
|
|
||||||
StrCmp $R1 "" lang_none +1
|
StrCmp $R1 "" lang_none +1
|
||||||
${StrStr} $R2 $R0 $R1
|
${StrStr} $R2 $R0 $R1
|
||||||
StrCmp $R2 "" lang_none +1
|
StrCmp $R2 "" lang_none +1
|
||||||
${StrTok} $R3 $R2 " " "0" "1"
|
${StrTok} $R3 $R2 " " "0" "1"
|
||||||
goto lang_set_finish
|
goto lang_set_finish
|
||||||
@ -463,13 +461,13 @@ Function .onInit
|
|||||||
|
|
||||||
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "opt.ini"
|
!insertmacro MUI_INSTALLOPTIONS_EXTRACT "opt.ini"
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
Function un.onInit
|
Function un.onInit
|
||||||
|
|
||||||
!insertmacro MUI_UNGETLANGUAGE
|
!insertmacro MUI_UNGETLANGUAGE
|
||||||
|
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
@ -490,19 +488,19 @@ Function PrintNonAdminWarning
|
|||||||
FunctionEnd
|
FunctionEnd
|
||||||
|
|
||||||
|
|
||||||
Function CustomPageOptions
|
Function CustomPageOptions
|
||||||
SectionGetFlags ${SecNLS} $R0
|
SectionGetFlags ${SecNLS} $R0
|
||||||
IntOp $R0 $R0 & ${SF_SELECTED}
|
IntOp $R0 $R0 & ${SF_SELECTED}
|
||||||
IntCmp $R0 ${SF_SELECTED} show
|
IntCmp $R0 ${SF_SELECTED} show
|
||||||
|
|
||||||
Abort
|
Abort
|
||||||
|
|
||||||
show:
|
show:
|
||||||
!insertmacro MUI_HEADER_TEXT "$(T_InstallOptions)" "$(T_SelectLanguage)"
|
!insertmacro MUI_HEADER_TEXT "$(T_InstallOptions)" "$(T_SelectLanguage)"
|
||||||
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "opt.ini" "Field 1" "ListItems"
|
!insertmacro MUI_INSTALLOPTIONS_READ $R0 "opt.ini" "Field 1" "ListItems"
|
||||||
ReadRegStr $R1 HKCU "Software\GNU\GnuPG" "Lang"
|
ReadRegStr $R1 HKCU "Software\GNU\GnuPG" "Lang"
|
||||||
StrCmp $R1 "" use_default +1
|
StrCmp $R1 "" use_default +1
|
||||||
${StrStr} $R2 $R0 "$R1 - "
|
${StrStr} $R2 $R0 "$R1 - "
|
||||||
StrCmp $R2 "" +1 set_lang
|
StrCmp $R2 "" +1 set_lang
|
||||||
use_default:
|
use_default:
|
||||||
StrCpy $R2 "$(T_langid) - $(T_langname)"
|
StrCpy $R2 "$(T_langid) - $(T_langname)"
|
||||||
|
|||||||
@ -31,6 +31,10 @@
|
|||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "i18n.h"
|
#include "i18n.h"
|
||||||
|
|
||||||
|
#ifndef HAVE_TIMEGM
|
||||||
|
time_t timegm (struct tm *tm);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_UNSIGNED_TIME_T
|
#ifdef HAVE_UNSIGNED_TIME_T
|
||||||
# define INVALID_TIME_CHECK(a) ((a) == (time_t)(-1))
|
# define INVALID_TIME_CHECK(a) ((a) == (time_t)(-1))
|
||||||
#else
|
#else
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user