Index: head/contrib/xz/COPYING =================================================================== --- head/contrib/xz/COPYING (revision 333782) +++ head/contrib/xz/COPYING (revision 333783) @@ -1,65 +1,65 @@ XZ Utils Licensing ================== Different licenses apply to different files in this package. Here is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): - liblzma is in the public domain. - xz, xzdec, and lzmadec command line tools are in the public domain unless GNU getopt_long had to be compiled and linked in from the lib directory. The getopt_long code is under GNU LGPLv2.1+. - The scripts to grep, diff, and view compressed files have been adapted from gzip. These scripts and their documentation are under GNU GPLv2+. - All the documentation in the doc directory and most of the XZ Utils specific documentation files in other directories are in the public domain. - Translated messages are in the public domain. - The build system contains public domain files, and files that are under GNU GPLv2+ or GNU GPLv3+. None of these files end up in the binaries being built. - Test files and test code in the tests directory, and debugging utilities in the debug directory are in the public domain. - The extra directory may contain public domain files, and files that are under various free software licenses. You can do whatever you want with the files that have been put into the public domain. If you find public domain legally problematic, take the previous sentence as a license grant. If you still find the lack of copyright legally problematic, you have too many lawyers. As usual, this software is provided "as is", without any warranty. If you copy significant amounts of public domain code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but naturally it is not legally required. Here is an example of a good notice to put into "about box" or into documentation: - This software includes code from XZ Utils . + This software includes code from XZ Utils . The following license texts are included in the following files: - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 Note that the toolchain (compiler, linker etc.) may add some code pieces that are copyrighted. Thus, it is possible that e.g. liblzma binary wouldn't actually be in the public domain in its entirety even though it contains no copyrighted code from the XZ Utils source package. If you have questions, don't hesitate to ask the author(s) for more information. Index: head/contrib/xz/ChangeLog =================================================================== --- head/contrib/xz/ChangeLog (revision 333782) +++ head/contrib/xz/ChangeLog (revision 333783) @@ -1,15368 +1,5615 @@ +commit b5be61cc06088bb07f488f9baf7d447ff47b37c1 +Author: Lasse Collin +Date: 2018-04-29 19:00:06 +0300 + + Bump version and soname for 5.2.4. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit c47fa6d06745bb2e99866e76b81ac7a9c5a8bfec +Author: Lasse Collin +Date: 2018-04-29 18:48:00 +0300 + + extra/scanlzma: Fix compiler warnings. + + extra/scanlzma/scanlzma.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 7b350fe21aa4fd6495a3b6188a40e3f1ae7c0edf +Author: Lasse Collin +Date: 2018-04-29 18:15:37 +0300 + + Add NEWS for 5.2.4. + + NEWS | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +commit 5801591162a280aa52d156dfde42c531ec7fd8b6 +Author: Lasse Collin +Date: 2018-02-06 19:36:30 +0200 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit c4a616f4536146f8906e1b4412eefeec07b28fae +Author: Ben Boeckel +Date: 2018-01-29 13:58:18 -0500 + + nothrow: use noexcept for C++11 and newer + + In C++11, the `throw()` specifier is deprecated and `noexcept` is + preffered instead. + + src/liblzma/api/lzma.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 0b8947782ff3c5ef830a7f85412e44dcf3cdeb77 +Author: Lasse Collin +Date: 2018-02-06 18:02:48 +0200 + + liblzma: Remove incorrect #ifdef from range_common.h. + + In most cases it was harmless but it could affect some + custom build systems. + + Thanks to Pippijn van Steenhoven. + + src/liblzma/rangecoder/range_common.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 48f3b9f73ffea7f55d5678997aba0e79d2e82168 +Author: Lasse Collin +Date: 2018-01-10 22:10:39 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit a3ce3e902342be37c626a561ce3d9ffcf27d0f94 +Author: Lasse Collin +Date: 2018-01-10 21:54:27 +0200 + + tuklib_integer: New Intel C compiler needs immintrin.h. + + Thanks to Melanie Blower (Intel) for the patch. + + src/common/tuklib_integer.h | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit 4505ca483985f88c6923c05a43b4327feaab83b1 +Author: Lasse Collin +Date: 2017-09-24 20:04:24 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 1ef3cc226e3ce173575c218238b71a4eecabc470 +Author: Lasse Collin +Date: 2017-09-16 20:36:20 +0300 + + Windows: Fix paths in VS project files. + + Some paths use slashes instead of backslashes as directory + separators... now it should work (I tested VS2013 version). + + windows/vs2013/liblzma.vcxproj | 12 ++++++------ + windows/vs2013/liblzma_dll.vcxproj | 24 ++++++++++++------------ + windows/vs2017/liblzma.vcxproj | 12 ++++++------ + windows/vs2017/liblzma_dll.vcxproj | 24 ++++++++++++------------ + 4 files changed, 36 insertions(+), 36 deletions(-) + +commit e775d2a8189d24f60470e6e49d8af881df3a1680 +Author: Lasse Collin +Date: 2017-09-16 12:54:23 +0300 + + Windows: Add project files for VS2017. + + These files match the v5.2 branch (no file info decoder). + + windows/vs2017/config.h | 148 ++++++++++++++ + windows/vs2017/liblzma.vcxproj | 355 ++++++++++++++++++++++++++++++++++ + windows/vs2017/liblzma_dll.vcxproj | 384 +++++++++++++++++++++++++++++++++++++ + windows/vs2017/xz_win.sln | 48 +++++ + 4 files changed, 935 insertions(+) + +commit 10e02e0fbb6e2173f8b41f6e39b7b570f47dd74d +Author: Lasse Collin +Date: 2017-09-16 12:39:43 +0300 + + Windows: Move VS2013 files into windows/vs2013 directory. + + windows/{ => vs2013}/config.h | 0 + windows/{ => vs2013}/liblzma.vcxproj | 278 +++++++++++++++--------------- + windows/{ => vs2013}/liblzma_dll.vcxproj | 280 +++++++++++++++---------------- + windows/{ => vs2013}/xz_win.sln | 0 + 4 files changed, 279 insertions(+), 279 deletions(-) + +commit 06eebd4543196ded36fa9b8b9544195b38b24ef2 +Author: Lasse Collin +Date: 2017-08-14 20:08:33 +0300 + + Fix or hide warnings from GCC 7's -Wimplicit-fallthrough. + + src/liblzma/lzma/lzma_decoder.c | 6 ++++++ + src/xz/list.c | 2 ++ + 2 files changed, 8 insertions(+) + +commit ea4ea1dffafebaa8b2770bf3eca46900e4dd22dc +Author: Alexey Tourbin +Date: 2017-05-16 23:56:35 +0300 + + Docs: Fix a typo in a comment in doc/examples/02_decompress.c. + + doc/examples/02_decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit eb2ef4c79bf405ea0d215f3b1df3d0eaf5e1d27b +Author: Lasse Collin +Date: 2017-05-23 18:34:43 +0300 + + xz: Fix "xz --list --robot missing_or_bad_file.xz". + + It ended up printing an uninitialized char-array when trying to + print the check names (column 7) on the "totals" line. + + This also changes the column 12 (minimum xz version) to + 50000002 (xz 5.0.0) instead of 0 when there are no valid + input files. + + Thanks to kidmin for the bug report. + + src/xz/list.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 3ea5dbd9b0d79048e336e40cef3b6d814fb74e13 +Author: Lasse Collin +Date: 2017-04-24 19:48:47 +0300 + + Build: Omit pre-5.0.0 entries from the generated ChangeLog. + + It makes ChangeLog significantly smaller. + + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit bae24675936df99064de1502593c006bd902594b +Author: Lasse Collin +Date: 2017-04-24 19:30:22 +0300 + + Update the Git repository URL to HTTPS in ChangeLog. + + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 70f479211973b5361f4d7cb08ba5be69b4266e7a +Author: Lasse Collin +Date: 2017-04-19 22:17:35 +0300 + + Update the home page URLs to HTTPS. + + COPYING | 2 +- + README | 2 +- + configure.ac | 2 +- + doc/faq.txt | 4 ++-- + dos/config.h | 2 +- + src/common/common_w32res.rc | 2 +- + src/xz/xz.1 | 6 +++--- + src/xzdec/xzdec.1 | 4 ++-- + windows/README-Windows.txt | 2 +- + windows/config.h | 2 +- + 10 files changed, 14 insertions(+), 14 deletions(-) + +commit 2a4b2fa75d06a097261a02ecd3cf2b6d449bf754 +Author: Lasse Collin +Date: 2017-03-30 22:01:54 +0300 + + xz: Use POSIX_FADV_RANDOM for in "xz --list" mode. + + xz --list is random access so POSIX_FADV_SEQUENTIAL was clearly + wrong. + + src/xz/file_io.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit eb25743ade39170cffd9566a1aae272098cce216 +Author: Lasse Collin +Date: 2017-03-30 19:47:45 +0300 + + liblzma: Fix lzma_memlimit_set(strm, 0). + + The 0 got treated specially in a buggy way and as a result + the function did nothing. The API doc said that 0 was supposed + to return LZMA_PROG_ERROR but it didn't. + + Now 0 is treated as if 1 had been specified. This is done because + 0 is already used to indicate an error from lzma_memlimit_get() + and lzma_memusage(). + + In addition, lzma_memlimit_set() no longer checks that the new + limit is at least LZMA_MEMUSAGE_BASE. It's counter-productive + for the Index decoder and was actually needed only by the + auto decoder. Auto decoder has now been modified to check for + LZMA_MEMUSAGE_BASE. + + src/liblzma/api/lzma/base.h | 7 ++++++- + src/liblzma/common/auto_decoder.c | 3 +++ + src/liblzma/common/common.c | 6 ++++-- + 3 files changed, 13 insertions(+), 3 deletions(-) + +commit ef36c6362f3f3853f21b8a6359bcd06576ebf207 +Author: Lasse Collin +Date: 2017-03-30 19:16:55 +0300 + + liblzma: Similar memlimit fix for stream_, alone_, and auto_decoder. + + src/liblzma/api/lzma/container.h | 21 +++++++++++++++++---- + src/liblzma/common/alone_decoder.c | 5 +---- + src/liblzma/common/auto_decoder.c | 5 +---- + src/liblzma/common/stream_decoder.c | 5 +---- + 4 files changed, 20 insertions(+), 16 deletions(-) + +commit 57616032650f03840480b696d7878acdd2065521 +Author: Lasse Collin +Date: 2017-03-30 18:58:18 +0300 + + liblzma: Fix handling of memlimit == 0 in lzma_index_decoder(). + + It returned LZMA_PROG_ERROR, which was done to avoid zero as + the limit (because it's a special value elsewhere), but using + LZMA_PROG_ERROR is simply inconvenient and can cause bugs. + + The fix/workaround is to treat 0 as if it were 1 byte. It's + effectively the same thing. The only weird consequence is + that then lzma_memlimit_get() will return 1 even when 0 was + specified as the limit. + + This fixes a very rare corner case in xz --list where a specific + memory usage limit and a multi-stream file could print the + error message "Internal error (bug)" instead of saying that + the memory usage limit is too low. + + src/liblzma/api/lzma/index.h | 18 +++++++++++------- + src/liblzma/common/index_decoder.c | 4 ++-- + 2 files changed, 13 insertions(+), 9 deletions(-) + commit 3d566cd519017eee1a400e7961ff14058dfaf33c Author: Lasse Collin Date: 2016-12-30 13:26:36 +0200 Bump version and soname for 5.2.3. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 053e624fe33795e779ff736f16ce44a129c829b5 Author: Lasse Collin Date: 2016-12-30 13:25:10 +0200 Update NEWS for 5.2.3. NEWS | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) commit cae412b2b77d7fd88d187ed7659331709311f80d Author: Lasse Collin Date: 2015-04-01 14:45:25 +0300 xz: Fix the Capsicum rights on user_abort_pipe. src/xz/file_io.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 9ccbae41000572193b9a09e7102f9e84dc6d96de Author: Lasse Collin Date: 2016-12-28 21:05:22 +0200 Mention potential sandboxing bugs in INSTALL. INSTALL | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit e013a337d3de77cce24360dffe956ea2339489b6 Author: Lasse Collin Date: 2016-11-21 20:24:50 +0200 liblzma: Avoid multiple definitions of lzma_coder structures. Only one definition was visible in a translation unit. It avoided a few casts and temp variables but seems that this hack doesn't work with link-time optimizations in compilers as it's not C99/C11 compliant. Fixes: http://www.mail-archive.com/xz-devel@tukaani.org/msg00279.html src/liblzma/common/alone_decoder.c | 44 +++++---- src/liblzma/common/alone_encoder.c | 34 ++++--- src/liblzma/common/auto_decoder.c | 35 ++++--- src/liblzma/common/block_decoder.c | 41 ++++---- src/liblzma/common/block_encoder.c | 40 ++++---- src/liblzma/common/common.h | 18 ++-- src/liblzma/common/index_decoder.c | 33 ++++--- src/liblzma/common/index_encoder.c | 16 ++-- src/liblzma/common/stream_decoder.c | 50 +++++----- src/liblzma/common/stream_encoder.c | 56 ++++++----- src/liblzma/common/stream_encoder_mt.c | 124 ++++++++++++++----------- src/liblzma/delta/delta_common.c | 25 ++--- src/liblzma/delta/delta_decoder.c | 6 +- src/liblzma/delta/delta_encoder.c | 12 ++- src/liblzma/delta/delta_private.h | 4 +- src/liblzma/lz/lz_decoder.c | 60 ++++++------ src/liblzma/lz/lz_decoder.h | 13 ++- src/liblzma/lz/lz_encoder.c | 57 +++++++----- src/liblzma/lz/lz_encoder.h | 9 +- src/liblzma/lzma/lzma2_decoder.c | 32 ++++--- src/liblzma/lzma/lzma2_encoder.c | 51 +++++----- src/liblzma/lzma/lzma_decoder.c | 27 +++--- src/liblzma/lzma/lzma_encoder.c | 29 +++--- src/liblzma/lzma/lzma_encoder.h | 9 +- src/liblzma/lzma/lzma_encoder_optimum_fast.c | 3 +- src/liblzma/lzma/lzma_encoder_optimum_normal.c | 23 ++--- src/liblzma/lzma/lzma_encoder_private.h | 6 +- src/liblzma/simple/arm.c | 2 +- src/liblzma/simple/armthumb.c | 2 +- src/liblzma/simple/ia64.c | 2 +- src/liblzma/simple/powerpc.c | 2 +- src/liblzma/simple/simple_coder.c | 61 ++++++------ src/liblzma/simple/simple_private.h | 12 +-- src/liblzma/simple/sparc.c | 2 +- src/liblzma/simple/x86.c | 15 +-- 35 files changed, 532 insertions(+), 423 deletions(-) commit 8e0f1af3dcaec00a3879cce8ad7441edc6359d1c Author: Lasse Collin Date: 2016-12-26 20:50:25 +0200 Document --enable-sandbox configure option in INSTALL. INSTALL | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) commit ce2542d220de06acd618fd9f5c0a6683029fb4eb Author: Lasse Collin Date: 2015-03-31 22:19:34 +0300 xz: Add support for sandboxing with Capsicum (disabled by default). In the v5.2 branch this feature is considered experimental and thus disabled by default. The sandboxing is used conditionally as described in main.c. This isn't optimal but it was much easier to implement than a full sandboxing solution and it still covers the most common use cases where xz is writing to standard output. This should have practically no effect on performance even with small files as fork() isn't needed. C and locale libraries can open files as needed. This has been fine in the past, but it's a problem with things like Capsicum. io_sandbox_enter() tries to ensure that various locale-related files have been loaded before cap_enter() is called, but it's possible that there are other similar problems which haven't been seen yet. Currently Capsicum is available on FreeBSD 10 and later and there is a port to Linux too. Thanks to Loganaden Velvindron for help. configure.ac | 41 +++++++++++++++++++++++++++ src/xz/Makefile.am | 2 +- src/xz/file_io.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/xz/file_io.h | 6 ++++ src/xz/main.c | 18 ++++++++++++ src/xz/private.h | 4 +++ 6 files changed, 151 insertions(+), 1 deletion(-) commit 3ca1d5e6320111043e19434da881065fadafa0e4 Author: Lasse Collin Date: 2015-03-31 21:12:30 +0300 Fix bugs and otherwise improve ax_check_capsicum.m4. AU_ALIAS was removed because the new version is incompatible with the old version. It no longer checks for separately. It's enough to test for it as part of AC_CHECK_DECL. The defines HAVE_CAPSICUM_SYS_CAPSICUM_H and HAVE_CAPSICUM_SYS_CAPABILITY_H were removed as unneeded. HAVE_SYS_CAPSICUM_H from AC_CHECK_HEADERS is enough. It no longer does a useless search for the Capsicum library if the header wasn't found. Fixed a bug in ACTION-IF-FOUND (the first argument). Specifying the argument omitted the default action but the given action wasn't used instead. AC_DEFINE([HAVE_CAPSICUM]) is now always called when Capsicum support is found. Previously it was part of the default ACTION-IF-FOUND which a custom action would override. Now the default action only prepends ${CAPSICUM_LIB} to LIBS. The documentation was updated. Since there as no serial number, "#serial 2" was added. m4/ax_check_capsicum.m4 | 103 ++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 52 deletions(-) commit 5f3a742b64197fe8bedb6f05fc6ce5d177d11145 Author: Lasse Collin Date: 2015-03-31 19:20:24 +0300 Add m4/ax_check_capsicum.m4 for detecting Capsicum support. The file was loaded from this web page: https://github.com/google/capsicum-test/blob/dev/autoconf/m4/ax_check_capsicum.m4 Thanks to Loganaden Velvindron for pointing it out for me. m4/ax_check_capsicum.m4 | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) commit d74377e62b4c649e40294dd441de72c0f092e67c Author: Lasse Collin Date: 2015-10-12 20:29:09 +0300 liblzma: Fix a memory leak in error path of lzma_index_dup(). lzma_index_dup() calls index_dup_stream() which, in case of an error, calls index_stream_end() to free memory allocated by index_stream_init(). However, it illogically didn't actually free the memory. To make it logical, the tree handling code was modified a bit in addition to changing index_stream_end(). Thanks to Evan Nemerson for the bug report. src/liblzma/common/index.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) commit f580732216dcf971f3f006fe8e01cd4979e1d964 Author: Lasse Collin Date: 2016-10-24 18:53:25 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 88d7a7fd153bf1355cdf798ffdac7443d0169afc Author: Lasse Collin Date: 2016-10-24 18:51:36 +0300 tuklib_cpucores: Add support for sched_getaffinity(). It's available in glibc (GNU/Linux, GNU/kFreeBSD). It's better than sysconf(_SC_NPROCESSORS_ONLN) because sched_getaffinity() gives the number of cores available to the process instead of the total number of cores online. As a side effect, this commit fixes a bug on GNU/kFreeBSD where configure would detect the FreeBSD-specific cpuset_getaffinity() but it wouldn't actually work because on GNU/kFreeBSD it requires using -lfreebsd-glue when linking. Now the glibc-specific function will be used instead. Thanks to Sebastian Andrzej Siewior for the original patch and testing. m4/tuklib_cpucores.m4 | 30 +++++++++++++++++++++++++++++- src/common/tuklib_cpucores.c | 9 +++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) commit 51baf684376903dbeddd840582bfdf9fa91b311b Author: Lasse Collin Date: 2016-06-30 20:27:36 +0300 xz: Fix copying of timestamps on Windows. xz used to call utime() on Windows, but its result gets lost on close(). Using _futime() seems to work. Thanks to Martok for reporting the bug: http://www.mail-archive.com/xz-devel@tukaani.org/msg00261.html configure.ac | 2 +- src/xz/file_io.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) commit 1ddc479851139d6e8202e5835421bfe6578d9e07 Author: Lasse Collin Date: 2016-06-16 22:46:02 +0300 xz: Silence warnings from -Wlogical-op. Thanks to Evan Nemerson. src/xz/file_io.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit be647ff5ed5a1c244a65722af6ce250259f3b14a Author: Lasse Collin Date: 2016-04-10 20:55:49 +0300 Build: Fix = to += for xz_SOURCES in src/xz/Makefile.am. Thanks to Christian Kujau. src/xz/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit fb6d50c15343831f35305982cefa82053099191d Author: Lasse Collin Date: 2016-04-10 20:54:17 +0300 Build: Bump GNU Gettext version requirement to 0.19. It silences a few warnings and most people probably have 0.19 even on stable distributions. Thanks to Christian Kujau. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 74f8dad9f912a2993768d93d108ea2b0b2c196e0 Author: Lasse Collin Date: 2016-03-13 20:21:49 +0200 liblzma: Disable external SHA-256 by default. This is the sane thing to do. The conflict with OpenSSL on some OSes and especially that the OS-provided versions can be significantly slower makes it clear that it was a mistake to have the external SHA-256 support enabled by default. Those who want it can now pass --enable-external-sha256 to configure. INSTALL was updated with notes about OSes where this can be a bad idea. The SHA-256 detection code in configure.ac had some bugs that could lead to a build failure in some situations. These were fixed, although it doesn't matter that much now that the external SHA-256 is disabled by default. MINIX >= 3.2.0 uses NetBSD's libc and thus has SHA256_Init in libc instead of libutil. Support for the libutil version was removed. INSTALL | 36 ++++++++++++++++++++++ configure.ac | 76 +++++++++++++++++++++++------------------------ src/liblzma/check/check.h | 16 ++++------ 3 files changed, 79 insertions(+), 49 deletions(-) commit ea7f6ff04cb5bb1498088eb09960a4c3f13dfe39 Author: Lasse Collin Date: 2016-03-10 20:27:05 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit d0e018016b311232e82d9a98dc68f1e3dabce794 Author: Lasse Collin Date: 2016-03-10 20:26:49 +0200 Build: Avoid SHA256_Init on FreeBSD and MINIX 3. On FreeBSD 10 and older, SHA256_Init from libmd conflicts with libcrypto from OpenSSL. The OpenSSL version has different sizeof(SHA256_CTX) and it can cause weird problems if wrong SHA256_Init gets used. Looking at the source, MINIX 3 seems to have a similar issue but I'm not sure. To be safe, I disabled SHA256_Init on MINIX 3 too. NetBSD has SHA256_Init in libc and they had a similar problem, but they already fixed it in 2009. Thanks to Jim Wilcoxson for the bug report that helped in finding the problem. configure.ac | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) commit 5daae123915f32a4ed6dc948b831533c2d1beec3 Author: Lasse Collin Date: 2015-11-08 20:16:10 +0200 tuklib_physmem: Hopefully silence a warning on Windows. src/common/tuklib_physmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 491acc406e098167ccb7fce0728b94c2f32cff9f Author: Lasse Collin Date: 2015-11-04 23:17:43 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 8173ff8790ad3502d04e1c07d014cb84a3b8187b Author: Lasse Collin Date: 2015-11-04 23:14:00 +0200 liblzma: Make Valgrind happier with optimized (gcc -O2) liblzma. When optimizing, GCC can reorder code so that an uninitialized value gets used in a comparison, which makes Valgrind unhappy. It doesn't happen when compiled with -O0, which I tend to use when running Valgrind. Thanks to Rich Prohaska. I remember this being mentioned long ago by someone else but nothing was done back then. src/liblzma/lz/lz_encoder.c | 4 ++++ 1 file changed, 4 insertions(+) commit 013de2b5ab8094d2c82a2771f3d143eeb656eda9 Author: Lasse Collin Date: 2015-11-03 20:55:45 +0200 liblzma: Rename lzma_presets.c back to lzma_encoder_presets.c. It would be too annoying to update other build systems just because of this. src/liblzma/lzma/Makefile.inc | 2 +- src/liblzma/lzma/{lzma_presets.c => lzma_encoder_presets.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit a322f70ad96de88968c2c36e6a36bc08ae30bd20 Author: Lasse Collin Date: 2015-11-03 20:47:07 +0200 Build: Disable xzdec, lzmadec, and lzmainfo when they cannot be built. They all need decoder support and if that isn't available, there's no point trying to build them. configure.ac | 3 +++ 1 file changed, 3 insertions(+) commit 8ea49606cf6427e32319de7693eca9e43f1c8ad6 Author: Lasse Collin Date: 2015-11-03 20:35:19 +0200 Build: Simplify $enable_{encoders,decoders} usage a bit. configure.ac | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 42131a25e52bfe400acfa7df93469a96bb78bb78 Author: Lasse Collin Date: 2015-11-03 20:31:31 +0200 Windows/MSVC: Update config.h. windows/config.h | 6 ++++++ 1 file changed, 6 insertions(+) commit e9184e87cc989d14c7413e6adb3eca98f6ae0290 Author: Lasse Collin Date: 2015-11-03 20:29:58 +0200 DOS: Update config.h. dos/config.h | 6 ++++++ 1 file changed, 6 insertions(+) commit 2296778f3c9a1e3a8699973b09dd3610b8baa402 Author: Lasse Collin Date: 2015-11-03 20:29:33 +0200 xz: Make xz buildable even when encoders or decoders are disabled. The patch is quite long but it's mostly about adding new #ifdefs to omit code when encoders or decoders have been disabled. This adds two new #defines to config.h: HAVE_ENCODERS and HAVE_DECODERS. configure.ac | 4 ++++ src/xz/Makefile.am | 8 ++++++-- src/xz/args.c | 16 ++++++++++++++++ src/xz/coder.c | 33 +++++++++++++++++++++++++-------- src/xz/main.c | 9 +++++++-- src/xz/private.h | 5 ++++- 6 files changed, 62 insertions(+), 13 deletions(-) commit 97a3109281e475d9cf1b5095237d672fa0ad25e5 Author: Lasse Collin Date: 2015-11-03 18:06:40 +0200 Build: Build LZMA1/2 presets also when only decoder is wanted. People shouldn't rely on the presets when decoding raw streams, but xz uses the presets as the starting point for raw decoder options anyway. lzma_encocder_presets.c was renamed to lzma_presets.c to make it clear it's not used solely by the encoder code. src/liblzma/lzma/Makefile.inc | 6 +++++- src/liblzma/lzma/{lzma_encoder_presets.c => lzma_presets.c} | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) commit dc6b78d7f0f6fe43e9d4215146e8581feb8090e7 Author: Lasse Collin Date: 2015-11-03 17:54:48 +0200 Build: Fix configure to handle LZMA1 dependency with LZMA2. Now it gives an error if LZMA1 encoder/decoder is missing when LZMA2 encoder/decoder was requested. Even better would be LZMA2 implicitly enabling LZMA1 but it would need more code. configure.ac | 5 ----- 1 file changed, 5 deletions(-) commit 46d76c9cd3cb26a31f5ae6c3a8bbcf38e6da1add Author: Lasse Collin Date: 2015-11-03 17:41:54 +0200 Build: Don't omit lzma_cputhreads() unless using --disable-threads. Previously it was omitted if encoders were disabled with --disable-encoders. It didn't make sense and it also broke the build. src/liblzma/common/Makefile.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 16d68f874d89f1e4a1919786a35bbaef7d71a077 Author: Lasse Collin Date: 2015-11-02 18:16:51 +0200 liblzma: Fix a build failure related to external SHA-256 support. If an appropriate header and structure were found by configure, but a library with a usable SHA-256 functions wasn't, the build failed. src/liblzma/check/check.h | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) commit d9311647fc1ab512a3394596221ab8039c00af6b Author: Lasse Collin Date: 2015-11-02 15:19:10 +0200 xz: Always close the file before trying to delete it. unlink() can return EBUSY in errno for open files on some operating systems and file systems. src/xz/file_io.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) commit f59c4183f3c9066626ce45dc3db4642fa603fa21 Author: Lasse Collin Date: 2015-10-12 21:08:42 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 35f189673e280c12e4c5129f9f97e54eef3bbc04 Author: Lasse Collin Date: 2015-10-12 21:07:41 +0300 Tests: Add tests for the two bugs fixed in index.c. tests/test_index.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) commit e10bfdb0fcaff12f3a6dadee51e0a022aadccb51 Author: Lasse Collin Date: 2015-10-12 20:45:15 +0300 liblzma: Fix lzma_index_dup() for empty Streams. Stream Flags and Stream Padding weren't copied from empty Streams. src/liblzma/common/index.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) commit 06f434bd8980f25ca23232eb7bb7df7e37dc8448 Author: Lasse Collin Date: 2015-10-12 20:31:44 +0300 liblzma: Add a note to index.c for those using static analyzers. src/liblzma/common/index.c | 3 +++ 1 file changed, 3 insertions(+) commit 9815cdf6987ef91a85493bfcfd1ce2aaf3b47a0a Author: Lasse Collin Date: 2015-09-29 13:59:35 +0300 Bump version and soname for 5.2.2. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cbe0cec8476bdd0416c7ca9bc83895c9bea1cf78 Author: Lasse Collin Date: 2015-09-29 13:57:28 +0300 Update NEWS for 5.2.2. NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 49427ce7eececdd18bbd35dab23c81910d083e1c Author: Andre Noll Date: 2015-05-28 15:50:00 +0200 Fix typo in German translation. As pointed out by Robert Pollak, there's a typo in the German translation of the compression preset option (-0 ... -9) help text. "The compressor" translates to "der Komprimierer", and the genitive form is "des Komprimierers". The old word makes no sense at all. po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 608d6f06c940e7f28c25de005e8b99bdff42d27c Author: Hauke Henningsen Date: 2015-08-17 04:59:54 +0200 Update German translation, mostly wrt orthography Provide an update of the German translation. * A lot of compound words were previously written with spaces, while German orthography is relatively clear in that the components should not be separated. * When referring to the actual process of (de)compression rather than the concept, replace “(De-)Kompression” with “(De-)Komprimierung”. Previously, both forms were used in this context and are now used in a manner consistent with “Komprimierung” being more likely to refer to a process. * Consistently translate “standard input”/“output” * Use “Zeichen” instead of false friend “Charakter” for “character” * Insert commas around relative clauses (as required in German) * Some other minor corrections * Capitalize “ß” as “ẞ” * Consistently start option descriptions in --help with capital letters Acked-By: Andre Noll * Update after msgmerge po/de.po | 383 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 196 insertions(+), 187 deletions(-) commit c8988414e5b67b8ef2fe0ba7b1ccdd0ec73c60d3 Author: Lasse Collin Date: 2015-08-11 13:23:04 +0300 Build: Minor Cygwin cleanup. Some tests used "cygwin*" and some used "cygwin". I changed them all to use "cygwin". Shouldn't affect anything in practice. configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 85a6dfed53477906bfe9a7c0123dd412e391cb48 Author: Lasse Collin Date: 2015-08-11 13:21:52 +0300 Build: Support building of MSYS2 binaries. configure.ac | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) commit 77f270be8432df2e4516a0c48814b6976d6618c5 Author: Lasse Collin Date: 2015-08-09 21:06:26 +0300 Windows: Define DLL_EXPORT when building liblzma.dll with MSVC. src/liblzma/common/common.h uses it to set __declspec(dllexport) for the API symbols. Thanks to Adam Walling. windows/liblzma_dll.vcxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 8c975446c5903090a5a8493b5b96b71003056a88 Author: Lasse Collin Date: 2015-08-09 21:02:20 +0300 Windows: Omit unneeded header files from MSVC project files. windows/liblzma.vcxproj | 5 ----- windows/liblzma_dll.vcxproj | 5 ----- 2 files changed, 10 deletions(-) commit 119a00434954726ca58e4a578e6469f530fca30e Author: Lasse Collin Date: 2015-07-12 20:48:19 +0300 liblzma: A MSVC-specific hack isn't needed with MSVC 2013 and newer. src/liblzma/api/lzma.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit d4e7c557fcab353539c9481a8d95cb04bcb15c7c Author: Lasse Collin Date: 2015-06-19 20:38:55 +0300 Update THANKS. THANKS | 2 ++ 1 file changed, 2 insertions(+) commit 98001740ca56c894a7bd32eb47e9857a8a7d878d Author: Lasse Collin Date: 2015-06-19 20:21:30 +0300 Windows: Update the docs. INSTALL | 29 ++++++++----- windows/INSTALL-MSVC.txt | 47 ++++++++++++++++++++++ windows/{INSTALL-Windows.txt => INSTALL-MinGW.txt} | 2 +- 3 files changed, 67 insertions(+), 11 deletions(-) commit 28195e4c877007cc760ecea1d17f740693d66873 Author: Lasse Collin Date: 2015-06-19 17:25:31 +0300 Windows: Add MSVC project files for building liblzma. Thanks to Adam Walling for creating these files. windows/liblzma.vcxproj | 359 ++++++++++++++++++++++++++++++++++++++++ windows/liblzma_dll.vcxproj | 388 ++++++++++++++++++++++++++++++++++++++++++++ windows/xz_win.sln | 48 ++++++ 3 files changed, 795 insertions(+) commit 960440f3230dc628f6966d9f7614fc1b28baf44e Author: Lasse Collin Date: 2015-05-13 20:57:55 +0300 Tests: Fix a memory leak in test_bcj_exact_size. Thanks to Cristian Rodríguez. tests/test_bcj_exact_size.c | 1 + 1 file changed, 1 insertion(+) commit 68cd35acafbdcdf4e8ea8b5bb843c736939d6f8b Author: Lasse Collin Date: 2015-05-12 18:08:24 +0300 Fix NEWS about threading in 5.2.0. Thanks to Andy Hochhaus. NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit ff96ed6d25786728356017a13baf8c14731b4f1e Author: Lasse Collin Date: 2015-05-11 21:26:16 +0300 xz: Document that threaded decompression hasn't been implemented yet. src/xz/xz.1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 00d37b64a64ea8597fd2422d5187afd761ab9531 Author: Lasse Collin Date: 2015-04-20 20:20:29 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit db190a832c49ca3aed6d69cc992fa5583cae7b11 Author: Lasse Collin Date: 2015-04-20 19:59:18 +0300 Revert "xz: Use pipe2() if available." This reverts commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd. It is a problem when libc has pipe2() but the kernel is too old to have pipe2() and thus pipe2() fails. In xz it's pointless to have a fallback for non-functioning pipe2(); it's better to avoid pipe2() completely. Thanks to Michael Fox for the bug report. configure.ac | 4 ++-- src/xz/file_io.c | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) commit eccd8155e107c5ada03d13e7730675cdf1a44ddc Author: Lasse Collin Date: 2015-03-29 22:14:47 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 25263fd9e7a8a913395cb93d7c104cd48c2b4a00 Author: Lasse Collin Date: 2015-03-29 22:13:48 +0300 Fix the detection of installed RAM on QNX. The earlier version compiled but didn't actually work since sysconf(_SC_PHYS_PAGES) always fails (or so I was told). Thanks to Ole André Vadla Ravnås for the patch and testing. m4/tuklib_physmem.m4 | 6 +++--- src/common/tuklib_physmem.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) commit 4c544d2410903d38402221cb783ed85585b6a007 Author: Lasse Collin Date: 2015-03-27 22:39:07 +0200 Fix CPU core count detection on QNX. It tried to use sysctl() on QNX but - it broke the build because sysctl() needs -lsocket on QNX; - sysctl() doesn't work for detecting the core count on QNX even if it compiled. sysconf() works. An alternative would have been to use QNX-specific SYSPAGE_ENTRY(num_cpu) from . Thanks to Ole André Vadla Ravnås. m4/tuklib_cpucores.m4 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) commit e0ea6737b03e83ccaff4514d00e31bb926f8f0f3 Author: Lasse Collin Date: 2015-03-07 22:05:57 +0200 xz: size_t/uint32_t cleanup in options.c. src/xz/options.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 8bcca29a65335fd679c13814b70b35b68fa5daed Author: Lasse Collin Date: 2015-03-07 22:04:23 +0200 xz: Fix a comment and silence a warning in message.c. src/xz/message.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit f243f5f44c6b19a7c289a0ec73a03ee08364cb5b Author: Lasse Collin Date: 2015-03-07 22:01:00 +0200 liblzma: Silence more uint32_t vs. size_t warnings. src/liblzma/lz/lz_encoder.c | 2 +- src/liblzma/lzma/lzma_encoder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 7f0a4c50f4a374c40acf4b86848f301ad1e82d34 Author: Lasse Collin Date: 2015-03-07 19:54:00 +0200 xz: Make arg_count an unsigned int to silence a warning. Actually the value of arg_count cannot exceed INT_MAX but it's nicer as an unsigned int. src/xz/args.h | 2 +- src/xz/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit f6ec46801588b1be29c07c9db98558b521304002 Author: Lasse Collin Date: 2015-03-07 19:33:17 +0200 liblzma: Fix a warning in index.c. src/liblzma/common/index.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit a24518971cc621315af142dd3bb7614fab04ad27 Author: Lasse Collin Date: 2015-02-26 20:46:14 +0200 Build: Fix a CR+LF problem when running autoreconf -fi on OS/2. build-aux/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dec11497a71518423b5ff0e759100cf8aadf6c7b Author: Lasse Collin Date: 2015-02-26 16:53:44 +0200 Bump version and soname for 5.2.1. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 29e39c79975ab89ee5dd671e97064534a9f3a649 Author: Lasse Collin Date: 2015-02-26 13:01:09 +0200 Update NEWS for 5.2.1. NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 7a11c4a8e5e15f13d5fa59233b3172e65428efdd Author: Lasse Collin Date: 2015-02-22 19:38:48 +0200 xz: Use pipe2() if available. configure.ac | 4 ++-- src/xz/file_io.c | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) commit 117d962685c72682c63edc9bb765367189800202 Author: Lasse Collin Date: 2015-02-21 23:40:26 +0200 liblzma: Fix a compression-ratio regression in LZMA1/2 in fast mode. The bug was added in the commit f48fce093b07aeda95c18850f5e086d9f2383380 and thus affected 5.1.4beta and 5.2.0. Luckily the bug cannot cause data corruption or other nasty things. src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ae984e31c167d3bc52972ec422dd1ebd5f5d5719 Author: Lasse Collin Date: 2015-02-21 23:00:19 +0200 xz: Fix the fcntl() usage when creating a pipe for the self-pipe trick. Now it reads the old flags instead of blindly setting O_NONBLOCK. The old code may have worked correctly, but this is better. src/xz/file_io.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) commit 2205bb5853098aea36a56df6f5747037175f66b4 Author: Lasse Collin Date: 2015-02-10 15:29:34 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit d935b0cdf3db440269b9d952b2b281b18f8c7b08 Author: Lasse Collin Date: 2015-02-10 15:28:30 +0200 tuklib_cpucores: Use cpuset_getaffinity() on FreeBSD if available. In FreeBSD, cpuset_getaffinity() is the preferred way to get the number of available cores. Thanks to Rui Paulo for the patch. I edited it slightly, but hopefully I didn't break anything. m4/tuklib_cpucores.m4 | 23 ++++++++++++++++++++++- src/common/tuklib_cpucores.c | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) commit eb61bc58c20769cac4d05f363b9c0e8c9c71a560 Author: Lasse Collin Date: 2015-02-09 22:08:37 +0200 xzdiff: Make the mktemp usage compatible with FreeBSD's mktemp. Thanks to Rui Paulo for the fix. src/scripts/xzdiff.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) commit b9a5b6b7a29029680af733082b6a46e0fc01623a Author: Lasse Collin Date: 2015-02-03 21:45:53 +0200 Add a few casts to tuklib_integer.h to silence possible warnings. I heard that Visual Studio 2013 gave warnings without the casts. Thanks to Gabi Davar. src/common/tuklib_integer.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) commit c45757135f40e4a0de730ba5fff0100219493982 Author: Lasse Collin Date: 2015-01-26 21:24:39 +0200 liblzma: Set LZMA_MEMCMPLEN_EXTRA depending on the compare method. src/liblzma/common/memcmplen.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) commit 3c500174ed5485f550972a2a6109c361e875f069 Author: Lasse Collin Date: 2015-01-26 20:40:16 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit fec88d41e672d9e197c9442aecf02bd0dfa6d516 Author: Lasse Collin Date: 2015-01-26 20:39:28 +0200 liblzma: Silence harmless Valgrind errors. Thanks to Torsten Rupp for reporting this. I had forgotten to run Valgrind before the 5.2.0 release. src/liblzma/lz/lz_encoder.c | 6 ++++++ 1 file changed, 6 insertions(+) commit a9b45badfec0928d20a27c7176c005fa637f7d1e Author: Lasse Collin Date: 2015-01-09 21:50:19 +0200 xz: Fix comments. src/xz/file_io.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit 541aee6dd4aa97a809aba281475a21b641bb89e2 Author: Lasse Collin Date: 2015-01-09 21:35:06 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 4170edc914655310d2363baccf5e615e09b04911 Author: Lasse Collin Date: 2015-01-09 21:34:06 +0200 xz: Don't fail if stdout doesn't support O_NONBLOCK. This is similar to the case with stdin. Thanks to Brad Smith for the bug report and testing on OpenBSD. src/xz/file_io.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) commit 04bbc0c2843c50c8ad1cba42b937118e38b0508d Author: Lasse Collin Date: 2015-01-07 19:18:20 +0200 xz: Fix a memory leak in DOS-specific code. src/xz/file_io.c | 2 ++ 1 file changed, 2 insertions(+) commit f0f1f6c7235ffa901cf76fe18e33749e200b3eea Author: Lasse Collin Date: 2015-01-07 19:08:06 +0200 xz: Don't fail if stdin doesn't support O_NONBLOCK. It's a problem at least on OpenBSD which doesn't support O_NONBLOCK on e.g. /dev/null. I'm not surprised if it's a problem on other OSes too since this behavior is allowed in POSIX-1.2008. The code relying on this behavior was committed in June 2013 and included in 5.1.3alpha released on 2013-10-26. Clearly the development releases only get limited testing. src/xz/file_io.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) commit d2d484647d9d9d679f03c75abb0404f67069271c Author: Lasse Collin Date: 2015-01-06 20:30:15 +0200 Tests: Don't hide unexpected error messages in test_files.sh. Hiding them makes no sense since normally there's no error when testing the "good" files. With "bad" files errors are expected and then it makes sense to keep the messages hidden. tests/test_files.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit aae6a6aeda51cf94a47e39ad624728f9bee75e30 Author: Lasse Collin Date: 2014-12-30 11:17:16 +0200 Update Solaris notes in INSTALL. Mention the possible "make check" failure on Solaris in the Solaris-specific section of INSTALL. It was already in section 4.5 but it is better mention it in the OS-specific section too. INSTALL | 4 ++++ 1 file changed, 4 insertions(+) commit 7815112153178800a3521b9f31960e7cdc26cfba Author: Lasse Collin Date: 2014-12-26 12:00:05 +0200 Build: POSIX shell isn't required if scripts are disabled. INSTALL | 3 ++- configure.ac | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a Author: Lasse Collin Date: 2014-12-21 20:48:37 +0200 DOS: Update Makefile. dos/Makefile | 1 + 1 file changed, 1 insertion(+) commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e Author: Lasse Collin Date: 2014-12-21 19:50:38 +0200 Windows: Fix bin_i486 to bin_i686 in build.bash. windows/build.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit cbafa710918195dbba3db02c3fab4f0538235206 Author: Lasse Collin Date: 2014-12-21 18:58:44 +0200 Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c. doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a Author: Lasse Collin Date: 2014-12-21 18:56:44 +0200 Docs: Update docs/examples/00_README.txt. doc/examples/00_README.txt | 4 ++++ 1 file changed, 4 insertions(+) commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6 Author: Lasse Collin Date: 2014-12-21 18:11:17 +0200 Bump version and soname for 5.2.0. I know that soname != app version, but I skip AGE=1 in -version-info to make the soname match the liblzma version anyway. It doesn't hurt anything as long as it doesn't conflict with library versioning rules. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 6 +++--- src/liblzma/liblzma.map | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da Author: Lasse Collin Date: 2014-12-21 18:05:03 +0200 Avoid variable-length arrays in the debug programs. debug/full_flush.c | 3 ++- debug/sync_flush.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) commit 72f7307cfdceb941aeb2bf30d424cc0d13621786 Author: Lasse Collin Date: 2014-12-21 18:01:45 +0200 Build: Include 04_compress_easy_mt.c in the tarball. Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0 Author: Lasse Collin Date: 2014-12-21 18:00:38 +0200 Fix build when --disable-threads is used. src/common/mythread.h | 2 ++ 1 file changed, 2 insertions(+) commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17 Author: Adrien Nader Date: 2014-12-21 15:56:15 +0100 po/fr: improve wording for help for --lzma1/--lzma2. po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a8b6b569e7fadbf5b5b9139d53bc764015c15027 Author: Adrien Nader Date: 2014-12-21 15:55:48 +0100 po/fr: missing line in translation of --extreme. po/fr.po | 1 + 1 file changed, 1 insertion(+) commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9 Author: Lasse Collin Date: 2014-12-21 14:32:33 +0200 Update NEWS for 5.2.0. NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429 Author: Lasse Collin Date: 2014-12-21 14:32:22 +0200 Update NEWS for 5.0.8. NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) commit 42e97a32649bf53ce43be2258b902a417c6e7fa1 Author: Lasse Collin Date: 2014-12-21 14:07:54 +0200 xz: Fix a comment. src/xz/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 29b95d5d6665cedffa6a9d6d3d914f981e852182 Author: Lasse Collin Date: 2014-12-20 20:43:14 +0200 Update INSTALL about the dependencies of the scripts. INSTALL | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) commit 3af91040bb42c21afbb81f5568c3313125e61192 Author: Lasse Collin Date: 2014-12-20 20:42:33 +0200 Windows: Update build instructions. INSTALL | 15 +++++++++------ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 29 deletions(-) commit 0152f72bf6289d744823dc6c849538f3a139ad70 Author: Lasse Collin Date: 2014-12-20 20:41:48 +0200 Windows: Update the build script and README-Windows.txt. The 32-bit build is now for i686 or newer because the prebuilt MinGW-w64 toolchains include i686 code in the executables even if one uses -march=i486. The build script builds 32-bit SSE2 enabled version too. Run-time detection of SSE2 support would be nice (on any OS) but it's not implemented in XZ Utils yet. windows/README-Windows.txt | 30 ++++++++++++++++-------------- windows/build.bash | 23 ++++++++++++++--------- 2 files changed, 30 insertions(+), 23 deletions(-) commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a Author: Lasse Collin Date: 2014-12-19 15:51:50 +0200 Windows: Define TUKLIB_SYMBOL_PREFIX in config.h. It is to keep all symbols in the lzma_ namespace. windows/config.h | 3 +++ 1 file changed, 3 insertions(+) commit 7f7d093de79eee0c7dbfd7433647e46302f19f82 Author: Lasse Collin Date: 2014-12-16 21:00:09 +0200 xz: Update the man page about --threads. src/xz/xz.1 | 5 ----- 1 file changed, 5 deletions(-) commit 009823448b82aa5f465668878a544c5842885407 Author: Lasse Collin Date: 2014-12-16 20:57:43 +0200 xz: Update the man page about --block-size. src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) commit 7dddfbeb499e528940bc12047355c184644aafe9 Author: Adrien Nader Date: 2014-12-10 22:26:57 +0100 po/fr: several more translation updates: reword and handle --ignore-check. po/fr.po | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) commit 6eca5be40e04ddc4b738d493e4e56835956d8b69 Author: Adrien Nader Date: 2014-12-10 22:23:01 +0100 po/fr: yet another place where my email address had to be updated. po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7 Author: Adrien Nader Date: 2014-12-10 22:22:20 +0100 po/fr: fix several typos that have been around since the beginning. po/fr.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) commit 4c5aa911a0df027e46171e368debc543d2fa72b2 Author: Adrien Nader Date: 2014-12-03 20:02:31 +0100 po/fr: last batch of new translations for now. Four new error messages. po/fr.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) commit 3e3099e36d27059499e7996fb38a62e8ab01d356 Author: Adrien Nader Date: 2014-12-03 20:01:32 +0100 po/fr: translations for --threads, --block-size and --block-list. po/fr.po | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53 Author: Adrien Nader Date: 2014-12-03 20:00:53 +0100 po/fr: remove fuzzy marker for error messages that will be kept in English. The following is a copy of a comment inside fr.po: Note from translator on "file status flags". The following entry is kept un-translated on purpose. It is difficult to translate and should only happen in exceptional circumstances which means that translating would: - lose some of the meaning - make it more difficult to look up in search engines; it might happen one in a million times, if we dilute the error message in 20 languages, it will be almost impossible to find an explanation and support for the error. po/fr.po | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) commit 46cbb9033af8a21fafe543302d6919746e0d72af Author: Adrien Nader Date: 2014-12-03 19:58:25 +0100 po/fr: several minor updates and better wording. Meaning doesn't change at all: it's only for better wording and/or formatting of a few strings. po/fr.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) commit 7ce49d444f04e73145f79c832eb4d510594b074a Author: Adrien Nader Date: 2014-12-03 19:56:12 +0100 po/fr: update my email address and copyright years. po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c Author: Adrien Nader Date: 2014-11-26 10:08:26 +0100 fr.po: commit file after only "update-po" so actual is readable. po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 199 insertions(+), 112 deletions(-) commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b Author: Lasse Collin Date: 2014-12-02 20:04:07 +0200 liblzma: Document how lzma_mt.block_size affects memory usage. src/liblzma/api/lzma/container.h | 4 ++++ 1 file changed, 4 insertions(+) commit e4fc1d2f9571fba79ce383595be2ea2a9257def0 Author: Lasse Collin Date: 2014-11-28 20:07:18 +0200 Update INSTALL about a "make check" failure in test_scripts.sh. INSTALL | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe Author: Lasse Collin Date: 2014-11-26 20:12:27 +0200 Remove LZMA_UNSTABLE macro. src/liblzma/api/lzma/container.h | 4 ---- src/liblzma/common/common.h | 2 -- src/xz/private.h | 1 - 3 files changed, 7 deletions(-) commit 6d9c0ce9f2677b159e32b224aba5b535b304a705 Author: Lasse Collin Date: 2014-11-26 20:10:33 +0200 liblzma: Update lzma_stream_encoder_mt() API docs. src/liblzma/api/lzma/container.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3 Author: Lasse Collin Date: 2014-11-25 12:32:05 +0200 liblzma: Verify the filter chain in threaded encoder initialization. This way an invalid filter chain is detected at the Stream encoder initialization instead of delaying it to the first call to lzma_code() which triggers the initialization of the actual filter encoder(s). src/liblzma/common/stream_encoder_mt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit 107a263d5bb63cd3593fd6a5c938706539f84523 Author: Lasse Collin Date: 2014-11-17 19:11:49 +0200 Build: Update m4/ax_pthread.m4 from Autoconf Archive. m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 47 insertions(+), 24 deletions(-) commit b13a781833399ff5726cfc997f3cb2f0acbdbf31 Author: Lasse Collin Date: 2014-11-17 18:52:21 +0200 Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING. configure.ac | 36 ++++++++++++++++++------------------ m4/tuklib_integer.m4 | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) commit 542cac122ed3550148a2af0033af22b757491378 Author: Lasse Collin Date: 2014-11-17 18:43:19 +0200 Build: Fix Autoconf warnings about escaped backquotes. Thanks to Daniel Richard G. for pointing out that it's good to sometimes run autoreconf -fi with -Wall. configure.ac | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f Author: Lasse Collin Date: 2014-11-10 18:54:40 +0200 xzdiff: Use mkdir if mktemp isn't available. src/scripts/xzdiff.in | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7 Author: Lasse Collin Date: 2014-11-10 18:45:01 +0200 xzdiff: Create a temporary directory to hold a temporary file. This avoids the possibility of "File name too long" when creating a temp file when the input file name is very long. This also means that other users on the system can no longer see the input file names in /tmp (or whatever $TMPDIR is) since the temporary directory will have a generic name. This usually doesn't matter since on many systems one can see the arguments given to all processes anyway. The number X chars to mktemp where increased from 6 to 10. Note that with some shells temp files or dirs won't be used at all. src/scripts/xzdiff.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit 7716dcf9df7f457500cb657314e7a9aea5fedb06 Author: Lasse Collin Date: 2014-11-10 15:38:47 +0200 liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage(). It read the filter chain from a wrong variable. This is a similar bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e. src/liblzma/common/stream_encoder_mt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit 230fa4a605542c84b4178a57381695a0af4e779b Author: Lasse Collin Date: 2014-11-10 14:49:55 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101 Author: Lasse Collin Date: 2014-10-29 21:28:25 +0200 Update .gitignore files. .gitignore | 2 ++ m4/.gitignore | 3 +++ 2 files changed, 5 insertions(+) commit c923b140b27d1a055db6284e10fd546ad1a7fcdb Author: Lasse Collin Date: 2014-10-29 21:15:35 +0200 Build: Prepare to support Automake's subdir-objects. Due to a bug in Automake, subdir-objects won't be enabled for now. http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354 Thanks to Daniel Richard G. for the original patches. configure.ac | 7 ++++++- src/Makefile.am | 22 +++++++++++++++++++++- src/liblzma/Makefile.am | 4 ++-- src/lzmainfo/Makefile.am | 4 ++-- src/xz/Makefile.am | 10 +++++----- src/xzdec/Makefile.am | 8 ++++---- 6 files changed, 40 insertions(+), 15 deletions(-) commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f Author: Lasse Collin Date: 2014-10-24 20:09:29 +0300 Translations: Update the Italian translation. Thanks to Milo Casagrande. po/it.po | 452 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 275 insertions(+), 177 deletions(-) commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd Author: Lasse Collin Date: 2014-10-18 18:51:45 +0300 Translations: Update the Polish translation. Thanks to Jakub Bogusz. po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 214 insertions(+), 118 deletions(-) commit 4f9d233f67aea25e532824d11b7642cf7dee7a76 Author: Andre Noll Date: 2014-10-14 17:30:30 +0200 l10n: de.po: Change translator email address. Although the old address is still working, the new one should be preferred. So this commit changes all three places in de.po accordingly. Signed-off-by: Andre Noll po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 00502b2bedad43f0cc167ac17ae0608837ee196b Author: Andre Noll Date: 2014-10-14 17:30:29 +0200 l10n: de.po: Update German translation Signed-off-by: Andre Noll po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 281 insertions(+), 250 deletions(-) commit 706b0496753fb609e69f1570ec603f11162189d1 Author: Andre Noll Date: 2014-10-14 17:30:28 +0200 l10n: de.po: Fix typo: Schießen -> Schließen. That's a funny one since "schießen" means to shoot :) Signed-off-by: Andre Noll po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4 Author: Lasse Collin Date: 2014-10-09 19:42:26 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 076258cc458f1e705041ac7a729b15ffe8c5214a Author: Lasse Collin Date: 2014-10-09 19:41:51 +0300 Add support for AmigaOS/AROS to tuklib_physmem(). Thanks to Fredrik Wikstrom. m4/tuklib_physmem.m4 | 3 ++- src/common/tuklib_physmem.c | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) commit efa7b0a210e1baa8e128fc98c5443a944c39ad24 Author: Lasse Collin Date: 2014-10-09 18:42:14 +0300 xzgrep: Avoid passing both -q and -l to grep. The behavior of grep -ql varies: - GNU grep behaves like grep -q. - OpenBSD grep behaves like grep -l. POSIX doesn't make it 100 % clear what behavior is expected. Anyway, using both -q and -l at the same time makes no sense so both options simply should never be used at the same time. Thanks to Christian Weisgerber. src/scripts/xzgrep.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538 Author: Trần Ngọc Quân Date: 2014-09-25 09:22:45 +0700 l10n: vi.po: Update Vietnamese translation Signed-off-by: Trần Ngọc Quân po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 84 insertions(+), 52 deletions(-) commit c4911f2db36d811896c73c008b4218d8fa9a4730 Author: Lasse Collin Date: 2014-09-25 18:38:48 +0300 Build: Detect supported compiler warning flags better. Clang and nowadays also GCC accept any -Wfoobar option but then may give a warning that an unknown warning option was specified. To avoid adding unsupported warning options, the options are now tested with -Werror. Thanks to Charles Diza. configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 76e75522ed6f5c228d55587dee5a997893f6e474 Author: Lasse Collin Date: 2014-09-20 21:01:21 +0300 Update NEWS for 5.0.7. NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) commit d62028b4c1174fc67b6929f126f5eb24c018c700 Author: Lasse Collin Date: 2014-09-20 19:42:56 +0300 liblzma: Fix a portability problem in Makefile.am. POSIX supports $< only in inference rules (suffix rules). Using it elsewhere is a GNU make extension and doesn't work e.g. with OpenBSD make. Thanks to Christian Weisgerber for the patch. src/liblzma/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit c35de31d4283edad3e57d37ffe939406542cb7bb Author: Lasse Collin Date: 2014-09-14 21:54:09 +0300 Bump the version number to 5.1.4beta. src/liblzma/api/lzma/version.h | 4 ++-- src/liblzma/liblzma.map | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit e9e097e22cacdaa23e5414fea7913535449cb340 Author: Lasse Collin Date: 2014-09-14 21:50:13 +0300 Update NEWS for 5.0.6 and 5.1.4beta. NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) commit 642f856bb8562ab66704b1e01ac7bc08b6d0a663 Author: Lasse Collin Date: 2014-09-14 21:02:41 +0300 Update TODO. TODO | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) commit 6b5e3b9eff5b8cedb2aac5f524d4d60fc8a48124 Author: Lasse Collin Date: 2014-08-05 22:32:36 +0300 xz: Add --ignore-check. src/xz/args.c | 7 +++++++ src/xz/args.h | 1 + src/xz/coder.c | 10 +++++++++- src/xz/message.c | 2 ++ src/xz/xz.1 | 19 +++++++++++++++++++ 5 files changed, 38 insertions(+), 1 deletion(-) commit 9adbc2ff373f979c917cdfd3679ce0ebd59f1040 Author: Lasse Collin Date: 2014-08-05 22:15:07 +0300 liblzma: Add support for LZMA_IGNORE_CHECK. src/liblzma/api/lzma/container.h | 24 ++++++++++++++++++++++++ src/liblzma/common/common.h | 1 + src/liblzma/common/stream_decoder.c | 14 ++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) commit 0e0f34b8e4f1c60ecaec15c2105982381cc9c3e6 Author: Lasse Collin Date: 2014-08-05 22:03:30 +0300 liblzma: Add support for lzma_block.ignore_check. Note that this slightly changes how lzma_block_header_decode() has been documented. Earlier it said that the .version is set to the lowest required value, but now it says that the .version field is kept unchanged if possible. In practice this doesn't affect any old code, because before this commit the only possible .version was 0. src/liblzma/api/lzma/block.h | 50 ++++++++++++++++++++++++------- src/liblzma/common/block_buffer_encoder.c | 2 +- src/liblzma/common/block_decoder.c | 18 ++++++++--- src/liblzma/common/block_encoder.c | 2 +- src/liblzma/common/block_header_decoder.c | 12 ++++++-- src/liblzma/common/block_header_encoder.c | 2 +- src/liblzma/common/block_util.c | 2 +- 7 files changed, 68 insertions(+), 20 deletions(-) commit 71e1437ab585b46f7a25f5a131557d3d1c0cbaa2 Author: Lasse Collin Date: 2014-08-04 19:25:58 +0300 liblzma: Use lzma_memcmplen() in the BT3 match finder. I had missed this when writing the commit 5db75054e900fa06ef5ade5f2c21dffdd5d16141. Thanks to Jun I Jin. src/liblzma/lz/lz_encoder_mf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) commit 41dc9ea06e1414ebe8ef52afc8fc15b6e3282b04 Author: Lasse Collin Date: 2014-08-04 00:25:44 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 5dcffdbcc23a68abc3ac3539b30be71bc9b5af84 Author: Lasse Collin Date: 2014-08-03 21:32:25 +0300 liblzma: SHA-256: Optimize the Maj macro slightly. The Maj macro is used where multiple things are added together, so making Maj a sum of two expressions allows some extra freedom for the compiler to schedule the instructions. I learned this trick from . src/liblzma/check/sha256.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit a9477d1e0c6fd0e47e637d051e7b9e2a5d9af517 Author: Lasse Collin Date: 2014-08-03 21:08:12 +0300 liblzma: SHA-256: Optimize the way rotations are done. This looks weird because the rotations become sequential, but it helps quite a bit on both 32-bit and 64-bit x86: - It requires fewer instructions on two-operand instruction sets like x86. - It requires one register less which matters especially on 32-bit x86. I hope this doesn't hurt other archs. I didn't invent this idea myself, but I don't remember where I saw it first. src/liblzma/check/sha256.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) commit 5a76c7c8ee9a0afbeedb1c211db9224260404347 Author: Lasse Collin Date: 2014-08-03 20:38:13 +0300 liblzma: SHA-256: Remove the GCC #pragma that became unneeded. The unrolling in the previous commit should avoid the situation where a compiler may think that an uninitialized variable might be accessed. src/liblzma/check/sha256.c | 5 ----- 1 file changed, 5 deletions(-) commit 9a096f8e57509775c331950b8351bbca77bdcfa8 Author: Lasse Collin Date: 2014-08-03 20:33:38 +0300 liblzma: SHA-256: Unroll a little more. This way a branch isn't needed for each operation to choose between blk0 and blk2, and still the code doesn't grow as much as it would with full unrolling. src/liblzma/check/sha256.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) commit bc7650d87bf27f85f1a2a806dc2db1780e09e6a5 Author: Lasse Collin Date: 2014-08-03 19:56:43 +0300 liblzma: SHA-256: Do the byteswapping without a temporary buffer. src/liblzma/check/sha256.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) commit 544aaa3d13554e8640f9caf7db717a96360ec0f6 Author: Lasse Collin Date: 2014-07-25 22:38:28 +0300 liblzma: Use lzma_memcmplen() in normal mode of LZMA. Two locations were not changed yet because the simplest change assumes that the initial "len" may be greater than "limit". src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) commit f48fce093b07aeda95c18850f5e086d9f2383380 Author: Lasse Collin Date: 2014-07-25 22:30:38 +0300 liblzma: Simplify LZMA fast mode code by using memcmp(). src/liblzma/lzma/lzma_encoder_optimum_fast.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) commit 6bf5308e34e23dede5b301b1b9b4f131dacd9218 Author: Lasse Collin Date: 2014-07-25 22:29:49 +0300 liblzma: Use lzma_memcmplen() in fast mode of LZMA. src/liblzma/lzma/lzma_encoder_optimum_fast.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 353212137e51e45b105a3a3fc2e6879f1cf0d492 Author: Lasse Collin Date: 2014-07-25 21:16:23 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 5db75054e900fa06ef5ade5f2c21dffdd5d16141 Author: Lasse Collin Date: 2014-07-25 21:15:07 +0300 liblzma: Use lzma_memcmplen() in the match finders. This doesn't change the match finder output. src/liblzma/lz/lz_encoder.c | 13 ++++++++++++- src/liblzma/lz/lz_encoder_mf.c | 33 +++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) commit e1c8f1d01f4a4e2136173edab2dc63c71ef038f4 Author: Lasse Collin Date: 2014-07-25 20:57:20 +0300 liblzma: Add lzma_memcmplen() for fast memory comparison. This commit just adds the function. Its uses will be in separate commits. This hasn't been tested much yet and it's perhaps a bit early to commit it but if there are bugs they should get found quite quickly. Thanks to Jun I Jin from Intel for help and for pointing out that string comparison needs to be optimized in liblzma. configure.ac | 13 +++ src/liblzma/common/Makefile.inc | 1 + src/liblzma/common/memcmplen.h | 170 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+) commit 765735cf52e5123586e74a51b9c073b5257f631f Author: Lasse Collin Date: 2014-07-12 21:10:09 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 59da01785ef66c7e62f36e70ca808fd2824bb995 Author: Lasse Collin Date: 2014-07-12 20:06:08 +0300 Translations: Add Vietnamese translation. Thanks to Trần Ngọc Quân. po/LINGUAS | 1 + po/vi.po | 1007 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1008 insertions(+) commit 17215f751c354852700e7f8592ccf319570a0721 Author: Lasse Collin Date: 2014-06-29 20:54:14 +0300 xz: Update the help message of a few options. Updated: --threads, --block-size, and --block-list Added: --flush-timeout src/xz/message.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) commit 96864a6ddf91ad693d102ea165f3d7918744d582 Author: Lasse Collin Date: 2014-06-18 22:07:06 +0300 xz: Use lzma_cputhreads() instead of own copy of tuklib_cpucores(). src/xz/Makefile.am | 1 - src/xz/hardware.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) commit a115cc3748482e277f42a968baa3cd266f031dba Author: Lasse Collin Date: 2014-06-18 22:04:24 +0300 liblzma: Add lzma_cputhreads(). src/liblzma/Makefile.am | 8 +++++++- src/liblzma/api/lzma/hardware.h | 14 ++++++++++++++ src/liblzma/common/Makefile.inc | 1 + src/liblzma/common/hardware_cputhreads.c | 22 ++++++++++++++++++++++ src/liblzma/liblzma.map | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) commit 3ce3e7976904fbab4e6482bafa442856f77a51fa Author: Lasse Collin Date: 2014-06-18 19:11:52 +0300 xz: Check for filter chain compatibility for --flush-timeout. This avoids LZMA_PROG_ERROR from lzma_code() with filter chains that don't support LZMA_SYNC_FLUSH. src/xz/coder.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) commit 381ac14ed79e5d38809f251705be8b3193bba417 Author: Lasse Collin Date: 2014-06-13 19:21:54 +0300 xzgrep: List xzgrep_expected_output in tests/Makefile.am. tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 4244b65b06d5ecaf6f9dd0387ac7e3166bd2364e Author: Lasse Collin Date: 2014-06-13 18:58:22 +0300 xzgrep: Improve the test script. Now it should be close to the functionality of the original version by Pavel Raiskup. tests/Makefile.am | 3 ++- tests/test_scripts.sh | 24 ++++++++++++++---------- tests/xzgrep_expected_output | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 11 deletions(-) commit 1e60f2c0a0ee6c18b02943ce56214799a70aac26 Author: Lasse Collin Date: 2014-06-11 21:03:25 +0300 xzgrep: Add a test for the previous fix. This is a simplified version of Pavel Raiskup's original patch. tests/test_scripts.sh | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) commit ceca37901783988204caaf40dff4623d535cc789 Author: Lasse Collin Date: 2014-06-11 20:43:28 +0300 xzgrep: exit 0 when at least one file matches. Mimic the original grep behavior and return exit_success when at least one xz compressed file matches given pattern. Original bugreport: https://bugzilla.redhat.com/show_bug.cgi?id=1108085 Thanks to Pavel Raiskup for the patch. src/scripts/xzgrep.in | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 8c19216baccb92d011694590df8a1262da2e980c Author: Lasse Collin Date: 2014-06-09 21:21:24 +0300 xz: Force single-threaded mode when --flush-timeout is used. src/xz/coder.c | 11 +++++++++++ 1 file changed, 11 insertions(+) commit 87f1a24810805187d7bbc8ac5512e7eec307ddf5 Author: Lasse Collin Date: 2014-05-25 22:05:39 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit da1718f266fcfc091e7bf08aae1bc986d0e6cc6b Author: Lasse Collin Date: 2014-05-25 21:45:56 +0300 liblzma: Use lzma_alloc_zero() in LZ encoder initialization. This avoids a memzero() call for a newly-allocated memory, which can be expensive when encoding small streams with an over-sized dictionary. To avoid using lzma_alloc_zero() for memory that doesn't need to be zeroed, lzma_mf.son is now allocated separately, which requires handling it separately in normalize() too. Thanks to Vincenzo Innocente for reporting the problem. src/liblzma/lz/lz_encoder.c | 84 ++++++++++++++++++++++-------------------- src/liblzma/lz/lz_encoder.h | 2 +- src/liblzma/lz/lz_encoder_mf.c | 31 +++++++++------- 3 files changed, 62 insertions(+), 55 deletions(-) commit 28af24e9cf2eb259997c85dce13d4c97b3daa47a Author: Lasse Collin Date: 2014-05-25 19:25:57 +0300 liblzma: Add the internal function lzma_alloc_zero(). src/liblzma/common/common.c | 21 +++++++++++++++++++++ src/liblzma/common/common.h | 6 ++++++ 2 files changed, 27 insertions(+) commit ed9ac85822c490e34b68c259afa0b385d21d1c40 Author: Lasse Collin Date: 2014-05-08 18:03:09 +0300 xz: Fix uint64_t vs. size_t which broke 32-bit build. Thanks to Christian Hesse. src/xz/coder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit d716acdae3fa7996f9e68a7bac012e6d8d13dd02 Author: Lasse Collin Date: 2014-05-04 11:09:11 +0300 Docs: Update comments to refer to lzma/lzma12.h in example programs. doc/examples/03_compress_custom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 4d5b7b3fda31241ca86ed35e08e73f776ee916e0 Author: Lasse Collin Date: 2014-05-04 11:07:17 +0300 liblzma: Rename the private API header lzma/lzma.h to lzma/lzma12.h. It can be confusing that two header files have the same name. The public API file is still lzma.h. src/liblzma/api/Makefile.am | 2 +- src/liblzma/api/lzma.h | 2 +- src/liblzma/api/lzma/{lzma.h => lzma12.h} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 1555a9c5664afc7893a2b75e9970105437f01ef1 Author: Lasse Collin Date: 2014-04-25 17:53:42 +0300 Build: Fix the combination of --disable-xzdec --enable-lzmadec. In this case "make install" could fail if the man page directory didn't already exist at the destination. If it did exist, a dangling symlink was created there. Now the link is omitted instead. This isn't the best fix but it's better than the old behavior. src/xzdec/Makefile.am | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 56056571df3377eaa6ae6233b3ccc5d72e81d43d Author: Lasse Collin Date: 2014-04-25 17:44:26 +0300 Build: Add --disable-doc to configure. INSTALL | 6 ++++++ Makefile.am | 2 ++ configure.ac | 6 ++++++ 3 files changed, 14 insertions(+) commit 6de61d8721097a6214810841aa85b08e303ac538 Author: Lasse Collin Date: 2014-04-24 18:06:24 +0300 Update INSTALL. Add a note about failing "make check". The source of the problem should be fixed in libtool (if it really is a libtool bug and not mine) but I'm unable to spend time on that for now. Thanks to Nelson H. F. Beebe for reporting the issue. Add a note about a possible need to run "ldconfig" after "make install". INSTALL | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) commit 54df428799a8d853639b753d0e6784694d73eb3e Author: Lasse Collin Date: 2014-04-09 17:26:10 +0300 xz: Rename a variable to avoid a namespace collision on Solaris. I don't know the details but I have an impression that there's no problem in practice if using GCC since people have built xz with GCC (without patching xz), but renaming the variable cannot hurt either. Thanks to Mark Ashley. src/xz/signals.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) commit 5876ca27daa1429676b1160007d9688266907f00 Author: Lasse Collin Date: 2014-01-29 20:19:41 +0200 Docs: Add example program for threaded encoding. I didn't add -DLZMA_UNSTABLE to Makefile so one has to specify it manually as long as LZMA_UNSTABLE is needed. doc/examples/04_compress_easy_mt.c | 184 +++++++++++++++++++++++++++++++++++++ doc/examples/Makefile | 3 +- 2 files changed, 186 insertions(+), 1 deletion(-) commit 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e Author: Lasse Collin Date: 2014-01-29 20:13:51 +0200 liblzma: Fix lzma_mt.preset not working with lzma_stream_encoder_mt(). It read the filter chain from a wrong variable. src/liblzma/common/stream_encoder_mt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 673a4cb53de3a715685cb1b836da57a3c7dcd43c Author: Lasse Collin Date: 2014-01-20 11:20:40 +0200 liblzma: Fix typo in a comment. src/liblzma/api/lzma/block.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ad96a871a1470eb76d6233d3890ce9338047b7a3 Author: Lasse Collin Date: 2014-01-12 19:38:43 +0200 Windows: Add config.h for building liblzma with MSVC 2013. This is for building liblzma. Building xz tool too requires a little more work. Maybe it will be supported, but for most MSVC users it's enough to be able to build liblzma. C99 support in MSVC 2013 is almost usable which is a big improvement over earlier versions. It's "almost" because there's a dumb bug that breaks mixed declarations after an "if" statements unless the "if" statement uses braces: https://connect.microsoft.com/VisualStudio/feedback/details/808650/visual-studio-2013-c99-compiler-bug https://connect.microsoft.com/VisualStudio/feedback/details/808472/c99-support-of-mixed-declarations-and-statements-fails-with-certain-types-and-constructs Hopefully it will get fixed. Then liblzma should be compilable with MSVC 2013 without patching. windows/config.h | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) commit 3d5c090872fab4212b57c290e8ed4d02c78c1737 Author: Lasse Collin Date: 2014-01-12 17:41:14 +0200 xz: Fix a comment. src/xz/coder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 69fd4e1c932c7975476a0143c86e45d81b60d3f9 Author: Lasse Collin Date: 2014-01-12 17:04:33 +0200 Windows: Add MSVC defines for inline and restrict keywords. src/common/sysdefs.h | 10 ++++++++++ 1 file changed, 10 insertions(+) commit a19d9e8575ee6647cd9154cf1f20203f1330485f Author: Lasse Collin Date: 2014-01-12 16:44:52 +0200 liblzma: Avoid C99 compound literal arrays. MSVC 2013 doesn't like them. Maybe they aren't so good for readability either since many aren't used to them. src/liblzma/lzma/lzma_encoder_presets.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit e28528f1c867b2ed4ac91195ad08efb9bb8a6263 Author: Lasse Collin Date: 2014-01-12 12:50:30 +0200 liblzma: Remove a useless C99ism from sha256.c. Unsurprisingly it makes no difference in compiled output. src/liblzma/check/sha256.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ad1effc45adfb7dabc9a98e79736077e6b7e2d5 Author: Lasse Collin Date: 2014-01-12 12:17:08 +0200 xz: Fix use of wrong variable. Since the only call to suffix_set() uses optarg as the argument, fixing this bug doesn't change the behavior of the program. src/xz/suffix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e62c68d75b5a3fdd46dbb34bb335d73289860d5 Author: Lasse Collin Date: 2014-01-12 12:11:36 +0200 Fix typos in comments. src/common/mythread.h | 2 +- src/liblzma/check/crc32_fast.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit e90ea601fb72867ec04adf456cbe4bf9520fd412 Author: Lasse Collin Date: 2013-11-26 18:20:16 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit b22e94d8d15764416354e04729382a7371ae2c30 Author: Lasse Collin Date: 2013-11-26 18:20:09 +0200 liblzma: Document the need for block->check for lzma_block_header_decode(). Thanks to Tomer Chachamu. src/liblzma/api/lzma/block.h | 3 +++ 1 file changed, 3 insertions(+) commit d1cd8b1cb824b72421d1ee370e628024d2fcbec4 Author: Lasse Collin Date: 2013-11-12 16:38:57 +0200 xz: Update the man page about --block-size and --block-list. src/xz/xz.1 | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) commit 76be7c612e6bcc38724488ccc3b8bcb1cfec9f0a Author: Lasse Collin Date: 2013-11-12 16:30:53 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit dd750acbe2259d75444ef0f8da2d4bacc90d7afc Author: Lasse Collin Date: 2013-11-12 16:29:48 +0200 xz: Make --block-list and --block-size work together in single-threaded. Previously, --block-list and --block-size only worked together in threaded mode. Boundaries are specified by --block-list, but --block-size specifies the maximum size for a Block. Now this works in single-threaded mode too. Thanks to James M Leddy for the original patch. src/xz/coder.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 15 deletions(-) commit ae222fe9805d0161d022d75ba8485dab8bf6d7d5 Author: Lasse Collin Date: 2013-10-26 13:26:14 +0300 Bump the version number to 5.1.3alpha. src/liblzma/api/lzma/version.h | 2 +- src/liblzma/liblzma.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 2193837a6a597cd3bf4e9ddf49421a5697d8e155 Author: Lasse Collin Date: 2013-10-26 13:25:02 +0300 Update NEWS for 5.1.3alpha. NEWS | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) commit ed48e75e2763876173aef8902da407a8eb28854b Author: Lasse Collin Date: 2013-10-26 12:47:04 +0300 Update TODO. TODO | 4 ---- 1 file changed, 4 deletions(-) commit 841da0352d79a56a44796a4c39163429c9f039a3 Author: Lasse Collin Date: 2013-10-25 22:41:28 +0300 xz: Document behavior of --block-list with threads. This needs to be updated before 5.2.0. src/xz/xz.1 | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) commit 56feb8665b78c1032aabd53c619c62af51defe64 Author: Lasse Collin Date: 2013-10-22 20:03:12 +0300 xz: Document --flush-timeout=TIMEOUT on the man page. src/xz/xz.1 | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) commit ba413da1d5bb3324287cf3174922acd921165971 Author: Lasse Collin Date: 2013-10-22 19:51:55 +0300 xz: Take advantage of LZMA_FULL_BARRIER with --block-list. Now if --block-list is used in threaded mode, the encoder won't need to flush at each Block boundary specified via --block-list. This improves performance a lot, making threading helpful with --block-list. The flush timer was reset after LZMA_FULL_FLUSH but since LZMA_FULL_BARRIER doesn't flush, resetting the timer is no longer done. src/xz/coder.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) commit 0cd45fc2bc5537de287a0bc005e2d67467a92148 Author: Lasse Collin Date: 2013-10-02 20:05:23 +0300 liblzma: Support LZMA_FULL_FLUSH and _BARRIER in threaded encoder. Now --block-list=SIZES works with in the threaded mode too, although the performance is still bad due to the use of LZMA_FULL_FLUSH instead of the new LZMA_FULL_BARRIER. src/liblzma/common/stream_encoder_mt.c | 55 ++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 16 deletions(-) commit 97bb38712f414fabecca908af2e38a12570293fd Author: Lasse Collin Date: 2013-10-02 12:55:11 +0300 liblzma: Add LZMA_FULL_BARRIER support to single-threaded encoder. In the single-threaded encoder LZMA_FULL_BARRIER is simply an alias for LZMA_FULL_FLUSH. src/liblzma/api/lzma/base.h | 37 ++++++++++++++++++++++++++++++------- src/liblzma/common/common.c | 17 +++++++++++++++-- src/liblzma/common/common.h | 7 ++++++- src/liblzma/common/stream_encoder.c | 4 +++- 4 files changed, 54 insertions(+), 11 deletions(-) commit fef0c6b410c08e581c9178700a4e7599f0895ff9 Author: Lasse Collin Date: 2013-09-17 11:57:51 +0300 liblzma: Add block_buffer_encoder.h into Makefile.inc. This should have been in b465da5988dd59ad98fda10c2e4ea13d0b9c73bc. src/liblzma/common/Makefile.inc | 1 + 1 file changed, 1 insertion(+) commit 8083e03291b6d21c0f538163e187b4e8cd5594e4 Author: Lasse Collin Date: 2013-09-17 11:55:38 +0300 xz: Add a missing test for TUKLIB_DOSLIKE. src/xz/file_io.c | 2 ++ 1 file changed, 2 insertions(+) commit 6b44b4a775fe29ecc7bcb7996e086e3bc09e5fd0 Author: Lasse Collin Date: 2013-09-17 11:52:28 +0300 Add native threading support on Windows. Now liblzma only uses "mythread" functions and types which are defined in mythread.h matching the desired threading method. Before Windows Vista, there is no direct equivalent to pthread condition variables. Since this package doesn't use pthread_cond_broadcast(), pre-Vista threading can still be kept quite simple. The pre-Vista code doesn't use anything that wasn't already available in Windows 95, so the binaries should run even on Windows 95 if someone happens to care. INSTALL | 41 ++- configure.ac | 118 ++++++-- src/common/mythread.h | 513 ++++++++++++++++++++++++++------- src/liblzma/common/stream_encoder_mt.c | 83 +++--- src/xz/coder.c | 8 +- windows/README-Windows.txt | 2 +- windows/build.bash | 23 +- 7 files changed, 573 insertions(+), 215 deletions(-) commit ae0ab74a88d5b9b15845f1d9a24ade4349a54f9f Author: Lasse Collin Date: 2013-09-11 14:40:35 +0300 Build: Remove a comment about Automake 1.10 from configure.ac. The previous commit supports silent rules and that requires Automake 1.11. configure.ac | 2 -- 1 file changed, 2 deletions(-) commit 72975df6c8c59aaf849138ab3606e8fb6970596a Author: Lasse Collin Date: 2013-09-09 20:37:03 +0300 Build: Create liblzma.pc in a src/liblzma/Makefile.am. Previously it was done in configure, but doing that goes against the Autoconf manual. Autoconf requires that it is possible to override e.g. prefix after running configure and that doesn't work correctly if liblzma.pc is created by configure. A potential downside of this change is that now e.g. libdir in liblzma.pc is a standalone string instead of being defined via ${prefix}, so if one overrides prefix when running pkg-config the libdir won't get the new value. I don't know if this matters in practice. Thanks to Vincent Torri. configure.ac | 1 - src/liblzma/Makefile.am | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) commit 1c2b6e7e8382ed390f53e140f160488bb2205ecc Author: Lasse Collin Date: 2013-08-04 15:24:09 +0300 Fix the previous commit which broke the build. Apparently I didn't even compile-test the previous commit. Thanks to Christian Hesse. src/common/tuklib_cpucores.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 124eb69c7857f618b4807588c51bc9ba21bf8691 Author: Lasse Collin Date: 2013-08-03 13:52:58 +0300 Windows: Add Windows support to tuklib_cpucores(). It is used for Cygwin too. I'm not sure if that is a good or bad idea. Thanks to Vincent Torri. m4/tuklib_cpucores.m4 | 19 +++++++++++++++++-- src/common/tuklib_cpucores.c | 13 ++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) commit eada8a875ce3fd521cb42e4ace2624d3d49c5f35 Author: Anders F Bjorklund Date: 2013-08-02 15:59:46 +0200 macosx: separate liblzma package macosx/build.sh | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) commit be0100d01ca6a75899d051bee00acf17e6dc0c15 Author: Anders F Bjorklund Date: 2013-08-02 15:58:44 +0200 macosx: set minimum to leopard macosx/build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) commit 416729e2d743f4b2fe9fd438eedeb98adce033c3 Author: Anders F Bjorklund Date: 2011-08-07 13:13:30 +0200 move configurables into variables macosx/build.sh | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) commit 16581080e5f29f9a4e49efece21c5bf572323acc Author: Lasse Collin Date: 2013-07-15 14:08:41 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 3e2b198ba37b624efd9c7caee2a435dc986b46c6 Author: Lasse Collin Date: 2013-07-15 14:08:02 +0300 Build: Fix the detection of missing CRC32. Thanks to Vincent Torri. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit dee6ad3d5915422bc30a6821efeacaeb8ca8ef00 Author: Lasse Collin Date: 2013-07-04 14:18:46 +0300 xz: Add preliminary support for --flush-timeout=TIMEOUT. When --flush-timeout=TIMEOUT is used, xz will use LZMA_SYNC_FLUSH if read() would block and at least TIMEOUT milliseconds has elapsed since the previous flush. This can be useful in realtime-like use cases where the data is simultanously decompressed by another process (possibly on a different computer). If new uncompressed input data is produced slowly, without this option xz could buffer the data for a long time until it would become decompressible from the output. If TIMEOUT is 0, the feature is disabled. This is the default. This commit affects the compression side. Using xz for the decompression side for the above purpose doesn't work yet so well because there is quite a bit of input and output buffering when decompressing. The --long-help or man page were not updated yet. The details of this feature may change. src/xz/args.c | 7 +++++++ src/xz/coder.c | 46 +++++++++++++++++++++++++++++++++++----------- src/xz/file_io.c | 46 ++++++++++++++++++++++++++++++++++++---------- 3 files changed, 78 insertions(+), 21 deletions(-) commit fa381acaf9a29a8114e1c0a97de99bab9adb014e Author: Lasse Collin Date: 2013-07-04 13:41:03 +0300 xz: Don't set src_eof=true after an I/O error because it's useless. src/xz/file_io.c | 3 --- 1 file changed, 3 deletions(-) commit ea00545beace5b950f709ec21e46878e0f448678 Author: Lasse Collin Date: 2013-07-04 13:25:11 +0300 xz: Fix the test when to read more input. Testing for end of file was no longer correct after full flushing became possible with --block-size=SIZE and --block-list=SIZES. There was no bug in practice though because xz just made a few unneeded zero-byte reads. src/xz/coder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit 736903c64bef394c06685d79908e397bcb08b88f Author: Lasse Collin Date: 2013-07-04 12:51:57 +0300 xz: Move some of the timing code into mytime.[hc]. This switches units from microseconds to milliseconds. New clock_gettime(CLOCK_MONOTONIC) will be used if available. There is still a fallback to gettimeofday(). src/xz/Makefile.am | 2 ++ src/xz/coder.c | 5 +++ src/xz/message.c | 54 +++++++++------------------------ src/xz/mytime.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/xz/mytime.h | 47 ++++++++++++++++++++++++++++ src/xz/private.h | 1 + 6 files changed, 158 insertions(+), 40 deletions(-) commit 24edf8d807e24ffaa1e793114d94cca3b970027d Author: Lasse Collin Date: 2013-07-01 14:35:03 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit c0627b3fceacfa1ed162f5f55235360ea26f569a Author: Lasse Collin Date: 2013-07-01 14:34:11 +0300 xz: Silence a warning seen with _FORTIFY_SOURCE=2. Thanks to Christian Hesse. src/xz/file_io.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit 1936718bb38ee394bd89836fdd4eabc0beb02443 Author: Lasse Collin Date: 2013-06-30 19:40:11 +0300 Update NEWS for 5.0.5. NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) commit a37ae8b5eb6093a530198f109c6f7a538c80ecf0 Author: Lasse Collin Date: 2013-06-30 18:02:27 +0300 Man pages: Use similar syntax for synopsis as in xz. The man pages of lzmainfo, xzmore, and xzdec had similar constructs as the man page of xz had before the commit eb6ca9854b8eb9fbf72497c1cf608d6b19d2d494. Eric S. Raymond didn't mention these man pages in his bug report, but it's nice to be consistent. src/lzmainfo/lzmainfo.1 | 4 ++-- src/scripts/xzmore.1 | 6 +++--- src/xzdec/xzdec.1 | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) commit cdba9ddd870ae72fd6219a125662c20ec997f86c Author: Lasse Collin Date: 2013-06-29 15:59:13 +0300 xz: Use non-blocking I/O for the output file. Now both reading and writing should be without race conditions with signals. They might still be signal handling issues left. Signals are blocked during many operations to avoid EINTR but it may cause problems e.g. if writing to stderr blocks when trying to display an error message. src/xz/file_io.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 8 deletions(-) commit e61a5c95da3fe31281d959e5e842885a8ba2b5bd Author: Lasse Collin Date: 2013-06-28 23:56:17 +0300 xz: Fix return value type in io_write_buf(). It didn't affect the behavior of the code since -1 becomes true anyway. src/xz/file_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 9dc319eabb34a826f4945f91c71620f14a60e9e2 Author: Lasse Collin Date: 2013-06-28 23:48:05 +0300 xz: Use the self-pipe trick to avoid a race condition with signals. It is possible that a signal to set user_abort arrives right before a blocking system call is made. In this case the call may block until another signal arrives, while the wanted behavior is to make xz clean up and exit as soon as possible. After this commit, the race condition is avoided with the input side which already uses non-blocking I/O. The output side still uses blocking I/O and thus has the race condition. src/xz/file_io.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ src/xz/file_io.h | 8 ++++++++ src/xz/signals.c | 5 +++++ 3 files changed, 57 insertions(+), 12 deletions(-) commit 3541bc79d0cfabc0ad155c99bfdad1289f17fec3 Author: Lasse Collin Date: 2013-06-28 22:51:02 +0300 xz: Use non-blocking I/O for the input file. src/xz/file_io.c | 156 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 111 insertions(+), 45 deletions(-) commit 78673a08bed5066c81e8a8e90d20e670c28ecfd5 Author: Lasse Collin Date: 2013-06-28 18:46:13 +0300 xz: Remove an outdated NetBSD-specific comment. Nowadays errno == EFTYPE is documented in open(2). src/xz/file_io.c | 4 ---- 1 file changed, 4 deletions(-) commit a616fdad34b48b2932ef03fb87309dcc8b829527 Author: Lasse Collin Date: 2013-06-28 18:09:47 +0300 xz: Fix error detection of fcntl(fd, F_SETFL, flags) calls. POSIX says that fcntl(fd, F_SETFL, flags) returns -1 on error and "other than -1" on success. This is how it is documented e.g. on OpenBSD too. On Linux, success with F_SETFL is always 0 (at least accorinding to fcntl(2) from man-pages 3.51). src/xz/file_io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 4a08a6e4c61c65ab763ab314100a6d7a3bb89298 Author: Lasse Collin Date: 2013-06-28 17:36:47 +0300 xz: Fix use of wrong variable in a fcntl() call. Due to a wrong variable name, when writing a sparse file to standard output, *all* file status flags were cleared (to the extent the operating system allowed it) instead of only clearing the O_APPEND flag. In practice this worked fine in the common situations on GNU/Linux, but I didn't check how it behaved elsewhere. The original flags were still restored correctly. I still changed the code to use a separate boolean variable to indicate when the flags should be restored instead of relying on a special value in stdout_flags. src/xz/file_io.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) commit b790b435daa3351067f80a5973b647f8d55367a2 Author: Lasse Collin Date: 2013-06-28 14:55:37 +0300 xz: Fix assertion related to posix_fadvise(). Input file can be a FIFO or something else that doesn't support posix_fadvise() so don't check the return value even with an assertion. Nothing bad happens if the call to posix_fadvise() fails. src/xz/file_io.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) commit 84d2da6c9dc252f441deb7626c2522202b005d4d Author: Lasse Collin Date: 2013-06-26 13:30:57 +0300 xz: Check the value of lzma_stream_flags.version in --list. It is a no-op for now, but if an old xz version is used together with a newer liblzma that supports something new, then this check becomes important and will stop the old xz from trying to parse files that it won't understand. src/xz/list.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 9376f5f8f762296f2173d61af9101112c36f38c0 Author: Lasse Collin Date: 2013-06-26 12:17:00 +0300 Build: Require Automake 1.12 and use serial-tests option. It should actually still work with Automake 1.10 if the serial-tests option is removed. Automake 1.13 started using parallel tests by default and the option to get the old behavior isn't supported before 1.12. At least for now, parallel tests don't improve anything in XZ Utils but they hide the progress output from test_compress.sh. configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit b7e200d7bd0a3c7c171c13ad37d68296d6f73374 Author: Lasse Collin Date: 2013-06-23 18:59:13 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 46540e4c10923e363741ff5aab99e79fc0ce6ee8 Author: Lasse Collin Date: 2013-06-23 18:57:23 +0300 liblzma: Avoid a warning about a shadowed variable. On Mac OS X wait() is declared in that we include one way or other so don't use "wait" as a variable name. Thanks to Christian Kujau. src/liblzma/common/stream_encoder_mt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit ebb501ec73cecc546c67117dd01b5e33c90bfb4a Author: Lasse Collin Date: 2013-06-23 17:36:47 +0300 xz: Validate Uncompressed Size from Block Header in list.c. This affects only "xz -lvv". Normal decompression with xz already detected if Block Header and Index had mismatched Uncompressed Size fields. So this just makes "xz -lvv" show such files as corrupt instead of showing the Uncompressed Size from Index. src/xz/list.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) commit c09e91dd236d3cabee0fc48312b3dc8cceae41ab Author: Lasse Collin Date: 2013-06-21 22:08:11 +0300 Update THANKS. THANKS | 2 ++ 1 file changed, 2 insertions(+) commit eb6ca9854b8eb9fbf72497c1cf608d6b19d2d494 Author: Lasse Collin Date: 2013-06-21 22:04:45 +0300 xz: Make the man page more friendly to doclifter. Thanks to Eric S. Raymond. src/xz/xz.1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) commit 0c0a1947e6ad90a0a10b7a5c39f6ab99a0aa5c93 Author: Lasse Collin Date: 2013-06-21 21:54:59 +0300 xz: A couple of man page fixes. Now the interaction of presets and custom filter chains is described correctly. Earlier it contradicted itself. Thanks to DevHC who reported these issues on IRC to me on 2012-12-14. src/xz/xz.1 | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) commit 2fcda89939c903106c429e109083d43d894049e0 Author: Lasse Collin Date: 2013-06-21 21:50:26 +0300 xz: Fix interaction between preset and custom filter chains. There was somewhat illogical behavior when --extreme was specified and mixed with custom filter chains. Before this commit, "xz -9 --lzma2 -e" was equivalent to "xz --lzma2". After it is equivalent to "xz -6e" (all earlier preset options get forgotten when a custom filter chain is specified and the default preset is 6 to which -e is applied). I find this less illogical. This also affects the meaning of "xz -9e --lzma2 -7". Earlier it was equivalent to "xz -7e" (the -e specified before a custom filter chain wasn't forgotten). Now it is "xz -7". Note that "xz -7e" still is the same as "xz -e7". Hopefully very few cared about this in the first place, so pretty much no one should even notice this change. Thanks to Conley Moorhous. src/xz/coder.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) commit 97379c5ea758da3f8b0bc444d5f7fa43753ce610 Author: Lasse Collin Date: 2013-04-27 22:07:46 +0300 Build: Use -Wvla with GCC if supported. Variable-length arrays are mandatory in C99 but optional in C11. The code doesn't currently use any VLAs and it shouldn't in the future either to stay compatible with C11 without requiring any optional C11 features. configure.ac | 1 + 1 file changed, 1 insertion(+) commit 8957c58609d3987c58aa72b96c436cf565cc4917 Author: Lasse Collin Date: 2013-04-15 19:29:09 +0300 xzdec: Improve the --help message. The options are now ordered in the same order as in xz's help message. Descriptions were added to the options that are ignored. I left them in parenthesis even if it looks a bit weird because I find it easier to spot the ignored vs. non-ignored options from the list that way. src/xzdec/xzdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) commit ed886e1a92534a24401d0e99c11f1dcff3b5220a Author: Lasse Collin Date: 2013-04-05 19:25:40 +0300 Update THANKS. THANKS | 2 ++ 1 file changed, 2 insertions(+) commit 5019413a055ce29e660dbbf15e02443cb5a26c59 Author: Jeff Bastian Date: 2013-04-03 13:59:17 +0200 xzgrep: make the '-h' option to be --no-filename equivalent * src/scripts/xzgrep.in: Accept the '-h' option in argument parsing. src/scripts/xzgrep.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 5ea900cb5ad862bca81316729f92357c1fc040ce Author: Lasse Collin Date: 2013-03-23 22:25:15 +0200 liblzma: Be less picky in lzma_alone_decoder(). To avoid false positives when detecting .lzma files, rare values in dictionary size and uncompressed size fields were rejected. They will still be rejected if .lzma files are decoded with lzma_auto_decoder(), but when using lzma_alone_decoder() directly, such files will now be accepted. Hopefully this is an OK compromise. This doesn't affect xz because xz still has its own file format detection code. This does affect lzmadec though. So after this commit lzmadec will accept files that xz or xz-emulating-lzma doesn't. NOTE: lzma_alone_decoder() still won't decode all .lzma files because liblzma's LZMA decoder doesn't support lc + lp > 4. Reported here: http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/7068827 src/liblzma/common/alone_decoder.c | 22 ++++++++++++++-------- src/liblzma/common/alone_decoder.h | 5 +++-- src/liblzma/common/auto_decoder.c | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) commit bb117fffa84604b6e3811b068c80db82bf7f7b05 Author: Lasse Collin Date: 2013-03-23 21:55:13 +0200 liblzma: Use lzma_block_buffer_bound64() in threaded encoder. Now it uses lzma_block_uncomp_encode() if the data doesn't fit into the space calculated by lzma_block_buffer_bound64(). src/liblzma/common/stream_encoder_mt.c | 66 +++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 16 deletions(-) commit e572e123b55b29527e54ce5f0807f115481d78b9 Author: Lasse Collin Date: 2013-03-23 21:51:38 +0200 liblzma: Fix another deadlock in the threaded encoder. This race condition could cause a deadlock if lzma_end() was called before finishing the encoding. This can happen with xz with debugging enabled (non-debugging version doesn't call lzma_end() before exiting). src/liblzma/common/stream_encoder_mt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit b465da5988dd59ad98fda10c2e4ea13d0b9c73bc Author: Lasse Collin Date: 2013-03-23 19:17:33 +0200 liblzma: Add lzma_block_uncomp_encode(). This also adds a new internal function lzma_block_buffer_bound64() which is similar to lzma_block_buffer_bound() but uses uint64_t instead of size_t. src/liblzma/api/lzma/block.h | 18 ++++++ src/liblzma/common/block_buffer_encoder.c | 94 +++++++++++++++++++++---------- src/liblzma/common/block_buffer_encoder.h | 24 ++++++++ src/liblzma/liblzma.map | 1 + 4 files changed, 106 insertions(+), 31 deletions(-) commit 9e6dabcf22ef4679f4faaae15ebd5b137ae2fad1 Author: Lasse Collin Date: 2013-03-05 19:14:50 +0200 Avoid unneeded use of awk in xzless. Use "read" instead of "awk" in xzless to get the version number of "less". The need for awk was introduced in the commit db5c1817fabf7cbb9e4087b1576eb26f0747338e. Thanks to Ariel P for the patch. src/scripts/xzless.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) commit e7b424d267a34803db8d92a3515528be2ed45abd Author: Lasse Collin Date: 2012-12-14 20:13:32 +0200 Make the progress indicator smooth in threaded mode. This adds lzma_get_progress() to liblzma and takes advantage of it in xz. lzma_get_progress() collects progress information from the thread-specific structures so that fairly accurate progress information is available to applications. Adding a new function seemed to be a better way than making the information directly available in lzma_stream (like total_in and total_out are) because collecting the information requires locking mutexes. It's waste of time to do it more often than the up to date information is actually needed by an application. src/liblzma/api/lzma/base.h | 22 +++++++++- src/liblzma/common/common.c | 16 +++++++ src/liblzma/common/common.h | 6 +++ src/liblzma/common/stream_encoder_mt.c | 77 +++++++++++++++++++++++++++++++--- src/liblzma/liblzma.map | 1 + src/xz/message.c | 20 +++++---- 6 files changed, 129 insertions(+), 13 deletions(-) commit 2ebbb994e367f55f2561aa7c9e7451703c171f2f Author: Lasse Collin Date: 2012-12-14 11:01:41 +0200 liblzma: Fix mythread_sync for nested locking. src/common/mythread.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 4c7e28705f6de418d19cc77324ef301f996e01ff Author: Lasse Collin Date: 2012-12-13 21:05:36 +0200 xz: Mention --threads in --help. Thanks to Olivier Delhomme for pointing out that this was still missing. src/xz/message.c | 4 ++++ 1 file changed, 4 insertions(+) commit db5c1817fabf7cbb9e4087b1576eb26f0747338e Author: Jonathan Nieder Date: 2012-11-19 00:10:10 -0800 xzless: Make "less -V" parsing more robust In v4.999.9beta~30 (xzless: Support compressed standard input, 2009-08-09), xzless learned to parse ‘less -V’ output to figure out whether less is new enough to handle $LESSOPEN settings starting with “|-”. That worked well for a while, but the version string from ‘less’ versions 448 (June, 2012) is misparsed, producing a warning: $ xzless /tmp/test.xz; echo $? /usr/bin/xzless: line 49: test: 456 (GNU regular expressions): \ integer expression expected 0 More precisely, modern ‘less’ lists the regexp implementation along with its version number, and xzless passes the entire version number with attached parenthetical phrase as a number to "test $a -gt $b", producing the above confusing message. $ less-444 -V | head -1 less 444 $ less -V | head -1 less 456 (no regular expressions) So relax the pattern matched --- instead of expecting "less ", look for a line of the form "less [ (extra parenthetical)]". While at it, improve the behavior when no matching line is found --- instead of producing a cryptic message, we can fall back on a LESSPIPE setting that is supported by all versions of ‘less’. The implementation uses "awk" for simplicity. Hopefully that’s portable enough. Reported-by: Jörg-Volker Peetz Signed-off-by: Jonathan Nieder src/scripts/xzless.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 65536214a31ecd33b6b03b68a351fb597d3703d6 Author: Lasse Collin Date: 2012-10-03 15:54:24 +0300 xz: Fix the note about --rsyncable on the man page. src/xz/xz.1 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) commit 3d93b6354927247a1569caf22ad27b07e97ee904 Author: Lasse Collin Date: 2012-09-28 20:11:09 +0300 xz: Improve handling of failed realloc in xrealloc. Thanks to Jim Meyering. src/xz/util.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) commit ab225620664e235637833be2329935f9d290ba80 Author: Lasse Collin Date: 2012-08-24 16:27:31 +0300 A few typo fixes to comments and the xz man page. Thanks to Jim Meyering. configure.ac | 2 +- src/liblzma/check/sha256.c | 1 - src/xz/xz.1 | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) commit f3c1ec69d910175ffd431fd82968dd35cec806ed Author: Lasse Collin Date: 2012-08-13 21:40:09 +0300 xz: Add a warning to --help about alpha and beta versions. src/xz/message.c | 5 +++++ 1 file changed, 5 insertions(+) commit d8eaf9d8278c23c2cf2b7ca5562d4de570d3b5db Author: Lasse Collin Date: 2012-08-02 17:13:30 +0300 Build: Bump gettext version requirement to 0.18. Otherwise too old version of m4/lib-link.m4 gets included when autoreconf -fi is run. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 96e08902b09f0f304d4ff80c6e83ef7fff883f34 Author: Lasse Collin Date: 2012-07-17 18:29:08 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 3778db1be53e61ff285c573af5ee468803008456 Author: Lasse Collin Date: 2012-07-17 18:19:59 +0300 liblzma: Make the use of lzma_allocator const-correct. There is a tiny risk of causing breakage: If an application assigns lzma_stream.allocator to a non-const pointer, such code won't compile anymore. I don't know why anyone would do such a thing though, so in practice this shouldn't cause trouble. Thanks to Jan Kratochvil for the patch. src/liblzma/api/lzma/base.h | 4 +++- src/liblzma/api/lzma/block.h | 6 ++--- src/liblzma/api/lzma/container.h | 9 +++++--- src/liblzma/api/lzma/filter.h | 13 ++++++----- src/liblzma/api/lzma/index.h | 16 ++++++------- src/liblzma/api/lzma/index_hash.h | 4 ++-- src/liblzma/common/alone_decoder.c | 6 ++--- src/liblzma/common/alone_decoder.h | 2 +- src/liblzma/common/alone_encoder.c | 8 +++---- src/liblzma/common/auto_decoder.c | 6 ++--- src/liblzma/common/block_buffer_decoder.c | 2 +- src/liblzma/common/block_buffer_encoder.c | 4 ++-- src/liblzma/common/block_decoder.c | 6 ++--- src/liblzma/common/block_decoder.h | 2 +- src/liblzma/common/block_encoder.c | 8 +++---- src/liblzma/common/block_encoder.h | 2 +- src/liblzma/common/block_header_decoder.c | 4 ++-- src/liblzma/common/common.c | 10 ++++----- src/liblzma/common/common.h | 20 +++++++++-------- src/liblzma/common/easy_buffer_encoder.c | 4 ++-- src/liblzma/common/filter_buffer_decoder.c | 3 ++- src/liblzma/common/filter_buffer_encoder.c | 7 +++--- src/liblzma/common/filter_common.c | 4 ++-- src/liblzma/common/filter_common.h | 2 +- src/liblzma/common/filter_decoder.c | 7 +++--- src/liblzma/common/filter_decoder.h | 2 +- src/liblzma/common/filter_encoder.c | 2 +- src/liblzma/common/filter_encoder.h | 2 +- src/liblzma/common/filter_flags_decoder.c | 2 +- src/liblzma/common/index.c | 26 ++++++++++----------- src/liblzma/common/index_decoder.c | 12 +++++----- src/liblzma/common/index_encoder.c | 6 ++--- src/liblzma/common/index_encoder.h | 2 +- src/liblzma/common/index_hash.c | 6 +++-- src/liblzma/common/outqueue.c | 4 ++-- src/liblzma/common/outqueue.h | 5 +++-- src/liblzma/common/stream_buffer_decoder.c | 2 +- src/liblzma/common/stream_buffer_encoder.c | 3 ++- src/liblzma/common/stream_decoder.c | 9 ++++---- src/liblzma/common/stream_decoder.h | 5 +++-- src/liblzma/common/stream_encoder.c | 10 ++++----- src/liblzma/common/stream_encoder_mt.c | 16 ++++++------- src/liblzma/delta/delta_common.c | 4 ++-- src/liblzma/delta/delta_decoder.c | 6 ++--- src/liblzma/delta/delta_decoder.h | 5 +++-- src/liblzma/delta/delta_encoder.c | 6 ++--- src/liblzma/delta/delta_encoder.h | 3 ++- src/liblzma/delta/delta_private.h | 2 +- src/liblzma/lz/lz_decoder.c | 8 +++---- src/liblzma/lz/lz_decoder.h | 7 +++--- src/liblzma/lz/lz_encoder.c | 19 ++++++++-------- src/liblzma/lz/lz_encoder.h | 6 ++--- src/liblzma/lzma/lzma2_decoder.c | 8 +++---- src/liblzma/lzma/lzma2_decoder.h | 5 +++-- src/liblzma/lzma/lzma2_encoder.c | 6 ++--- src/liblzma/lzma/lzma2_encoder.h | 2 +- src/liblzma/lzma/lzma_decoder.c | 8 +++---- src/liblzma/lzma/lzma_decoder.h | 7 +++--- src/liblzma/lzma/lzma_encoder.c | 7 +++--- src/liblzma/lzma/lzma_encoder.h | 5 +++-- src/liblzma/simple/arm.c | 8 ++++--- src/liblzma/simple/armthumb.c | 8 ++++--- src/liblzma/simple/ia64.c | 8 ++++--- src/liblzma/simple/powerpc.c | 8 ++++--- src/liblzma/simple/simple_coder.c | 10 ++++----- src/liblzma/simple/simple_coder.h | 36 ++++++++++++++++++++---------- src/liblzma/simple/simple_decoder.c | 2 +- src/liblzma/simple/simple_decoder.h | 2 +- src/liblzma/simple/simple_private.h | 3 ++- src/liblzma/simple/sparc.c | 8 ++++--- src/liblzma/simple/x86.c | 8 ++++--- 71 files changed, 269 insertions(+), 219 deletions(-) commit d625c7cf824fd3b61c6da84f56179e94917ff603 Author: Lasse Collin Date: 2012-07-05 07:36:28 +0300 Tests: Remove tests/test_block.c that had gotten committed accidentally. tests/test_block.c | 52 ---------------------------------------------------- 1 file changed, 52 deletions(-) commit 0b09d266cce72bc4841933b171e79551e488927c Author: Lasse Collin Date: 2012-07-05 07:33:35 +0300 Build: Include macosx/build.sh in the distribution. It has been in the Git repository since 2010 but probably few people have seen it since it hasn't been included in the release tarballs. :-( Makefile.am | 1 + 1 file changed, 1 insertion(+) commit d6e0b23d4613b9f417893dd96cc168c8005ece3d Author: Lasse Collin Date: 2012-07-05 07:28:53 +0300 Build: Include validate_map.sh in the distribution. It's required by "make mydist". Fix also the location of EXTRA_DIST+= so that those files get distributed also if symbol versioning isn't enabled. src/liblzma/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 19de545d86097c3954d69ab5d12820387f6a09bc Author: Lasse Collin Date: 2012-07-05 07:24:45 +0300 Docs: Fix the name LZMA Utils -> XZ Utils in debug/README. debug/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 672eccf57c31a40dfb956b7662db06d43e18618e Author: Lasse Collin Date: 2012-07-05 07:23:17 +0300 Include debug/translation.bash in the distribution. Also fix the script name mentioned in README. README | 4 ++-- debug/Makefile.am | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) commit cafb523adac1caf305e70a04bc37f25602bf990c Author: Lasse Collin Date: 2012-07-04 22:31:58 +0300 xz: Document --block-list better. Thanks to Jonathan Nieder. src/xz/xz.1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) commit c7ff218528bc8f7c65e7ef73c6515777346c6794 Author: Lasse Collin Date: 2012-07-04 20:01:49 +0300 Bump the version number to 5.1.2alpha. src/liblzma/api/lzma/version.h | 2 +- src/liblzma/liblzma.map | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 8f3c1d886f93e6478ad509ff52102b2ce7faa999 Author: Lasse Collin Date: 2012-07-04 20:01:19 +0300 Update NEWS for 5.1.2alpha. NEWS | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) commit 0d5fa05466e580fbc458820f87013ae7644e20e5 Author: Lasse Collin Date: 2012-07-04 19:58:23 +0300 xz: Fix the version number printed by xz -lvv. The decoder bug was fixed in 5.0.2 instead of 5.0.3. src/xz/list.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit df11317985a4165731dde12bb0f0028da0e7b77f Author: Lasse Collin Date: 2012-07-04 17:11:31 +0300 Build: Add a comment to configure.ac about symbol versioning. configure.ac | 4 ++++ 1 file changed, 4 insertions(+) commit bd9cc179e8be3ef515201d3ed9c7dd79ae88869d Author: Lasse Collin Date: 2012-07-04 17:06:49 +0300 Update TODO. TODO | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 4a238dd9b22f462cac5e199828bf1beb0df05884 Author: Lasse Collin Date: 2012-07-04 17:05:46 +0300 Document --enable-symbol-versions in INSTALL. INSTALL | 5 +++++ 1 file changed, 5 insertions(+) commit 88ccf47205d7f3aa314d358c72ef214f10f68b43 Author: Lasse Collin Date: 2012-07-03 21:16:39 +0300 xz: Add incomplete support for --block-list. It's broken with threads and when also --block-size is used. src/xz/args.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/xz/args.h | 1 + src/xz/coder.c | 48 ++++++++++++++++++++++++++++------ src/xz/coder.h | 4 +++ src/xz/main.c | 1 + src/xz/message.c | 6 +++++ src/xz/xz.1 | 23 +++++++++++++++-- 7 files changed, 151 insertions(+), 10 deletions(-) commit 972179cdcdf5d8949c48ee31737d87d3050b44af Author: Lasse Collin Date: 2012-07-01 18:44:33 +0300 xz: Update the man page about the new field in --robot -lvv. src/xz/xz.1 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) commit 1403707fc64a70976aebe66f8d9a9bd12f73a2c5 Author: Lasse Collin Date: 2012-06-28 10:47:49 +0300 liblzma: Check that the first byte of range encoded data is 0x00. It is just to be more pedantic and thus perhaps catch broken files slightly earlier. src/liblzma/lzma/lzma_decoder.c | 8 ++++++-- src/liblzma/rangecoder/range_decoder.h | 12 +++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) commit eccd8017ffe2c5de473222c4963ec53c62f7fda2 Author: Lasse Collin Date: 2012-06-22 19:00:23 +0300 Update NEWS from 5.0.4. NEWS | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) commit 2e6754eac26a431e8d340c28906f63bcd1e177e8 Author: Lasse Collin Date: 2012-06-22 14:34:03 +0300 xz: Update man page date to match the latest update. src/xz/xz.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b3235a0b1af45d5e1244cbe3191516966c076fa0 Author: Lasse Collin Date: 2012-06-18 21:27:47 +0300 Docs: Language fix to 01_compress_easy.c. Thanks to Jonathan Nieder. doc/examples/01_compress_easy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit f1675f765fe228cb5a5f904f853445a03e33cfe9 Author: Lasse Collin Date: 2012-06-14 20:15:30 +0300 Fix the top-level Makefile.am for the new example programs. Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) commit 3a0c5378abefaf86aa39a62a7c9682bdb21568a1 Author: Lasse Collin Date: 2012-06-14 10:52:33 +0300 Docs: Add new example programs. These have more comments than the old examples and human-readable error messages. More tutorial-like examples are needed but these are a start. doc/examples/00_README.txt | 27 ++++ doc/examples/01_compress_easy.c | 297 ++++++++++++++++++++++++++++++++++++++ doc/examples/02_decompress.c | 287 ++++++++++++++++++++++++++++++++++++ doc/examples/03_compress_custom.c | 193 +++++++++++++++++++++++++ doc/examples/Makefile | 23 +++ 5 files changed, 827 insertions(+) commit 1bd2c2c553e30c4a73cfb82abc6908efd6be6b8d Author: Lasse Collin Date: 2012-06-14 10:33:27 +0300 Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old. It is good to keep these around to so that if someone has copied the decompressor bug from xz_pipe_decomp.c he has an example how to easily fix it. doc/{examples => examples_old}/xz_pipe_comp.c | 0 doc/{examples => examples_old}/xz_pipe_decomp.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) commit 905f0ab5b5ce544d4b68a2ed6077df0f3d021292 Author: Lasse Collin Date: 2012-06-14 10:33:01 +0300 Docs: Fix a bug in xz_pipe_decomp.c example program. doc/examples/xz_pipe_decomp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) commit 4bd1a3bd5fdf4870b2f96dd0b8a21657c8a58ad8 Author: Lasse Collin Date: 2012-05-30 23:14:33 +0300 Translations: Update the French translation. Thanks to Adrien Nader. po/fr.po | 148 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 79 insertions(+), 69 deletions(-) commit d2e836f2f3a87df6fe6bb0589b037db51205d910 Author: Lasse Collin Date: 2012-05-29 23:42:37 +0300 Translations: Update the German translation. The previous only included the new strings in v5.0. po/de.po | 229 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 133 insertions(+), 96 deletions(-) commit c9a16151577ba459afd6e3528df23bc0ddb95171 Author: Lasse Collin Date: 2012-05-29 22:26:27 +0300 Translations: Update the German translation. po/de.po | 169 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 91 insertions(+), 78 deletions(-) commit 1530a74fd48f8493372edad137a24541efe24713 Author: Lasse Collin Date: 2012-05-29 22:14:21 +0300 Translations: Update Polish translation. po/pl.po | 283 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 165 insertions(+), 118 deletions(-) commit d8db706acb8316f9861abd432cfbe001dd6d0c5c Author: Lasse Collin Date: 2012-05-28 20:42:11 +0300 liblzma: Fix possibility of incorrect LZMA_BUF_ERROR. lzma_code() could incorrectly return LZMA_BUF_ERROR if all of the following was true: - The caller knows how many bytes of output to expect and only provides that much output space. - When the last output bytes are decoded, the caller-provided input buffer ends right before the LZMA2 end of payload marker. So LZMA2 won't provide more output anymore, but it won't know it yet and thus won't return LZMA_STREAM_END yet. - A BCJ filter is in use and it hasn't left any unfiltered bytes in the temp buffer. This can happen with any BCJ filter, but in practice it's more likely with filters other than the x86 BCJ. Another situation where the bug can be triggered happens if the uncompressed size is zero bytes and no output space is provided. In this case the decompression can fail even if the whole input file is given to lzma_code(). A similar bug was fixed in XZ Embedded on 2011-09-19. src/liblzma/simple/simple_coder.c | 2 +- tests/Makefile.am | 4 +- tests/test_bcj_exact_size.c | 112 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 2 deletions(-) commit 3f94b6d87f1b8f1c421ba548f8ebb83dca9c8cda Author: Lasse Collin Date: 2012-05-28 15:38:32 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 7769ea051d739a38a1640fd448cf5eb83cb119c6 Author: Lasse Collin Date: 2012-05-28 15:37:43 +0300 xz: Don't show a huge number in -vv when memory limit is disabled. src/xz/message.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit ec921105725e4d3ef0a683dd83eee6f24ab60ccd Author: Lasse Collin Date: 2012-05-27 22:30:17 +0300 xz: Document the "summary" lines of --robot -lvv. This documents only the columns that are in v5.0. The new columns added in the master branch aren't necessarily stable yet. src/xz/xz.1 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) commit 27d24eb0a9f6eed96d6a4594c2b0bf7a91d29f9a Author: Lasse Collin Date: 2012-05-27 21:53:20 +0300 xz: Fix output of verbose --robot --list modes. It printed the filename in "filename (x/y)" format which it obviously shouldn't do in robot mode. src/xz/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit ab25b82a91754d9388c89abddf806424671d9431 Author: Lasse Collin Date: 2012-05-24 18:33:54 +0300 Build: Upgrade m4/acx_pthread.m4 to the latest version. m4/ax_pthread.m4 | 98 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 36 deletions(-) commit d05d6d65c41a4bc83f162fa3d67c5d84e8751634 Author: Lasse Collin Date: 2012-05-10 21:15:17 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit e077391982f9f28dbfe542bba8800e7c5b916666 Author: Lasse Collin Date: 2012-05-10 21:14:16 +0300 Docs: Cleanup line wrapping a bit. README | 12 ++++++------ doc/history.txt | 49 +++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 30 deletions(-) commit fc39849c350225c6a1cd7f6e6adff1020521eabc Author: Benno Schulenberg Date: 2012-03-13 22:04:04 +0100 Fix a few typos and add some missing articles in some documents. Also hyphenate several compound adjectives. Signed-off-by: Benno Schulenberg AUTHORS | 6 +++--- README | 42 ++++++++++++++++++++--------------------- doc/faq.txt | 24 ++++++++++++------------ doc/history.txt | 58 ++++++++++++++++++++++++++++----------------------------- 4 files changed, 65 insertions(+), 65 deletions(-) commit 29fa0566d5df199cb9acb2d17bf7eea61acc7fa1 Author: Lasse Collin Date: 2012-04-29 11:51:25 +0300 Windows: Update notes about static linking with MSVC. windows/README-Windows.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) commit aac1b31ea4e66cf5a7a8c116bdaa15aa45e6c56e Author: Lasse Collin Date: 2012-04-19 15:25:26 +0300 liblzma: Remove outdated comments. src/liblzma/simple/simple_coder.c | 3 --- src/liblzma/simple/simple_private.h | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) commit df14a46013bea70c0bd35be7821b0b9108f97de7 Author: Lasse Collin Date: 2012-04-19 14:17:52 +0300 DOS: Link against DJGPP's libemu to support FPU emulation. This way xz should work on 386SX and 486SX. Floating point only is needed for verbose output in xz. dos/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 03ed742a3a4931bb5c821357832083b26f577b13 Author: Lasse Collin Date: 2012-04-19 14:02:25 +0300 liblzma: Fix Libs.private in liblzma.pc to include -lrt when needed. src/liblzma/liblzma.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 8c5b13ad59df70f49429bfdfd6ac120b8f892fda Author: Lasse Collin Date: 2012-04-19 13:58:55 +0300 Docs: Update MINIX 3 information in INSTALL. INSTALL | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) commit c7376fc415a1566f38b2de4b516a17013d516a8b Author: Lasse Collin Date: 2012-02-22 14:23:13 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit cff070aba6281ba743d29a62b8c0c66e5da4b2a6 Author: Lasse Collin Date: 2012-02-22 14:02:34 +0200 Fix exit status of xzgrep when grepping binary files. When grepping binary files, grep may exit before it has read all the input. In this case, gzip -q returns 2 (eating SIGPIPE), but xz and bzip2 show SIGPIPE as the exit status (e.g. 141). This causes wrong exit status when grepping xz- or bzip2-compressed binary files. The fix checks for the special exit status that indicates SIGPIPE. It uses kill -l which should be supported everywhere since it is in both SUSv2 (1997) and POSIX.1-2008. Thanks to James Buren for the bug report. src/scripts/xzgrep.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 41cafb2bf9beea915710ee68f05fe929cd17759c Author: Lasse Collin Date: 2012-02-22 12:08:43 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 2dcea03712fa881930d69ec9eff70855c3d126d9 Author: Lasse Collin Date: 2012-02-22 12:00:16 +0200 Fix compiling with IBM XL C on AIX. INSTALL | 36 ++++++++++++++++++++++-------------- configure.ac | 6 +++++- 2 files changed, 27 insertions(+), 15 deletions(-) commit 7db6bdf4abcf524115be2cf5659ed540cef074c5 Author: Lasse Collin Date: 2012-01-10 17:13:03 +0200 Tests: Fix a compiler warning with _FORTIFY_SOURCE. Reported here: http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 tests/create_compress_files.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 694952d545b6cf056547893ced69486eff9ece55 Author: Lasse Collin Date: 2011-12-19 21:21:29 +0200 Docs: Explain the stable releases better in README. README | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit 418fe668b3c53a9a20020b6cc652aaf25c734b29 Author: Lasse Collin Date: 2011-11-07 13:07:52 +0200 xz: Show minimum required XZ Utils version in xz -lvv. Man page wasn't updated yet. src/xz/list.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 6 deletions(-) commit 7081d82c37326bac97184e338345fa1c327e3580 Author: Lasse Collin Date: 2011-11-04 17:57:16 +0200 xz: Fix a typo in a comment. Thanks to Bela Lubkin. src/xz/args.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 232fe7cd70ad258d6a37f17e860e0f1b1891eeb5 Author: Lasse Collin Date: 2011-11-03 17:08:02 +0200 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 74d2bae4d3449c68453b0473dd3430ce91fd90c1 Author: Lasse Collin Date: 2011-11-03 17:07:22 +0200 xz: Fix xz on EBCDIC systems. Thanks to Chris Donawa. src/xz/coder.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) commit 4ac4923f47cc0ef97dd9ca5cfcc44fc53eeab34a Author: Lasse Collin Date: 2011-10-23 17:09:10 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit ab50ae3ef40c81e5bf613905ca3fd636548b75e7 Author: Lasse Collin Date: 2011-10-23 17:08:14 +0300 liblzma: Fix invalid free() in the threaded encoder. It was triggered if initialization failed e.g. due to running out of memory. Thanks to Arkadiusz Miskiewicz. src/liblzma/common/outqueue.c | 4 ++++ 1 file changed, 4 insertions(+) commit 6b620a0f0813d28c3c544b4ff8cb595b38a6e908 Author: Lasse Collin Date: 2011-10-23 17:05:55 +0300 liblzma: Fix a deadlock in the threaded encoder. It was triggered when reinitializing the encoder, e.g. when encoding two files. src/liblzma/common/stream_encoder_mt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bd52cf150ecd51e3ab63a9cc1a3cff6a77500178 Author: Lasse Collin Date: 2011-09-06 12:03:41 +0300 Build: Fix "make check" on Windows. tests/Makefile.am | 7 +++++-- windows/build.bash | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) commit 5c5b2256969ac473001b7d67615ed3bd0a54cc82 Author: Lasse Collin Date: 2011-08-09 21:19:13 +0300 Update THANKS. THANKS | 2 ++ 1 file changed, 2 insertions(+) commit 5b1e1f10741af9e4bbe4cfc3261fb7c7b04f7809 Author: Lasse Collin Date: 2011-08-09 21:16:44 +0300 Workaround unusual SIZE_MAX on SCO OpenServer. src/common/sysdefs.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) commit e9ed88126eee86e2511fa42681a5c7104820cf0a Author: Lasse Collin Date: 2011-08-06 20:37:28 +0300 Run the scripts with the correct shell in test_scripts.sh. The scripts are now made executable in the build tree. This way the scripts can be run like programs in test_scripts.sh. Previously test_scripts.sh always used sh but it's not correct if @POSIX_SHELL@ is set to something else by configure. Thanks to Jonathan Nieder for the patch. configure.ac | 8 ++++---- tests/test_scripts.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 1c673e5681720491a74fc4b2992e075f47302c22 Author: Lasse Collin Date: 2011-07-31 11:01:47 +0300 Fix exit status of "xzdiff foo.xz bar.xz". xzdiff was clobbering the exit status from diff in a case statement used to analyze the exit statuses from "xz" when its operands were two compressed files. Save and restore diff's exit status to fix this. The bug is inherited from zdiff in GNU gzip and was fixed there on 2009-10-09. Thanks to Jonathan Nieder for the patch and to Peter Pallinger for reporting the bug. src/scripts/xzdiff.in | 2 ++ tests/Makefile.am | 4 +++- tests/test_scripts.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) commit 324cde7a864f4506c32ae7846d688c359a83fe65 Author: Lasse Collin Date: 2011-06-16 12:15:29 +0300 liblzma: Remove unneeded semicolon. src/liblzma/lz/lz_encoder_hash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 492c86345551a51a29bf18e55fe55a5e86f169ce Author: Lasse Collin Date: 2011-05-28 19:24:56 +0300 Build: Make configure print if symbol versioning is enabled or not. configure.ac | 2 ++ 1 file changed, 2 insertions(+) commit fc4d4436969bd4d71b704d400a165875e596034a Author: Lasse Collin Date: 2011-05-28 16:43:26 +0300 Don't call close(-1) in tuklib_open_stdxxx() on error. Thanks to Jim Meyering. src/common/tuklib_open_stdxxx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit bd35d903a04c4d388adb4065b0fa271302380895 Author: Lasse Collin Date: 2011-05-28 15:55:39 +0300 liblzma: Use symbol versioning. Symbol versioning is enabled by default on GNU/Linux, other GNU-based systems, and FreeBSD. I'm not sure how stable this is, so it may need backward-incompatible changes before the next release. The idea is that alpha and beta symbols are considered unstable and require recompiling the applications that use those symbols. Once a symbol is stable, it may get extended with new features in ways that don't break compatibility with older ABI & API. The mydist target runs validate_map.sh which should catch some probable problems in liblzma.map. Otherwise I would forget to update the map file for new releases. Makefile.am | 1 + configure.ac | 21 +++++++++ src/liblzma/Makefile.am | 6 +++ src/liblzma/liblzma.map | 105 ++++++++++++++++++++++++++++++++++++++++++++ src/liblzma/validate_map.sh | 68 ++++++++++++++++++++++++++++ 5 files changed, 201 insertions(+) commit afbb244362c9426a37ce4eb9d54aab768da3adad Author: Lasse Collin Date: 2011-05-28 09:46:46 +0300 Translations: Update the Italian translation. Thanks to Milo Casagrande. po/it.po | 365 +++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 216 insertions(+), 149 deletions(-) commit 79bef85e0543c0c3723281c3c817616c6cec343b Author: Lasse Collin Date: 2011-05-28 08:46:04 +0300 Tests: Add a test file for the bug in the previous commit. tests/files/README | 4 ++++ tests/files/bad-1-block_header-6.xz | Bin 0 -> 72 bytes 2 files changed, 4 insertions(+) commit c0297445064951807803457dca1611b3c47e7f0f Author: Lasse Collin Date: 2011-05-27 22:25:44 +0300 xz: Fix error handling in xz -lvv. It could do an invalid free() and read past the end of the uninitialized filters array. src/xz/list.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) commit 8bd91918ac50731f00b1a2a48072980572eb2ff9 Author: Lasse Collin Date: 2011-05-27 22:09:49 +0300 liblzma: Handle allocation failures correctly in lzma_index_init(). Thanks to Jim Meyering. src/liblzma/common/index.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) commit fe00f95828ef5627721b57e054f7eb2d42a2c961 Author: Lasse Collin Date: 2011-05-24 00:23:46 +0300 Build: Fix checking for system-provided SHA-256. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 21b45b9bab541f419712cbfd473ccc31802e0397 Author: Lasse Collin Date: 2011-05-23 18:30:30 +0300 Build: Set GZIP_ENV=-9n in top-level Makefile.am. Makefile.am | 3 +++ 1 file changed, 3 insertions(+) commit 48053e8a4550233af46359024538bff90c870ab1 Author: Lasse Collin Date: 2011-05-22 16:42:11 +0300 Update NEWS for 5.0.3. NEWS | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) commit bba37df2c9e54ad773e15ff00a09d2d6989fb3b2 Author: Lasse Collin Date: 2011-05-21 16:28:44 +0300 Add French translation. It is known that the BCJ filter --help text is only partially translated. po/LINGUAS | 1 + po/fr.po | 864 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 865 insertions(+) commit 4161d7634965a7a287bf208dcd79f6185f448fe8 Author: Lasse Collin Date: 2011-05-21 15:12:10 +0300 xz: Translate also the string used to print the program name. French needs a space before a colon, e.g. "xz : foo error". src/xz/message.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) commit b94aa0c8380cdb18cddb33440d625474c16643cf Author: Lasse Collin Date: 2011-05-21 15:08:44 +0300 liblzma: Try to use SHA-256 from the operating system. If the operating system libc or other base libraries provide SHA-256, use that instead of our own copy. Note that this doesn't use OpenSSL or libgcrypt or such libraries to avoid creating dependencies to other packages. This supports at least FreeBSD, NetBSD, OpenBSD, Solaris, MINIX, and Darwin. They all provide similar but not identical SHA-256 APIs; everyone is a little different. Thanks to Wim Lewis for the original patch, improvements, and testing. configure.ac | 54 +++++++++++++++++++++++++++ src/liblzma/check/Makefile.inc | 2 + src/liblzma/check/check.h | 83 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 131 insertions(+), 8 deletions(-) commit f004128678d43ea10b4a6401aa184cf83252d6ec Author: Lasse Collin Date: 2011-05-17 12:52:18 +0300 Don't use clockid_t in mythread.h when clock_gettime() isn't available. Thanks to Wim Lewis for the patch. src/common/mythread.h | 2 ++ 1 file changed, 2 insertions(+) commit f779516f42ebd2db47a5b7d6143459bf7737cf2f Author: Lasse Collin Date: 2011-05-17 12:26:28 +0300 Update THANKS. THANKS | 3 +++ 1 file changed, 3 insertions(+) commit 830ba587775bb562f6eaf05cad61bf669d1f8892 Author: Lasse Collin Date: 2011-05-17 12:21:33 +0300 Update INSTALL with a note about linker problem on OpenSolaris x86. INSTALL | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) commit ec7106309c8060e9c646dba20c4f15689a0bbb04 Author: Lasse Collin Date: 2011-05-17 12:01:37 +0300 Build: Fix initialization of enable_check_* variables in configure.ac. This doesn't matter much in practice since it is unlikely that anyone would have such environment variable names. Thanks to Wim Lewis. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4c6e146df99696920f12410fb17754412797ef36 Author: Lasse Collin Date: 2011-05-17 11:54:38 +0300 Add underscores to attributes (__attribute((__foo__))). src/liblzma/common/alone_decoder.c | 2 +- src/liblzma/common/alone_encoder.c | 2 +- src/liblzma/common/block_encoder.c | 2 +- src/liblzma/common/common.c | 2 +- src/liblzma/common/common.h | 2 +- src/liblzma/common/index_decoder.c | 9 +++++---- src/liblzma/common/index_encoder.c | 11 ++++++----- src/liblzma/delta/delta_encoder.c | 2 +- src/liblzma/lz/lz_decoder.c | 2 +- src/liblzma/lz/lz_encoder.c | 2 +- src/liblzma/simple/arm.c | 2 +- src/liblzma/simple/armthumb.c | 2 +- src/liblzma/simple/ia64.c | 2 +- src/liblzma/simple/powerpc.c | 2 +- src/liblzma/simple/simple_coder.c | 2 +- src/liblzma/simple/sparc.c | 2 +- src/lzmainfo/lzmainfo.c | 4 ++-- src/xz/coder.c | 2 +- src/xz/hardware.h | 2 +- src/xz/message.c | 2 +- src/xz/message.h | 18 +++++++++--------- src/xz/options.c | 6 +++--- src/xz/signals.c | 2 +- src/xz/util.h | 6 +++--- src/xzdec/xzdec.c | 6 +++--- 25 files changed, 49 insertions(+), 47 deletions(-) commit 7a480e485938884ef3021b48c3b0b9f9699dc9b6 Author: Lasse Collin Date: 2011-05-01 12:24:23 +0300 xz: Fix input file position when --single-stream is used. Now the following works as you would expect: echo foo | xz > foo.xz echo bar | xz >> foo.xz ( xz -dc --single-stream ; xz -dc --single-stream ) < foo.xz Note that it doesn't work if the input is not seekable or if there is Stream Padding between the concatenated .xz Streams. src/xz/coder.c | 1 + src/xz/file_io.c | 15 +++++++++++++++ src/xz/file_io.h | 13 +++++++++++++ 3 files changed, 29 insertions(+) commit c29e6630c1450c630c4e7b783bdd76515db9004c Author: Lasse Collin Date: 2011-05-01 12:15:51 +0300 xz: Print the maximum number of worker threads in xz -vv. src/xz/coder.c | 4 ++++ 1 file changed, 4 insertions(+) commit 0b77c4a75158ccc416b07d6e81df8ee0abaea720 Author: Lasse Collin Date: 2011-04-19 10:44:48 +0300 Build: Warn if no supported method to detect the number of CPU cores. configure.ac | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) commit e4622df9ab4982f8faa53d85b17be66216175a58 Author: Lasse Collin Date: 2011-04-19 09:55:06 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 9c1b05828a88eff54409760b92162c7cc2c7cff6 Author: Lasse Collin Date: 2011-04-19 09:20:44 +0300 Fix portability problems in mythread.h. Use gettimeofday() if clock_gettime() isn't available (e.g. Darwin). The test for availability of pthread_condattr_setclock() and CLOCK_MONOTONIC was incorrect. Instead of fixing the #ifdefs, use an Autoconf test. That way if there exists a system that supports them but doesn't specify the matching POSIX #defines, the features will still get detected. Don't try to use pthread_sigmask() on OpenVMS. It doesn't have that function. Guard mythread.h against being #included multiple times. configure.ac | 7 +++++++ src/common/mythread.h | 31 +++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) commit 3de00cc75da7b0e7b65e84c62b5351e231f501e9 Author: Lasse Collin Date: 2011-04-18 19:35:49 +0300 Update THANKS. THANKS | 2 ++ 1 file changed, 2 insertions(+) commit bd5002f5821e3d1b04f2f56989e4a19318e73633 Author: Martin Väth Date: 2011-04-15 04:54:49 -0400 xzgrep: fix typo in $0 parsing Reported-by: Diego Elio Pettenò Signed-off-by: Martin Väth Signed-off-by: Mike Frysinger src/scripts/xzgrep.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 6ef4eabc0acc49e1bb9dc68064706e19fa9fcf48 Author: Lasse Collin Date: 2011-04-12 12:48:31 +0300 Bump the version number to 5.1.1alpha and liblzma soname to 5.0.99. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 9a4377be0d21e597c66bad6c7452873aebfb3c1c Author: Lasse Collin Date: 2011-04-12 12:42:37 +0300 Put the unstable APIs behind #ifdef LZMA_UNSTABLE. This way people hopefully won't complain if these APIs change and break code that used an older API. src/liblzma/api/lzma/container.h | 4 ++++ src/liblzma/common/common.h | 2 ++ src/xz/private.h | 2 ++ 3 files changed, 8 insertions(+) commit 3e321a3acd50002cf6fdfd259e910f56d3389bc3 Author: Lasse Collin Date: 2011-04-12 11:59:49 +0300 Remove doubled words from documentation and comments. Spot candidates by running these commands: git ls-files |xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g; print "$ARGV:$n:$v\n"}' Thanks to Jim Meyering for the original patch. doc/lzma-file-format.txt | 4 ++-- src/liblzma/common/alone_encoder.c | 2 +- src/liblzma/lzma/lzma2_encoder.c | 2 +- src/xz/file_io.c | 2 +- src/xz/xz.1 | 2 +- windows/INSTALL-Windows.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) commit d91a84b534b012d19474f2fda1fbcaef873e1ba4 Author: Lasse Collin Date: 2011-04-12 11:46:01 +0300 Update NEWS. NEWS | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) commit 14e6ad8cfe0165c1a8beeb5b2a1536558b29b0a1 Author: Lasse Collin Date: 2011-04-12 11:45:40 +0300 Update TODO. TODO | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) commit 70e750f59793f9b5cd306a5adce9b8e427739e04 Author: Lasse Collin Date: 2011-04-12 11:08:55 +0300 xz: Update the man page about threading. src/xz/xz.1 | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) commit 24e0406c0fb7494d2037dec033686faf1bf67068 Author: Lasse Collin Date: 2011-04-11 22:06:03 +0300 xz: Add support for threaded compression. src/xz/args.c | 3 +- src/xz/coder.c | 202 +++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 125 insertions(+), 80 deletions(-) commit de678e0c924aa79a19293a8a6ed82e8cb6572a42 Author: Lasse Collin Date: 2011-04-11 22:03:30 +0300 liblzma: Add lzma_stream_encoder_mt() for threaded compression. This is the simplest method to do threading, which splits the uncompressed data into blocks and compresses them independently from each other. There's room for improvement especially to reduce the memory usage, but nevertheless, this is a good start. configure.ac | 1 + src/liblzma/api/lzma/container.h | 163 +++++ src/liblzma/common/Makefile.inc | 7 + src/liblzma/common/common.c | 9 +- src/liblzma/common/common.h | 14 + src/liblzma/common/outqueue.c | 180 ++++++ src/liblzma/common/outqueue.h | 155 +++++ src/liblzma/common/stream_encoder_mt.c | 1011 ++++++++++++++++++++++++++++++++ 8 files changed, 1539 insertions(+), 1 deletion(-) commit 25fe729532cdf4b8fed56a4519b73cf31efaec50 Author: Lasse Collin Date: 2011-04-11 21:15:07 +0300 liblzma: Add the forgotten lzma_lzma2_block_size(). This should have been in 5eefc0086d24a65e136352f8c1d19cefb0cbac7a. src/liblzma/lzma/lzma2_encoder.c | 10 ++++++++++ src/liblzma/lzma/lzma2_encoder.h | 2 ++ 2 files changed, 12 insertions(+) commit 91afb785a1dee34862078d9bf844ef12b8cc3e35 Author: Lasse Collin Date: 2011-04-11 21:04:13 +0300 liblzma: Document lzma_easy_(enc|dec)oder_memusage() better too. src/liblzma/api/lzma/container.h | 9 +++++++++ 1 file changed, 9 insertions(+) commit 4a9905302a9e4a1601ae09d650d3f08ce98ae9ee Author: Lasse Collin Date: 2011-04-11 20:59:07 +0300 liblzma: Document lzma_raw_(enc|dec)oder_memusage() better. It didn't mention the return value that is used if an error occurs. src/liblzma/api/lzma/filter.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 0badb0b1bd649163322783b0bd9e590b4bc7a93d Author: Lasse Collin Date: 2011-04-11 19:28:18 +0300 liblzma: Use memzero() to initialize supported_actions[]. This is cleaner and makes it simpler to add new members to lzma_action enumeration. src/liblzma/common/common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) commit a7934c446a58e20268689899d2a39f50e571f251 Author: Lasse Collin Date: 2011-04-11 19:26:27 +0300 liblzma: API comment about lzma_allocator with threaded coding. src/liblzma/api/lzma/base.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) commit 5eefc0086d24a65e136352f8c1d19cefb0cbac7a Author: Lasse Collin Date: 2011-04-11 19:16:30 +0300 liblzma: Add an internal function lzma_mt_block_size(). This is based lzma_chunk_size() that was included in some development version of liblzma. src/liblzma/common/filter_encoder.c | 46 ++++++++++++++++++------------------- src/liblzma/common/filter_encoder.h | 4 ++-- 2 files changed, 24 insertions(+), 26 deletions(-) commit d1199274758049fc523d98c5b860ff814a799eec Author: Lasse Collin Date: 2011-04-11 13:59:50 +0300 liblzma: Don't create an empty Block in lzma_stream_buffer_encode(). Empty Block was created if the input buffer was empty. Empty Block wastes a few bytes of space, but more importantly it triggers a bug in XZ Utils 5.0.1 and older when trying to decompress such a file. 5.0.1 and older consider such files to be corrupt. I thought that no encoder creates empty Blocks when releasing 5.0.2 but I was wrong. src/liblzma/common/stream_buffer_encoder.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) commit 3b22fc2c87ec85fcdd385c163b68fc49c97aa848 Author: Lasse Collin Date: 2011-04-11 13:28:40 +0300 liblzma: Fix API docs to mention LZMA_UNSUPPORTED_CHECK. This return value was missing from the API comments of four functions. src/liblzma/api/lzma/block.h | 1 + src/liblzma/api/lzma/container.h | 3 +++ 2 files changed, 4 insertions(+) commit 71b9380145dccf001f22e66a06b9d508905c25ce Author: Lasse Collin Date: 2011-04-11 13:21:28 +0300 liblzma: Validate encoder arguments better. The biggest problem was that the integrity check type wasn't validated, and e.g. lzma_easy_buffer_encode() would create a corrupt .xz Stream if given an unsupported Check ID. Luckily applications don't usually try to use an unsupport Check ID, so this bug is unlikely to cause many real-world problems. src/liblzma/common/block_buffer_encoder.c | 18 ++++++++++++------ src/liblzma/common/block_encoder.c | 5 +++++ src/liblzma/common/stream_buffer_encoder.c | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) commit ec7e3dbad704268825fc48f0bdd4577bc46b4f13 Author: Lasse Collin Date: 2011-04-11 09:57:30 +0300 xz: Move the description of --block-size in --long-help. src/xz/message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit cd3086ff443bb282bdf556919c28b3e3cbed8169 Author: Lasse Collin Date: 2011-04-11 09:55:35 +0300 Docs: Document --single-stream and --block-size. src/xz/xz.1 | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) commit fb64a4924334e3c440865710990fe08090f2fed0 Author: Lasse Collin Date: 2011-04-11 09:27:57 +0300 liblzma: Make lzma_stream_encoder_init() static (second try). It's an internal function and it's not needed by anything outside stream_encoder.c. src/liblzma/common/Makefile.inc | 1 - src/liblzma/common/easy_encoder.c | 1 - src/liblzma/common/stream_encoder.c | 13 ++++++------- src/liblzma/common/stream_encoder.h | 23 ----------------------- 4 files changed, 6 insertions(+), 32 deletions(-) commit a34730cf6af4d33a4057914e57227b6dfde6567e Author: Lasse Collin Date: 2011-04-11 08:31:42 +0300 Revert "liblzma: Make lzma_stream_encoder_init() static." This reverts commit 352ac82db5d3f64585c07b39e4759388dec0e4d7. I don't know what I was thinking. src/liblzma/common/Makefile.inc | 1 + src/liblzma/common/stream_encoder.c | 9 +++++---- src/liblzma/common/stream_encoder.h | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) commit 9f0a806aef7ea79718e3f1f2baf3564295229a27 Author: Lasse Collin Date: 2011-04-10 21:23:21 +0300 Revise mythread.h. This adds: - mythread_sync() macro to create synchronized blocks - mythread_cond structure and related functions and macros for condition variables with timed waiting using a relative timeout - mythread_create() to create a thread with all signals blocked Some of these wouldn't need to be inline functions, but I'll keep them this way for now for simplicity. For timed waiting on a condition variable, librt is now required on some systems to use clock_gettime(). configure.ac was updated to handle this. configure.ac | 1 + src/common/mythread.h | 200 +++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 181 insertions(+), 20 deletions(-) commit 352ac82db5d3f64585c07b39e4759388dec0e4d7 Author: Lasse Collin Date: 2011-04-10 20:37:36 +0300 liblzma: Make lzma_stream_encoder_init() static. It's an internal function and it's not needed by anything outside stream_encoder.c. src/liblzma/common/Makefile.inc | 1 - src/liblzma/common/stream_encoder.c | 9 ++++----- src/liblzma/common/stream_encoder.h | 23 ----------------------- 3 files changed, 4 insertions(+), 29 deletions(-) commit 9e807fe3fe79618ac48f58207cf7082ea20a6928 Author: Lasse Collin Date: 2011-04-10 14:58:10 +0300 DOS: Update the docs and include notes about 8.3 filenames. dos/{README => INSTALL.txt} | 13 +---- dos/README.txt | 123 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 11 deletions(-) commit ebd54dbd6e481d31e80757f900ac8109ad1423c6 Author: Lasse Collin Date: 2011-04-10 13:09:42 +0300 xz/DOS: Add experimental 8.3 filename support. This is incompatible with the 8.3 support patch made by Juan Manuel Guerrero. I think this one is nicer, but I need to get feedback from DOS users before saying that this is the final version of 8.3 filename support. src/xz/suffix.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 167 insertions(+), 9 deletions(-) commit cd4fe97852bcaeffe674ee51b4613709292a0972 Author: Lasse Collin Date: 2011-04-10 12:47:47 +0300 xz/DOS: Be more careful with the destination file. Try to avoid overwriting the source file if --force is used and the generated destination filename refers to the source file. This can happen with 8.3 filenames where extra characters are ignored. If the generated output file refers to a special file like "con" or "prn", refuse to write to it even if --force is used. src/xz/file_io.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) commit 607f9f98ae5ef6d49f4c21c806d462bf6b3d6796 Author: Lasse Collin Date: 2011-04-09 18:29:30 +0300 Update THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit fca396b37410d272b754843a5dc13847be443a3a Author: Lasse Collin Date: 2011-04-09 18:28:58 +0300 liblzma: Add missing #ifdefs to filter_common.c. Passing --disable-decoders to configure broke a few encoders due to missing #ifdefs in filter_common.c. Thanks to Jason Gorski for the patch. src/liblzma/common/filter_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit b03f6cd3ebadd675f2cc9d518cb26fa860269447 Author: Lasse Collin Date: 2011-04-09 15:24:59 +0300 xz: Avoid unneeded fstat() on DOS-like systems. src/xz/file_io.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) commit 335fe260a81f61ec99ff5940df733b4c50aedb7c Author: Lasse Collin Date: 2011-04-09 15:11:13 +0300 xz: Minor internal changes to handling of --threads. Now it always defaults to one thread. Maybe this will change again if a threading method is added that doesn't affect memory usage. src/xz/args.c | 4 ++-- src/xz/hardware.c | 24 ++++++++++++------------ src/xz/hardware.h | 9 ++++----- 3 files changed, 18 insertions(+), 19 deletions(-) commit 9edd6ee895fbe71d245a173f48e511f154a99875 Author: Lasse Collin Date: 2011-04-08 17:53:05 +0300 xz: Change size_t to uint32_t in a few places. src/xz/coder.c | 6 +++--- src/xz/coder.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) commit 411013ea4506a6df24d35a060fcbd73a57b73eb3 Author: Lasse Collin Date: 2011-04-08 17:48:41 +0300 xz: Fix a typo in a comment. src/xz/coder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b34c5ce4b22e8d7b81f9895d15054af41d17f805 Author: Lasse Collin Date: 2011-04-05 22:41:33 +0300 liblzma: Use TUKLIB_GNUC_REQ to check GCC version in sha256.c. src/liblzma/check/sha256.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) commit db33117cc85c17e0b897b5312bd5eb43aac41c03 Author: Lasse Collin Date: 2011-04-05 17:12:20 +0300 Build: Upgrade m4/acx_pthread.m4 to the latest version. It was renamed to ax_pthread.m4 in Autoconf Archive. configure.ac | 2 +- m4/{acx_pthread.m4 => ax_pthread.m4} | 170 ++++++++++++++++++----------------- 2 files changed, 88 insertions(+), 84 deletions(-) commit 1039bfcfc098b69d56ecb39d198a092552eacf6d Author: Lasse Collin Date: 2011-04-05 15:27:26 +0300 xz: Use posix_fadvise() if it is available. configure.ac | 3 +++ src/xz/file_io.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+) commit 1ef3cf44a8eb9512480af4482a5232ea08363b14 Author: Lasse Collin Date: 2011-04-05 15:13:29 +0300 xz: Call lzma_end(&strm) before exiting if debugging is enabled. src/xz/coder.c | 10 ++++++++++ src/xz/coder.h | 5 +++++ src/xz/main.c | 4 ++++ 3 files changed, 19 insertions(+) commit bd432015d33dcade611d297bc01eb0700088ef6c Author: Lasse Collin Date: 2011-04-02 14:49:56 +0300 liblzma: Fix a memory leak in stream_encoder.c. It leaks old filter options structures (hundred bytes or so) every time the lzma_stream is reinitialized. With the xz tool, this happens when compressing multiple files. src/liblzma/common/stream_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 16889013214e7620d204b6e6c1bf9f3103a13655 Author: Lasse Collin Date: 2011-04-01 08:47:20 +0300 Updated NEWS for 5.0.2. NEWS | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) commit 85cdf7dd4e97b078e7b929e47f55a7f1da36010f Author: Lasse Collin Date: 2011-03-31 15:06:58 +0300 Update INSTALL with another note about IRIX. INSTALL | 4 ++++ 1 file changed, 4 insertions(+) commit c3f4995586873d6a4fb7e451010a128571a9a370 Author: Lasse Collin Date: 2011-03-31 12:22:55 +0300 Tests: Add a new file to test empty LZMA2 streams. tests/files/README | 4 ++++ tests/files/good-1-lzma2-5.xz | Bin 0 -> 52 bytes 2 files changed, 4 insertions(+) commit 0d21f49a809dc2088da6cc0da7f948404df7ecfa Author: Lasse Collin Date: 2011-03-31 11:54:48 +0300 liblzma: Fix decoding of LZMA2 streams having no uncompressed data. The decoder considered empty LZMA2 streams to be corrupt. This shouldn't matter much with .xz files, because no encoder creates empty LZMA2 streams in .xz. This bug is more likely to cause problems in applications that use raw LZMA2 streams. src/liblzma/lzma/lzma2_decoder.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) commit 40277998cb9bad564ce4827aff152e6e1c904dfa Author: Lasse Collin Date: 2011-03-24 01:42:49 +0200 Scripts: Better fix for xzgrep. Now it uses "grep -q". Thanks to Gregory Margo. src/scripts/xzgrep.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit 2118733045ad0ca183a3f181a0399baf876983a6 Author: Lasse Collin Date: 2011-03-24 01:22:18 +0200 Updated THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit c7210d9a3fca6f31a57208bfddfc9ab20a2e097a Author: Lasse Collin Date: 2011-03-24 01:21:32 +0200 Scripts: Fix xzgrep -l. It didn't work at all. It tried to use the -q option for grep, but it appended it after "--". This works around it by redirecting to /dev/null. The downside is that this can be slower with big files compared to proper use of "grep -q". Thanks to Gregory Margo. src/scripts/xzgrep.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit 4eb83e32046a6d670862bc91c3d82530963b455e Author: Lasse Collin Date: 2011-03-19 13:08:22 +0200 Scripts: Add lzop (.lzo) support to xzdiff and xzgrep. src/scripts/xzdiff.1 | 6 ++++-- src/scripts/xzdiff.in | 22 ++++++++++++++-------- src/scripts/xzgrep.1 | 11 +++++++---- src/scripts/xzgrep.in | 5 +++-- 4 files changed, 28 insertions(+), 16 deletions(-) commit 923b22483bd9356f3219b2b784d96f455f4dc499 Author: Lasse Collin Date: 2011-03-18 19:10:30 +0200 xz: Add --block-size=SIZE. This uses LZMA_FULL_FLUSH every SIZE bytes of input. Man page wasn't updated yet. src/xz/args.c | 7 +++++++ src/xz/coder.c | 50 ++++++++++++++++++++++++++++++++++++++++---------- src/xz/coder.h | 3 +++ src/xz/message.c | 4 ++++ 4 files changed, 54 insertions(+), 10 deletions(-) commit 57597d42ca1740ad506437be168d800a50f1a0ad Author: Lasse Collin Date: 2011-03-18 18:19:19 +0200 xz: Add --single-stream. This can be useful when there is garbage after the compressed stream (.xz, .lzma, or raw stream). Man page wasn't updated yet. src/xz/args.c | 6 ++++++ src/xz/coder.c | 11 +++++++++-- src/xz/coder.h | 3 +++ src/xz/message.c | 6 +++++- 4 files changed, 23 insertions(+), 3 deletions(-) commit 96f94bc925d579a700147fa5d7793b64d69cfc18 Author: Lasse Collin Date: 2011-02-04 22:49:31 +0200 xz: Clean up suffix.c. struct suffix_pair isn't needed in compresed_name() so get rid of it there. src/xz/suffix.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) commit 8930c7ae3f82bdae15aa129f01de08be23d7e8d7 Author: Lasse Collin Date: 2011-02-04 11:29:47 +0200 xz: Check if the file already has custom suffix when compressing. Now "xz -S .test foo.test" refuses to compress the file because it already has the suffix .test. The man page had it documented this way already. src/xz/suffix.c | 9 +++++++++ 1 file changed, 9 insertions(+) commit 940d5852c6cf08abccc6befd9d1b5411c9076a58 Author: Lasse Collin Date: 2011-02-02 23:01:51 +0200 Updated THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 4ebe65f839613f27f127bab7b8c347d982330ee3 Author: Lasse Collin Date: 2011-02-02 23:00:33 +0200 Translations: Add Polish translation. Thanks to Jakub Bogusz. po/LINGUAS | 1 + po/pl.po | 825 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 826 insertions(+) commit fc1d292dca1925dfd17174f443f91a696ecd5bf8 Author: Lasse Collin Date: 2011-02-02 22:24:00 +0200 Updated THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit 6dd061adfd2775428b079eb03d6fd47d7c0f1ffe Merge: 9d542ce 5fbce0b Author: Lasse Collin Date: 2011-02-06 20:13:01 +0200 Merge commit '5fbce0b8d96dc96775aa0215e3581addc830e23d' commit 5fbce0b8d96dc96775aa0215e3581addc830e23d Author: Lasse Collin Date: 2011-01-28 20:16:57 +0200 Update NEWS for 5.0.1. NEWS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) commit 03ebd1bbb314f9f204940219a835c883bf442475 Author: Lasse Collin Date: 2011-01-26 12:19:08 +0200 xz: Fix --force on setuid/setgid/sticky and multi-hardlink files. xz didn't compress setuid/setgid/sticky files and files with multiple hard links even with --force. This bug was introduced in 23ac2c44c3ac76994825adb7f9a8f719f78b5ee4. Thanks to Charles Wilson. src/xz/file_io.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) commit 9d542ceebcbe40b174169c132ccfcdc720ca7089 Merge: 4f2c69a 7bd0a5e Author: Lasse Collin Date: 2011-01-19 11:45:35 +0200 Merge branch 'v5.0' commit 7bd0a5e7ccc354f7c2e95c8bc27569c820f6a136 Author: Lasse Collin Date: 2011-01-18 21:25:24 +0200 Updated THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit f71c4e16e913f660977526f0ef8d2acdf458d7c9 Author: Lasse Collin Date: 2011-01-18 21:23:50 +0200 Add alloc_size and malloc attributes to a few functions. Thanks to Cristian Rodríguez for the original patch. src/common/sysdefs.h | 6 ++++++ src/liblzma/common/common.h | 2 +- src/xz/util.h | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) commit 316cbe24465143edde8f6ffb7532834b7b2ea93f Author: Lasse Collin Date: 2010-12-13 16:36:33 +0200 Scripts: Fix gzip and bzip2 support in xzdiff. src/scripts/xzdiff.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 4f2c69a4e3e0aee2e37b0b1671d34086e20c8ac6 Merge: adb89e6 9311774 Author: Lasse Collin Date: 2010-12-12 23:13:22 +0200 Merge branch 'v5.0' commit 9311774c493c19deab51ded919dcd2e9c4aa2829 Author: Lasse Collin Date: 2010-12-12 21:23:55 +0200 Build: Enable ASM on DJGPP by default. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 4a42aaee282fc73b482581684d65110506d5efdd Author: Lasse Collin Date: 2010-12-12 16:09:42 +0200 Updated THANKS. THANKS | 1 + 1 file changed, 1 insertion(+) commit ce56f63c41ee210e6308090eb6d49221fdf67d6c Author: Lasse Collin Date: 2010-12-12 16:07:11 +0200 Add missing PRIx32 and PRIx64 compatibility definitions. This fixes portability to systems that lack C99 inttypes.h. Thanks to Juan Manuel Guerrero. src/common/sysdefs.h | 9 +++++++++ 1 file changed, 9 insertions(+) commit e6baedddcf54e7da049ebc49183565b99facd4c7 Author: Lasse Collin Date: 2010-12-12 14:50:04 +0200 DOS-like: Treat \ and : as directory separators in addition to /. Juan Manuel Guerrero had fixed this in his XZ Utils port to DOS/DJGPP. The bug affects also Windows and OS/2. src/xz/suffix.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) commit adb89e68d43a4cadb0c215b45ef7a75737c9c3ec Merge: 7c24e0d b7afd3e Author: Lasse Collin Date: 2010-12-07 18:53:04 +0200 Merge branch 'v5.0' commit b7afd3e22a8fac115b75c738d40d3eb1de7e286f Author: Lasse Collin Date: 2010-12-07 18:52:04 +0200 Translations: Fix Czech translation of "sparse file". Thanks to Petr Hubený and Marek Černocký. po/cs.po | 88 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) commit 7c24e0d1b8a2e86e9263b0d56d39621e01aed7af Merge: b4d42f1 3e56470 Author: Lasse Collin Date: 2010-11-15 14:33:01 +0200 Merge branch 'v5.0' commit 3e564704bc6f463cb2db11e3f3f0dbd71d85992e Author: Lasse Collin Date: 2010-11-15 14:28:26 +0200 liblzma: Document the return value of lzma_lzma_preset(). src/liblzma/api/lzma/lzma.h | 3 +++ 1 file changed, 3 insertions(+) commit 2964d8d691ed92abdcf214888d79ad6d79774735 Author: Jonathan Nieder Date: 2010-11-12 15:22:13 -0600 Simplify paths in generated API docs Currently the file list generated by Doxygen has src/ at the beginning of each path. Paths like common/sysdefs.h and liblzma/api/lzma.h are easier to read without such a prefix. Builds from a separate build directory with mkdir build cd build ../configure doxygen Doxyfile include an even longer prefix /home/someone/src/xz/src; this patch has the nice side-effect of eliminating that prefix, too. Fixes: http://bugs.debian.org/572273 Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b4d42f1a7120e2cefeb2f14425efe2ca6db85416 Author: Anders F Bjorklund Date: 2010-11-05 12:56:11 +0100 add build script for macosx universal macosx/build.sh | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) commit 15ee6935abe4a2fc76639ee342ca2e69af3e0ad6 Author: Lasse Collin Date: 2010-11-04 18:31:40 +0200 Update the copies of GPLv2 and LGPLv2.1 from gnu.org. There are only a few white space changes. COPYING.GPLv2 | 14 +++++++------- COPYING.LGPLv2.1 | 16 +++++++--------- 2 files changed, 14 insertions(+), 16 deletions(-) commit 8e355f7fdbeee6fe394eb02a28f267ce99a882a2 Merge: 974ebe6 37c2565 Author: Lasse Collin Date: 2010-10-26 15:53:06 +0300 Merge branch 'v5.0' commit 37c25658efd25b034266daf87cd381d20d1df776 Author: Lasse Collin Date: 2010-10-26 15:48:48 +0300 Build: Copy the example programs to $docdir/examples. The example programs by Daniel Mealha Cabrita were included in the git repository, but I had forgot to add them to Makefile.am. Thus, they didn't get included in the source package at all by "make dist". Makefile.am | 5 +++++ windows/build.bash | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) commit 974ebe63497bdf0d262e06474f0dd5a70b1dd000 Author: Lasse Collin Date: 2010-10-26 10:36:41 +0300 liblzma: Rename a few variables and constants. This has no semantic changes. I find the new names slightly more logical and they match the names that are already used in XZ Embedded. The name fastpos wasn't changed (not worth the hassle). src/liblzma/lzma/fastpos.h | 55 +++++------ src/liblzma/lzma/lzma2_encoder.c | 2 +- src/liblzma/lzma/lzma_common.h | 45 ++++----- src/liblzma/lzma/lzma_decoder.c | 58 +++++------ src/liblzma/lzma/lzma_encoder.c | 56 +++++------ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 9 +- src/liblzma/lzma/lzma_encoder_optimum_normal.c | 128 ++++++++++++------------- src/liblzma/lzma/lzma_encoder_private.h | 16 ++-- 8 files changed, 183 insertions(+), 186 deletions(-) commit 7c427ec38d016c0070a42315d752857e33792fc4 Author: Lasse Collin Date: 2010-10-25 12:59:25 +0300 Bump version 5.1.0alpha. src/liblzma/api/lzma/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) commit e45929260cd902036efd40c5610a8d0a50d5712b Author: Lasse Collin Date: 2010-10-23 17:25:52 +0300 Build: Fix mydist rule when .git doesn't exist. Makefile.am | 1 + 1 file changed, 1 insertion(+) commit 6e1326fcdf6b6209949be57cfe3ad4b781b65168 Author: Lasse Collin Date: 2010-10-23 14:15:35 +0300 Add NEWS for 5.0.0. NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) commit b667a3ef6338a2c1db7b7706b1f6c99ea392221c Author: Lasse Collin Date: 2010-10-23 14:02:53 +0300 Bump version to 5.0.0 and liblzma version-info to 5:0:0. src/liblzma/Makefile.am | 2 +- src/liblzma/api/lzma/version.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 8c947e9291691629714dafb4536c718b6cc24fbd -Author: Lasse Collin -Date: 2010-10-23 12:30:54 +0300 - - liblzma: Make lzma_code() check the reserved members in lzma_stream. - - If any of the reserved members in lzma_stream are non-zero - or non-NULL, LZMA_OPTIONS_ERROR is returned. It is possible - that a new feature in the future is indicated by just setting - a reserved member to some other value, so the old liblzma - version need to catch it as an unsupported feature. - - src/liblzma/common/common.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -commit e61d85e082743ebd2dd0ff28fc0a82482ede0538 -Author: Lasse Collin -Date: 2010-10-23 12:26:33 +0300 - - Windows: Use MinGW's stdio functions. - - The non-standard ones from msvcrt.dll appear to work - most of the time with XZ Utils, but there are some - corner cases where things may go very wrong. So it's - good to use the better replacements provided by - MinGW(-w64) runtime. - - src/common/sysdefs.h | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 23e23f1dc029146714c9a98313ab3ea93d71a2fc -Author: Lasse Collin -Date: 2010-10-23 12:21:32 +0300 - - liblzma: Use 512 as INDEX_GROUP_SIZE. - - This lets compiler use shifting instead of 64-bit division. - - src/liblzma/common/index.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 613939fc82603b75b59eee840871a05bc8dd08e0 -Author: Lasse Collin -Date: 2010-10-23 12:20:11 +0300 - - liblzma: A few ABI tweaks to reserve space in structures. - - src/liblzma/api/lzma/base.h | 7 ++++++- - src/liblzma/api/lzma/lzma.h | 4 ++-- - src/liblzma/api/lzma/stream_flags.h | 4 ---- - 3 files changed, 8 insertions(+), 7 deletions(-) - -commit 68b83f252df3d27480a9f6f03445d16f6506fef1 -Author: Lasse Collin -Date: 2010-10-21 23:16:11 +0300 - - xz: Make sure that message_strm() can never return NULL. - - src/xz/message.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -commit d09c5753e33ff96ee57edb6d1e98e34041203695 -Author: Lasse Collin -Date: 2010-10-21 23:06:31 +0300 - - liblzma: Update the comments in the API headers. - - Adding support for LZMA_FINISH for Index encoding and - decoding needed tiny additions to the relevant .c files too. - - src/liblzma/api/lzma.h | 4 +-- - src/liblzma/api/lzma/base.h | 38 +++++++++++++-------------- - src/liblzma/api/lzma/bcj.h | 4 +-- - src/liblzma/api/lzma/block.h | 4 +-- - src/liblzma/api/lzma/container.h | 26 ++++++++++++------- - src/liblzma/api/lzma/filter.h | 51 ++++++++++++++++++------------------- - src/liblzma/api/lzma/hardware.h | 3 +-- - src/liblzma/api/lzma/index.h | 28 ++++++++++++-------- - src/liblzma/api/lzma/index_hash.h | 2 +- - src/liblzma/api/lzma/lzma.h | 46 ++++++++++++++++++++++----------- - src/liblzma/api/lzma/stream_flags.h | 4 +-- - src/liblzma/api/lzma/vli.h | 31 +++++++++++----------- - src/liblzma/common/index_decoder.c | 1 + - src/liblzma/common/index_encoder.c | 1 + - 14 files changed, 136 insertions(+), 107 deletions(-) - -commit 33c1c0e102eb529588503b8beea0903a45488fad -Author: Lasse Collin -Date: 2010-10-19 12:08:30 +0300 - - Update INSTALL.generic. - - INSTALL.generic | 99 ++++++++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 81 insertions(+), 18 deletions(-) - -commit 0076e03641f201c4b77dddd5a6db5880be19a78c -Author: Lasse Collin -Date: 2010-10-19 11:44:37 +0300 - - Clean up a few FIXMEs and TODOs. - - lzma_chunk_size() was commented out because it is - currently useless. - - src/liblzma/common/filter_encoder.c | 2 ++ - src/liblzma/common/filter_encoder.h | 4 ++-- - src/liblzma/lzma/lzma2_decoder.c | 1 - - src/liblzma/lzma/lzma_decoder.c | 4 ++-- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/xz/message.h | 2 +- - 6 files changed, 8 insertions(+), 7 deletions(-) - -commit ce34ec4f54ff8b753da236f371ad8dd23c8135c9 -Author: Lasse Collin -Date: 2010-10-19 10:21:08 +0300 - - Update docs. - - INSTALL | 192 +++++++++++++++++++++++++++++++++++++++++-------------------- - PACKAGERS | 104 +++++++++------------------------ - TODO | 17 ++++-- - dos/README | 2 +- - 4 files changed, 172 insertions(+), 143 deletions(-) - -commit f0fa880d247e73264d2c04fe31fb3412318a0026 -Author: Lasse Collin -Date: 2010-10-12 15:13:30 +0300 - - xz: Avoid raise() also on OpenVMS. - - This is similar to DOS/DJGPP that killing the program - with a signal will print a backtrace or a similar message. - - src/xz/signals.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ac462b1c47c451f5c62e428306314c4bdad8ae7f -Author: Lasse Collin -Date: 2010-10-11 21:26:19 +0300 - - xz: Avoid SA_RESTART for portability reasons. - - SA_RESTART is not as portable as I had hoped. It's missing - at least from OpenVMS, QNX, and DJGPP). Luckily we can do - fine without SA_RESTART. - - src/xz/message.c | 38 +++++++++++++++----------------------- - src/xz/message.h | 4 ++++ - src/xz/signals.c | 6 ++++++ - 3 files changed, 25 insertions(+), 23 deletions(-) - -commit d52b411716a614c202e89ba732492efb9916cd3f -Author: Lasse Collin -Date: 2010-10-10 17:58:58 +0300 - - xz: Use "%"PRIu32 instead of "%d" in a format string. - - src/xz/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ae74d1bdeb075c3beefe76e1136c5741804e7e91 -Author: Lasse Collin -Date: 2010-10-10 17:43:26 +0300 - - test_files.sh: Fix the first line. - - For some reason this prevented running the test only - on OS/2 and even on that it broke only recently. - - Thanks to Elbert Pol. - - tests/test_files.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d492b80ddd6f9a13419de6d102df7374d8f448e8 -Author: Lasse Collin -Date: 2010-10-10 16:49:01 +0300 - - lzmainfo: Use "%"PRIu32 instead of "%u" for uint32_t. - - src/lzmainfo/lzmainfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 825e859a9054bd91202e5723c41a17e72f63040a -Author: Lasse Collin -Date: 2010-10-10 16:47:01 +0300 - - lzmainfo: Use fileno(stdin) instead of STDIN_FILENO. - - src/lzmainfo/lzmainfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit acbc4cdecbeec2a4dfaac04f185ece49b2ff17c8 -Author: Lasse Collin -Date: 2010-10-09 23:20:51 +0300 - - lzmainfo: Use setmode() on DOS-like systems. - - src/lzmainfo/lzmainfo.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit ef364d3abc5647111c5424ea0d83a567e184a23b -Author: Lasse Collin -Date: 2010-10-09 21:51:03 +0300 - - OS/2 and DOS: Be less verbose on signals. - - Calling raise() to kill xz when user has pressed C-c - is a bit verbose on OS/2 and DOS/DJGPP. Instead of - calling raise(), set only the exit status to 1. - - src/xz/signals.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 5629c4be07b6c67e79842b2569da1cedc9c0d69a -Author: Lasse Collin -Date: 2010-10-09 19:28:49 +0300 - - DOS: Update the Makefile, config.h and README. - - This is now simpler and builds only xz.exe. - - dos/Makefile | 211 +++++++++++++++-------------------------------------------- - dos/README | 73 +++++++-------------- - dos/config.h | 45 ++++--------- - 3 files changed, 86 insertions(+), 243 deletions(-) - -commit f25a77e6b9bc48a243ddfbbd755b7960eec7e0ac -Author: Lasse Collin -Date: 2010-10-09 18:57:55 +0300 - - Windows: Put some license info into README-Windows.txt. - - windows/README-Windows.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit e75100f549f85d231df25c07aa94d63e78e2d668 -Author: Lasse Collin -Date: 2010-10-09 18:57:04 +0300 - - Windows: Fix a diagnostics bug in build.bash. - - windows/build.bash | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit efeb998a2b1025df1c1d202cc7d21d866cd1c336 -Author: Lasse Collin -Date: 2010-10-09 13:02:15 +0300 - - lzmainfo: Add Windows resource file. - - src/lzmainfo/Makefile.am | 9 +++++++++ - src/lzmainfo/lzmainfo_w32res.rc | 12 ++++++++++++ - 2 files changed, 21 insertions(+) - -commit 389d418445f1623593dfdbba55d52fbb6d1205f5 -Author: Lasse Collin -Date: 2010-10-09 12:57:25 +0300 - - Add missing public domain notice to lzmadec_w32res.rc. - - src/xzdec/lzmadec_w32res.rc | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 6389c773a4912dd9f111256d74ba1605230a7957 -Author: Lasse Collin -Date: 2010-10-09 12:52:12 +0300 - - Windows: Update common_w32res.rc. - - src/common/common_w32res.rc | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -commit 71275457ca24c9b01721f5cfc3638cf094daf454 -Author: Lasse Collin -Date: 2010-10-09 12:27:08 +0300 - - Windows: Make build.bash prefer MinGW-w32 over MinGW. - - This is simply for licensing reasons. The 64-bit version - will be built with MinGW-w64 anyway (at least for now), - so using it also for 32-bit build allows using the same - copyright notice about the MinGW-w64/w32 runtime. - - Note that using MinGW would require a copyright notice too, - because its runtime is not in the public domain either even - though MinGW's home page claims that it is public domain. - See . - - windows/build.bash | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -commit 3ac35719d8433af937af6491383d4a50e343099b -Author: Lasse Collin -Date: 2010-10-09 11:33:21 +0300 - - Windows: Copy COPYING-Windows.txt (if it exists) to the package. - - Also, put README-Windows.txt to the doc directory like - the other documentation files. - - windows/build.bash | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -commit 7b5db576fd7a4a67813b8437a9ccd4dbc94bbaae -Author: Lasse Collin -Date: 2010-10-08 21:42:37 +0300 - - Windows: Fix build.bash again. - - 630a8beda34af0ac153c8051b1bf01230558e422 wasn't good. - - windows/build.bash | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit d3cd7abe85ec7c2f46cf198b15c00d5d119df3dd -Author: Lasse Collin -Date: 2010-10-08 16:53:20 +0300 - - Use LZMA_VERSION_STRING instead of PACKAGE_VERSION. - - Those are the same thing, and the former makes it a bit - easier to build the code with other build systems, because - one doesn't need to update the version number into custom - config.h. - - This change affects only lzmainfo. Other tools were already - using LZMA_VERSION_STRING. - - src/lzmainfo/lzmainfo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 084c60d318f2dbaef4078d9b100b4a373d0c3a7f -Author: Lasse Collin -Date: 2010-10-08 15:59:25 +0300 - - configure.ac: Remove two unused defines. - - configure.ac | 4 ---- - 1 file changed, 4 deletions(-) - -commit 11f51b6714357cb67ec7e56ed9575c199b5581fe -Author: Lasse Collin -Date: 2010-10-08 15:32:29 +0300 - - Make tests accommodate missing xz or xzdec. - - tests/test_compress.sh | 47 ++++++++++++++++++++++++++++++----------------- - tests/test_files.sh | 28 ++++++++++++++++++++++++++-- - 2 files changed, 56 insertions(+), 19 deletions(-) - -commit b1c7368f95e93ccdefdd0748e04398c26766f47f -Author: Lasse Collin -Date: 2010-10-08 15:25:45 +0300 - - Build: Add options to disable individual command line tools. - - configure.ac | 38 ++++++++++++++++++++++++++++++ - src/Makefile.am | 15 +++++++++++- - src/scripts/Makefile.am | 62 +++++++++++++++++++++---------------------------- - src/xz/Makefile.am | 6 ++++- - src/xzdec/Makefile.am | 12 ++++++++-- - 5 files changed, 93 insertions(+), 40 deletions(-) - -commit 630a8beda34af0ac153c8051b1bf01230558e422 -Author: Lasse Collin -Date: 2010-10-07 00:44:53 +0300 - - Windows: Make build.bash work without --enable-dynamic=no. - - windows/build.bash | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit f9907503f882a745dce9d84c2968f6c175ba966a -Author: Lasse Collin -Date: 2010-10-05 14:13:16 +0300 - - Build: Remove the static/dynamic tricks. - - Most distros want xz linked against shared liblzma, so - it doesn't help much to require --enable-dynamic for that. - Those who want to avoid PIC on x86-32 to get better - performance, can still do it e.g. by using --disable-shared - to compile xz and then another pass to compile shared liblzma. - - Part of these static/dynamic tricks were needed for Windows - in the past. Nowadays we rely on GCC and binutils to do the - right thing with auto-import. If the Autotooled build system - needs to support some other toolchain on Windows in the future, - this may need some rethinking. - - configure.ac | 74 ------------------------------------------------ - debug/Makefile.am | 5 +--- - src/lzmainfo/Makefile.am | 4 +-- - src/xz/Makefile.am | 4 +-- - src/xzdec/Makefile.am | 4 +-- - tests/Makefile.am | 5 +--- - 6 files changed, 5 insertions(+), 91 deletions(-) - -commit fda4724d8114fccfa31c1839c15479f350c2fb4c -Author: Lasse Collin -Date: 2010-10-05 12:18:58 +0300 - - configure.ac: Silence a warning from Autoconf 2.68. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 80b5675fa62c87426fe86f8fcd20feeabc4361b9 -Author: Lasse Collin -Date: 2010-10-04 19:43:01 +0300 - - A few more languages files to the xz man page. - - Thanks to Jonathan Nieder. - - src/xz/xz.1 | 45 ++++++++++++++++++++++++--------------------- - 1 file changed, 24 insertions(+), 21 deletions(-) - -commit f9722dbeca4dc4c43cfd15d122dafaac50b0a0bb -Author: Lasse Collin -Date: 2010-10-02 12:07:33 +0300 - - Update the FAQ. - - doc/faq.txt | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 100 insertions(+), 4 deletions(-) - -commit 61ae593661e8dc402394e84d567ca2044a51572b -Author: Lasse Collin -Date: 2010-10-02 11:38:20 +0300 - - liblzma: Small fixes to comments in the API headers. - - src/liblzma/api/lzma/lzma.h | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -commit 9166682dc601fd42c1b9510572e3f917d18de504 -Author: Lasse Collin -Date: 2010-09-28 11:40:12 +0300 - - Create the PDF versions of the man pages better. - - Makefile.am | 14 +++++++------ - build-aux/manconv.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 66 insertions(+), 6 deletions(-) - -commit 17d3c61edd35de8fa884944fc70d1db86daa5dd8 -Author: Lasse Collin -Date: 2010-09-28 10:59:53 +0300 - - Move version.sh to build-aux. - - Makefile.am | 4 ++-- - version.sh => build-aux/version.sh | 0 - configure.ac | 2 +- - windows/build.bash | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 84af9d8770451339a692e9b70f96cf56156a6069 -Author: Lasse Collin -Date: 2010-09-28 10:53:02 +0300 - - Update .gitignore. - - .gitignore | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -commit 31575a449ac64c523da3bab8d0c0b522cdc7c780 -Author: Lasse Collin -Date: 2010-09-28 01:17:14 +0300 - - Fix accomodate -> accommodate on the xz man page. - - src/xz/xz.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit cec0ddc8ec4ce81685a51998b978e22167e461f9 -Author: Lasse Collin -Date: 2010-09-27 23:29:34 +0300 - - Major man page updates. - - Lots of content was updated on the xz man page. - - Technical improvements: - - Start a new sentence on a new line. - - Use fairly short lines. - - Use constant-width font for examples (where supported). - - Some minor cleanups. - - Thanks to Jonathan Nieder for some language fixes. - - src/lzmainfo/lzmainfo.1 | 25 +- - src/scripts/xzdiff.1 | 15 +- - src/scripts/xzgrep.1 | 11 +- - src/scripts/xzless.1 | 13 +- - src/scripts/xzmore.1 | 9 +- - src/xz/xz.1 | 1964 ++++++++++++++++++++++++++++++++--------------- - src/xzdec/xzdec.1 | 39 +- - 7 files changed, 1435 insertions(+), 641 deletions(-) - -commit 075257ab0416a0603be930082e31a5703e4ba345 -Author: Lasse Collin -Date: 2010-09-26 18:10:31 +0300 - - Fix the preset -3e. - - depth=0 was missing. - - src/liblzma/lzma/lzma_encoder_presets.c | 1 + - 1 file changed, 1 insertion(+) - -commit 2577da9ebdba13fbe99ae5ee8bde35f7ed60f6d1 -Author: Lasse Collin -Date: 2010-09-23 14:03:10 +0300 - - Add translations.bash and translation notes to README. - - translations.bash prints some messages from xz, which - hopefully makes it a bit easier to test translations. - - README | 96 +++++++++++++++++++++++++++++++++++++++++++++-- - debug/translation.bash | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 192 insertions(+), 4 deletions(-) - -commit a3c5997c57e5b1a20aae6d1071b584b4f17d0b23 -Author: Lasse Collin -Date: 2010-09-17 22:14:30 +0300 - - xz: Update the Czech translation. - - Thanks to Marek Černocký. - - po/cs.po | 202 +++++++++++++++++++++++++++++++++++++++++---------------------- - 1 file changed, 131 insertions(+), 71 deletions(-) - -commit a1766af582dc23fddd9da1eeb4b9d61e3eb4c2e6 -Author: Lasse Collin -Date: 2010-09-16 23:40:41 +0300 - - xz: Add Italian translation. - - Thanks to Milo Casagrande and Lorenzo De Liso. - - THANKS | 2 + - po/LINGUAS | 1 + - po/it.po | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 905 insertions(+) - -commit 21088018554e2b0e02914205377ceb6e34a090bd -Author: Lasse Collin -Date: 2010-09-15 00:34:13 +0300 - - xz: Edit a translators comment. - - src/xz/list.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit be16e28ece1b492b8f93382b7fa1cc4da23c6ff6 -Author: Lasse Collin -Date: 2010-09-14 22:47:14 +0300 - - xz: Add German translation. - - Thanks to Andre Noll. - - THANKS | 1 + - po/LINGUAS | 1 + - po/de.po | 903 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 905 insertions(+) - -commit e23ea74f3240e6b69683f9e69d1716e0f9e9092b -Author: Lasse Collin -Date: 2010-09-10 14:30:25 +0300 - - Updated README. - - README | 2 -- - 1 file changed, 2 deletions(-) - -commit 8dad2fd69336985adb9f774fa96dc9c0efcb5a71 -Author: Lasse Collin -Date: 2010-09-10 14:30:07 +0300 - - Updated INSTALL. - - INSTALL | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 0b5f07fe3728c27cce416ddc40f7e4803ae96ac2 -Author: Lasse Collin -Date: 2010-09-10 14:26:20 +0300 - - Updated the git repository address in ChangeLog. - - ChangeLog | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a8760203f93a69bc39fd14520a6e9e7b7d70be06 -Author: Lasse Collin -Date: 2010-09-10 14:09:33 +0300 - - xz: Add a comment to translators about "literal context bits". - - src/xz/message.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit bb0b1004f83cdc4d309e1471c2ecaf9f95ce60c5 -Author: Lasse Collin -Date: 2010-09-10 10:30:33 +0300 - - xz: Multiple fixes. - - The code assumed that printing numbers with thousand separators - and decimal points would always produce only US-ASCII characters. - This was used for buffer sizes (with snprintf(), no overflows) - and aligning columns of the progress indicator and --list. That - assumption was wrong (e.g. LC_ALL=fi_FI.UTF-8 with glibc), so - multibyte character support was added in this commit. The old - way is used if the operating system doesn't have enough multibyte - support (e.g. lacks wcwidth()). - - The sizes of buffers were increased to accomodate multibyte - characters. I don't know how big they should be exactly, but - they aren't used for anything critical, so it's not too bad. - If they still aren't big enough, I hopefully get a bug report. - snprintf() takes care of avoiding buffer overflows. - - Some static buffers were replaced with buffers allocated on - stack. double_to_str() was removed. uint64_to_str() and - uint64_to_nicestr() now share the static buffer and test - for thousand separator support. - - Integrity check names "None" and "Unknown-N" (2 <= N <= 15) - were marked to be translated. I had forgot these, plus they - wouldn't have worked correctly anyway before this commit, - because printing tables with multibyte strings didn't work. - - Thanks to Marek Černocký for reporting the bug about - misaligned table columns in --list output. - - configure.ac | 1 + - m4/tuklib_mbstr.m4 | 30 ++++++ - src/common/tuklib_mbstr.h | 66 +++++++++++++ - src/common/tuklib_mbstr_fw.c | 31 ++++++ - src/common/tuklib_mbstr_width.c | 64 +++++++++++++ - src/xz/Makefile.am | 4 +- - src/xz/list.c | 205 +++++++++++++++++++++++++++------------- - src/xz/message.c | 56 +++++++---- - src/xz/message.h | 10 +- - src/xz/private.h | 1 + - src/xz/util.c | 136 +++++++++----------------- - src/xz/util.h | 7 -- - 12 files changed, 424 insertions(+), 187 deletions(-) - -commit 639f8e2af33cf8a184d59ba56b6df7c098679d61 -Author: Lasse Collin -Date: 2010-09-08 08:49:22 +0300 - - Update the Czech translation. - - Thanks to Marek Černocký. - - po/cs.po | 655 +++++++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 454 insertions(+), 201 deletions(-) - -commit 41bc9956ebfd7c86777d33676acf34c45e7ca7c7 -Author: Lasse Collin -Date: 2010-09-07 12:31:40 +0300 - - xz: Add a note to translators. - - src/xz/hardware.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 77a7746616e555fc08028e883a56d06bf0088b81 -Author: Lasse Collin -Date: 2010-09-07 10:42:13 +0300 - - Fix use of N_() and ngettext(). - - I had somehow thought that N_() is usually used - as shorthand for ngettext(). - - This also fixes a missing \n from a call to ngettext(). - - src/common/tuklib_gettext.h | 4 ++-- - src/xz/list.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit e6ad39335842343e622ab51207d1d3cb9caad801 -Author: Lasse Collin -Date: 2010-09-06 19:43:12 +0300 - - Add missing files to POTFILES.in. - - po/POTFILES.in | 3 +++ - 1 file changed, 3 insertions(+) - -commit 58f55131820d2e08a1a6beb9ec0ee2378044eb30 -Author: Lasse Collin -Date: 2010-09-06 10:16:24 +0300 - - xz: Improve a comment. - - src/xz/file_io.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit bcb1b898341f7073f51660d7052d7ed6c5461a66 -Author: Lasse Collin -Date: 2010-09-05 21:34:29 +0300 - - xz: Update the comment about NetBSD in file_io.c. - - Thanks to Joerg Sonnenberger. - - src/xz/file_io.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit da014d55972f5addbf6b4360d3d8ed2ef4282170 -Author: Lasse Collin -Date: 2010-09-05 21:11:33 +0300 - - xz: Use an array instead of pointer for stdin_filename. - - Thanks Joerg Sonnenberger. - - src/xz/args.c | 2 +- - src/xz/args.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 8c7d3d1a0781c296c6b6e2465becaffd2132f7ee -Author: Lasse Collin -Date: 2010-09-05 12:16:17 +0300 - - xz: Hopefully ease translating the messages in list.c. - - src/xz/list.c | 33 +++++++++++++++++++++++---------- - 1 file changed, 23 insertions(+), 10 deletions(-) - -commit ef840950ad99cf2955c754875af0e01acf125079 -Author: Lasse Collin -Date: 2010-09-04 23:14:44 +0300 - - xz: Fix grammar. - - src/xz/options.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit c46afd6edc04ea140db6c59e8486f5707c810c13 -Author: Lasse Collin -Date: 2010-09-04 23:12:20 +0300 - - xz: Use lzma_lzma_preset() to initialize the options structure. - - src/xz/options.c | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -commit 8fd3ac046d0b1416a2094fecc456d9e0f4d5d065 -Author: Lasse Collin -Date: 2010-09-04 22:16:28 +0300 - - Don't set lc=4 with --extreme. - - This should reduce the cases where --extreme makes - compression worse. On the other hand, some other - files may now benefit slightly less from --extreme. - - src/liblzma/lzma/lzma_encoder_presets.c | 1 - - 1 file changed, 1 deletion(-) - -commit 474bac0c33e94aeaca8ada17ab19972b1424bc2b -Author: Lasse Collin -Date: 2010-09-04 22:10:32 +0300 - - xz: Minor improvements to --help and --long-help. - - src/xz/message.c | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -commit 373ee26f955617295c5c537b04a153a1969140d2 -Author: Jonathan Nieder -Date: 2010-09-03 16:49:15 -0500 - - Adjust memory limits in test_compress.sh - - Testing compression at level -4 now requires 48 MiB of free store at - compression time and 5 MiB at decompression time. - - Signed-off-by: Jonathan Nieder - - tests/test_compress.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2fce9312f36727ea82f3430cc5d3a7d243c5f087 -Author: Lasse Collin -Date: 2010-09-03 15:54:40 +0300 - - xz: Make -vv show also decompressor memory usage. - - src/xz/coder.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit b4b1cbcb53624ab832f8b3189c74450dc7ea29b6 -Author: Lasse Collin -Date: 2010-09-03 15:13:12 +0300 - - Tweak the compression presets -0 .. -5. - - "Extreme" mode might need some further tweaking still. - Docs were not updated yet. - - src/liblzma/lzma/lzma_encoder_presets.c | 29 +++++++++++++++++++---------- - 1 file changed, 19 insertions(+), 10 deletions(-) - -commit 77fe5954cd3d10fb1837372684cbc133b56b6a87 -Author: Lasse Collin -Date: 2010-09-03 12:28:41 +0300 - - liblzma: Adjust default depth calculation for HC3 and HC4. - - It was 8 + nice_len / 4, now it is 4 + nice_len / 4. - This allows faster settings at lower nice_len values, - even though it seems that I won't use automatic depth - calcuation with HC3 and HC4 in the presets. - - src/liblzma/lz/lz_encoder.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit fce69059cf901ce8075a78c7607d591f144a3b5a -Author: Lasse Collin -Date: 2010-09-03 11:11:25 +0300 - - xz: Make --help two lines shorter. - - At least for now, the --help option doesn't list any - options that take arguments, so "Mandatory arguments to..." - can be omitted. - - src/xz/message.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -commit a848e47ced6e5e2a564b5c454b2f5a19c2f40298 -Author: Lasse Collin -Date: 2010-09-02 19:22:35 +0300 - - xz: Make setting a preset override a custom filter chain. - - This is more logical behavior than ignoring preset level - options once a custom filter chain has been specified. - - src/xz/coder.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit b3ff7ba044eaeab3e424d7b51fe914daf681b1a3 -Author: Lasse Collin -Date: 2010-09-02 19:09:57 +0300 - - xz: Always warn if adjusting dictionary size due to memlimit. - - src/xz/coder.c | 28 +++++++++------------------- - 1 file changed, 9 insertions(+), 19 deletions(-) - -commit d5653ba8a1ea9c00de4fddc617aba3c51e18139d -Author: Lasse Collin -Date: 2010-08-10 11:04:30 +0300 - - Fix test_compress.sh. - - It broke when --memory option was removed from xzdec. - - Thanks to Jonathan Nieder. - - tests/test_compress.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 792331bdee706aa852a78b171040ebf814c6f3ae -Author: Lasse Collin -Date: 2010-08-07 20:45:18 +0300 - - Disable the memory usage limiter by default. - - For several people, the limiter causes bigger problems that - it solves, so it is better to have it disabled by default. - Those who want to have a limiter by default need to enable - it via the environment variable XZ_DEFAULTS. - - Support for environment variable XZ_DEFAULTS was added. It is - parsed before XZ_OPT and technically identical with it. The - intended uses differ quite a bit though; see the man page. - - The memory usage limit can now be set separately for - compression and decompression using --memlimit-compress and - --memlimit-decompress. To set both at once, -M or --memlimit - can be used. --memory was retained as a legacy alias for - --memlimit for backwards compatibility. - - The semantics of --info-memory were changed in backwards - incompatible way. Compatibility wasn't meaningful due to - changes in the memory usage limiter functionality. - - The memory usage limiter info is no longer shown at the - bottom of xz --long -help. - - The memory usage limiter support for removed completely from xzdec. - - xz's man page was updated to match the above changes. Various - unrelated fixes were also made to the man page. - - src/xz/args.c | 87 +++++++++----- - src/xz/coder.c | 8 +- - src/xz/hardware.c | 96 +++++++++------ - src/xz/hardware.h | 23 ++-- - src/xz/list.c | 2 +- - src/xz/message.c | 39 ++----- - src/xz/message.h | 4 - - src/xz/xz.1 | 341 ++++++++++++++++++++++++++++++++++-------------------- - src/xzdec/xzdec.1 | 45 +------ - src/xzdec/xzdec.c | 176 +--------------------------- - 10 files changed, 373 insertions(+), 448 deletions(-) - -commit 4a45dd4c39f75d25c7a37b6400cb24d4010ca801 -Author: Lasse Collin -Date: 2010-08-06 20:22:16 +0300 - - Add missing const to a global constant in xz. - - src/xz/args.c | 2 +- - src/xz/args.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 01aa4869cb220b7fdad6d1acbabb2233045daa8f -Author: Lasse Collin -Date: 2010-07-28 11:44:55 +0300 - - Language fixes for man pages. - - Thanks to A. Costa and Jonathan Nieder. - - src/lzmainfo/lzmainfo.1 | 4 ++-- - src/xz/xz.1 | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit ce1f0deafe8504e1492bf1b1efb3e3ec950b1a2b -Author: Lasse Collin -Date: 2010-07-27 20:47:12 +0300 - - Windows: Add a note about building a Git repository snapshot - - windows/INSTALL-Windows.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit 507a4a4dea1e5462f12f7ed4b076c34e02054a38 -Author: Lasse Collin -Date: 2010-07-27 20:45:03 +0300 - - Windows: build.sh is a bash script so name it correctly. - - INSTALL | 2 +- - windows/INSTALL-Windows.txt | 6 +++--- - windows/{build.sh => build.bash} | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit b1cbfd40f049a646a639eb78a3e41e9e3ef73339 -Author: Lasse Collin -Date: 2010-07-27 20:27:32 +0300 - - Windows: Don't strip liblzma.a too much. - - windows/build.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit a540198ffb25fad36380c5e92ac20c2d28eec46a -Author: Lasse Collin -Date: 2010-07-13 20:07:26 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit bab0f01ed931f606b4675aa9f9331a17cec09bad -Author: Lasse Collin -Date: 2010-07-13 19:55:50 +0300 - - Add two simple example programs. - - Hopefully these help a bit when learning the basics - of liblzma API. I plan to write detailed examples about - both basic and advanced features with lots of comments, - but these two examples are good have right now. - - The examples were written by Daniel Mealha Cabrita. Thanks. - - doc/examples/xz_pipe_comp.c | 127 ++++++++++++++++++++++++++++++++++++++++++ - doc/examples/xz_pipe_decomp.c | 115 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 242 insertions(+) - -commit c15c42abb3c8c6e77c778ef06c97a4a10b8b5d00 -Author: Lasse Collin -Date: 2010-06-15 14:06:29 +0300 - - Add --no-adjust. - - src/xz/args.c | 6 ++++++ - src/xz/coder.c | 8 ++------ - src/xz/coder.h | 4 ++++ - src/xz/message.c | 6 +++++- - src/xz/xz.1 | 13 +++++++++++-- - 5 files changed, 28 insertions(+), 9 deletions(-) - -commit 2130926dd1c839280358172dfadd8d3054bde2b4 -Author: Lasse Collin -Date: 2010-06-11 21:51:32 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit bc612d0e0c9e4504c59d49168e87a7ae3e458443 -Author: Lasse Collin -Date: 2010-06-11 21:48:32 +0300 - - Clarify the description of the default memlimit in the man page. - - Thanks to Denis Excoffier. - - src/xz/xz.1 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit e1b6935d60a00405e6b5b455a3426d2248cc926c -Author: Lasse Collin -Date: 2010-06-11 21:43:28 +0300 - - Fix string to uint64_t conversion. - - Thanks to Denis Excoffier for the bug report. - - src/xz/util.c | 10 ++++++++-- - src/xzdec/xzdec.c | 13 +++++++++++-- - 2 files changed, 19 insertions(+), 4 deletions(-) - -commit 3e49c8acb0f5312948eddb2342dbb5802d4571d0 -Author: Lasse Collin -Date: 2010-06-11 10:40:28 +0300 - - Put the git commit to the filename in mydist rule. - - Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit d8b41eedce486d400f701b757b7b5e4e32276618 -Author: Lasse Collin -Date: 2010-06-02 23:13:55 +0300 - - Fix compiling with -Werror. - - src/xz/message.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit b5fbab6123a39c9a55cd5d7af410e9aae067d5f8 -Author: Lasse Collin -Date: 2010-06-02 23:09:22 +0300 - - Silence a bogus Valgrind warning. - - When using -O2 with GCC, it liked to swap two comparisons - in one "if" statement. It's otherwise fine except that - the latter part, which is seemingly never executed, got - executed (nothing wrong with that) and then triggered - warning in Valgrind about conditional jump depending on - uninitialized variable. A few people find this annoying - so do things a bit differently to avoid the warning. - - src/liblzma/lz/lz_encoder.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 29a7b250e685852f2f97615493ec49acaf528623 -Author: Lasse Collin -Date: 2010-06-02 21:32:12 +0300 - - Fix a Windows-specific FIXME in signal handling code. - - src/xz/main.c | 40 +++++++++++++++++++++++++++++++++++----- - src/xz/private.h | 5 +++++ - src/xz/signals.c | 16 ++++++++-------- - 3 files changed, 48 insertions(+), 13 deletions(-) - -commit e89d987056cee7d4e279be3ef3a6cc690bfc0e6d -Author: Lasse Collin -Date: 2010-06-02 17:46:58 +0300 - - Adjust SA_RESTART workaround. - - I want to get a bug report if something else than - DJGPP lacks SA_RESTART. - - src/xz/message.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -commit e243145c84ab5c3be8259fd486ead0de5235b3f0 -Author: Lasse Collin -Date: 2010-06-01 16:02:30 +0300 - - xz man page updates. - - - Concatenating .xz files and padding - - List mode - - Robot mode - - A few examples (but many more are needed) - - src/xz/xz.1 | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 366 insertions(+), 19 deletions(-) - -commit ce6dc3c0a891f23a862f80ec08d3b6f0beb2a562 -Author: Lasse Collin -Date: 2010-06-01 15:51:44 +0300 - - Major update to xz --list. - - src/xz/list.c | 652 ++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 471 insertions(+), 181 deletions(-) - -commit 905e54804a899e4ad526d38fdba7e803ab9b71bd -Author: Lasse Collin -Date: 2010-06-01 14:13:03 +0300 - - Rename message_filters_get() to message_filters_to_str(). - - src/xz/message.c | 4 ++-- - src/xz/message.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 4b346ae8af20045027ae5efb068c6d69da3324d2 -Author: Lasse Collin -Date: 2010-06-01 14:09:12 +0300 - - Fix a comment. - - src/liblzma/api/lzma/index.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 07dc34f6da45c9ab757dad7fd5eef522ad27d296 -Author: Lasse Collin -Date: 2010-05-27 16:17:42 +0300 - - Fix lzma_block_compressed_size(). - - src/liblzma/common/block_util.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 44d70cb154225e47eebf15a3cfbdf3794cbb4593 -Author: Lasse Collin -Date: 2010-05-27 14:32:51 +0300 - - Take Cygwin into account in some #if lines. - - This change is no-op, but good to have just in case - for the future. - - src/xz/signals.c | 2 +- - src/xz/signals.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit a334348dc02803241cf4e0a539eecdc0e7ad2cc7 -Author: Lasse Collin -Date: 2010-05-27 13:42:44 +0300 - - Remove references to the Subblock filter in xz and tests. - - Thanks to Jonathan Nieder. - - src/xz/message.c | 9 --------- - tests/test_filter_flags.c | 23 ----------------------- - 2 files changed, 32 deletions(-) - -commit 70e5e2f6a7084e6af909deee88ceac2f6efa7893 -Author: Lasse Collin -Date: 2010-05-27 13:35:36 +0300 - - Remove unused chunk_size.c. - - Thanks to Jonathan Nieder for the reminder. - - src/liblzma/common/chunk_size.c | 67 ----------------------------------------- - 1 file changed, 67 deletions(-) - -commit 01a414eaf4be6352c06b48001b041b47e8202faa -Author: Jonathan Nieder -Date: 2010-05-27 02:31:33 -0500 - - Use my_min() instead of MIN() in src/xz/list.c - - This should have been done in - 920a69a8d8e4203c5edddd829d932130eac188ea. - - src/xz/list.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 920a69a8d8e4203c5edddd829d932130eac188ea -Author: Lasse Collin -Date: 2010-05-26 10:36:46 +0300 - - Rename MIN() and MAX() to my_min() and my_max(). - - This should avoid some minor portability issues. - - debug/full_flush.c | 2 +- - debug/sync_flush.c | 2 +- - src/common/sysdefs.h | 12 +++++------- - src/liblzma/common/block_buffer_encoder.c | 2 +- - src/liblzma/common/common.c | 2 +- - src/liblzma/common/stream_buffer_encoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 2 +- - src/liblzma/lz/lz_decoder.c | 7 ++++--- - src/liblzma/lz/lz_decoder.h | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - src/liblzma/lz/lz_encoder_mf.c | 4 ++-- - src/liblzma/lzma/lzma2_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 14 +++++++------- - src/xz/args.c | 3 ++- - 16 files changed, 31 insertions(+), 31 deletions(-) - -commit 019ae27c24d0c694545a6a46f8b9fb552198b015 -Author: Lasse Collin -Date: 2010-05-26 10:30:20 +0300 - - Fix compilation of debug/known_sizes.c. - - debug/known_sizes.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 98a4856a6ea84f79c790057a6eb89a25bc45b074 -Author: Lasse Collin -Date: 2010-05-26 10:28:54 +0300 - - Remove references to Subblock filter in debug/sync_flush.c. - - debug/sync_flush.c | 13 ------------- - 1 file changed, 13 deletions(-) - -commit 703d2c33c095c41ae0693ee8c27c45e3847e4535 -Author: Lasse Collin -Date: 2010-05-26 10:16:57 +0300 - - Better #error message. - - src/common/sysdefs.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit d8a55c48b39703dd83f11089ad01e1ff2ac102e0 -Author: Lasse Collin -Date: 2010-05-26 09:55:47 +0300 - - Remove the Subblock filter code for now. - - The spec isn't finished and the code didn't compile anymore. - It won't be included in XZ Utils 5.0.0. It's easy to get it - back once the spec is done. - - configure.ac | 6 +- - src/liblzma/Makefile.am | 5 - - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/subblock.h | 200 ----- - src/liblzma/common/common.h | 6 - - src/liblzma/common/filter_common.c | 9 - - src/liblzma/common/filter_decoder.c | 16 - - src/liblzma/common/filter_encoder.c | 12 - - src/liblzma/subblock/Makefile.inc | 20 - - src/liblzma/subblock/subblock_decoder.c | 630 ---------------- - src/liblzma/subblock/subblock_decoder.h | 22 - - src/liblzma/subblock/subblock_decoder_helper.c | 70 -- - src/liblzma/subblock/subblock_decoder_helper.h | 29 - - src/liblzma/subblock/subblock_encoder.c | 984 ------------------------- - src/liblzma/subblock/subblock_encoder.h | 21 - - src/xz/args.c | 9 +- - src/xz/options.c | 61 -- - src/xz/options.h | 7 - - 19 files changed, 4 insertions(+), 2105 deletions(-) - -commit b6377fc990f9b8651149cae0fecb8b9c5904e26d -Author: Lasse Collin -Date: 2010-05-16 18:42:22 +0300 - - Split message_filters(). - - message_filters_to_str() converts the filter chain to - a string. message_filters_show() replaces the original - message_filters(). - - uint32_to_optstr() was also added to show the dictionary - size in nicer format when possible. - - src/xz/coder.c | 2 +- - src/xz/message.c | 187 +++++++++++++++++++++++++++++++++++-------------------- - src/xz/message.h | 14 ++++- - 3 files changed, 134 insertions(+), 69 deletions(-) - -commit d9986db782d6cf0f314342127280519339378fa0 -Author: Lasse Collin -Date: 2010-05-14 23:17:20 +0300 - - Omit lzma_restrict from the API headers. - - It isn't really useful so omitting it makes things - shorter and slightly more readable. - - src/liblzma/api/lzma.h | 12 ------------ - src/liblzma/api/lzma/index.h | 5 ++--- - src/liblzma/api/lzma/vli.h | 11 +++++------ - 3 files changed, 7 insertions(+), 21 deletions(-) - -commit 0d3489efca0a723dca0394809fa3e6170843af4b -Author: Lasse Collin -Date: 2010-05-10 19:57:24 +0300 - - Updated INSTALL. - - INSTALL | 5 ----- - 1 file changed, 5 deletions(-) - -commit 3fb3d594a2b53886adee161b6261e92277f05f7c -Author: Lasse Collin -Date: 2010-05-10 19:54:52 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 6548e304657e77d3a972053db3c41c5daf591113 -Author: Lasse Collin -Date: 2010-05-10 19:54:15 +0300 - - Updates to tuklib_physmem and tuklib_cpucores. - - Don't use #error to generate compile error, because some - compilers actually don't take it as an error. This fixes - tuklib_physmem on IRIX. - - Fix incorrect error check for sysconf() return values. - - Add AIX, HP-UX, and Tru64 specific code to detect the - amount RAM. - - Add HP-UX specific code to detect the number of CPU cores. - - Thanks a lot to Peter O'Gorman for initial patches, - testing, and debugging these fixes. - - m4/tuklib_cpucores.m4 | 33 ++++++++++++++++---- - m4/tuklib_physmem.m4 | 72 ++++++++++++++++++++++++++++++++++++++++++-- - src/common/tuklib_cpucores.c | 14 +++++++-- - src/common/tuklib_physmem.c | 33 +++++++++++++++++++- - 4 files changed, 141 insertions(+), 11 deletions(-) - -commit a290cfee3e23f046889c022aa96b4eca2016fdda -Author: Lasse Collin -Date: 2010-04-12 21:55:56 +0300 - - Show both elapsed time and estimated remaining time in xz -v. - - The extra space for showing both has been taken from the - sizes field. If the sizes grow big, bigger units than MiB - will be used. It makes it slightly difficult to see that - progress is still happening with huge files, but it should - be OK in practice. - - Thanks to Trent W. Buck for - and Jonathan Nieder for suggestions how to fix it. - - THANKS | 1 + - src/xz/message.c | 86 +++++++++++++++++++++++++------------------------------- - 2 files changed, 39 insertions(+), 48 deletions(-) - -commit a1f7a986b8d708f9290da9799ca1b8d7082fad3e -Author: Lasse Collin -Date: 2010-03-31 16:47:25 +0300 - - Add a simple tip to faq.txt about tar and xz. - - Thanks to Gilles Espinasse. - - THANKS | 1 + - doc/faq.txt | 6 ++++++ - 2 files changed, 7 insertions(+) - -commit c737eec91d200d730aa82662affd6b06ebb0bff0 -Author: Lasse Collin -Date: 2010-03-22 21:03:03 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit f4b2b52624b802c786e4e2a8eb6895794dd93b24 -Author: Lasse Collin -Date: 2010-03-07 19:52:25 +0200 - - Fix xzgrep to not break if filenames have spaces or quotes. - - Thanks to someone who reported the bug on IRC. - - src/scripts/xzgrep.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit cf38da00a140bd3bd65b192390ae5553380fd774 -Author: Lasse Collin -Date: 2010-03-07 13:59:32 +0200 - - Treat all integer multiplier suffixes as base-2. - - Originally both base-2 and base-10 were supported, but since - there seems to be little need for base-10 in XZ Utils, treat - everything as base-2 and also be more relaxed about the case - of the first letter of the suffix. Now xz will accept e.g. - KiB, Ki, k, K, kB, and KB, and interpret them all as 1024. The - recommended spelling of the suffixes are still KiB, MiB, and GiB. - - src/xz/util.c | 53 +++++++++++++++++++++++------------------------------ - src/xz/xz.1 | 48 ++++++++++++++++++++++++++++-------------------- - src/xzdec/xzdec.c | 42 ++++++++++++++++-------------------------- - 3 files changed, 67 insertions(+), 76 deletions(-) - -commit 00fc1211ae7b687ac912098f4479112059deccbd -Author: Lasse Collin -Date: 2010-03-07 13:50:23 +0200 - - Consistently round up the memory usage limit in messages. - - It still feels a bit wrong to round 1 byte to 1 MiB but - at least it is now done consistently so that the same - byte value is always rounded the same way to MiB. - - src/xz/message.c | 5 +++-- - src/xzdec/xzdec.c | 7 +++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -commit 9886d436ff5615fc70eef32ff757b1e934069621 -Author: Lasse Collin -Date: 2010-03-07 13:34:34 +0200 - - Change the default of --enable-assume-ram from 32 to 128 MiB. - - This is to allow files created with "xz -9" to be decompressed - if the amount of RAM cannot be determined. - - INSTALL | 5 ++--- - configure.ac | 11 ++++++----- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit 2672bcc9f85ba28ff648e092e9eb4cd9e69ce418 -Author: Lasse Collin -Date: 2010-03-07 13:29:28 +0200 - - Increase the default memory usage limit on "low-memory" systems. - - Previously the default limit was always 40 % of RAM. The - new limit is a little bit more complex: - - - If 40 % of RAM is at least 80 MiB, 40 % of RAM is used - as the limit. - - - If 80 % of RAM is over 80 MiB, 80 MiB is used as the limit. - - - Otherwise 80 % of RAM is used as the limit. - - This should make it possible to decompress files created with - "xz -9" on more systems. Swapping is generally more expected - on systems with less RAM, so higher default limit on them - shouldn't cause too bad surprises in terms of heavy swapping. - Instead, the higher default limit should reduce the number of - bad surprises when it used to prevent decompression of files - created with "xz -9". The DoS prevention system shouldn't be - a DoS itself. - - Note that even with the new default limit, a system with 64 MiB - RAM cannot decompress files created with "xz -9" without user - overriding the limit. This should be OK, because if xz is going - to need more memory than the system has RAM, it will run very - very slowly and thus it's good that user has to override the limit - in that case. - - src/xz/hardware.c | 43 +++++++++++++++++++++++++++++++------------ - src/xz/xz.1 | 21 +++++++++++++++------ - src/xzdec/xzdec.1 | 8 ++++---- - src/xzdec/xzdec.c | 42 ++++++++++++++++++++++++++++++------------ - 4 files changed, 80 insertions(+), 34 deletions(-) - -commit 5527b7269a997e7f335d60f237a64bbf225d9dc7 -Author: Lasse Collin -Date: 2010-03-06 21:36:19 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit d0d1c51aea4351288a7e533cce28cb7f852f6b05 -Author: Lasse Collin -Date: 2010-03-06 21:17:20 +0200 - - Fix missing initialization in lzma_strm_init(). - - With bad luck, lzma_code() could return LZMA_BUF_ERROR - when it shouldn't. - - This has been here since the early days of liblzma. - It got triggered by the modifications made to the xz - tool in commit 18c10c30d2833f394cd7bce0e6a821044b15832f - but only when decompressing .lzma files. Somehow I managed - to miss testing that with Valgrind earlier. - - This fixes . - Thanks to Rafał Mużyło for helping to debug it on IRC. - - src/liblzma/common/common.c | 1 + - 1 file changed, 1 insertion(+) - -commit eb7d51a3faf9298c0c7aa9aaeae1023dcf9e37ea -Author: Lasse Collin -Date: 2010-02-12 13:16:15 +0200 - - Collection of language fixes to comments and docs. - - Thanks to Jonathan Nieder. - - README | 2 +- - configure.ac | 2 +- - doc/faq.txt | 2 +- - extra/7z2lzma/7z2lzma.bash | 2 +- - src/common/tuklib_progname.c | 2 +- - src/common/tuklib_progname.h | 2 +- - src/liblzma/api/lzma/base.h | 8 ++++---- - src/liblzma/api/lzma/bcj.h | 2 +- - src/liblzma/api/lzma/block.h | 2 +- - src/liblzma/api/lzma/check.h | 2 +- - src/liblzma/api/lzma/filter.h | 4 ++-- - src/liblzma/api/lzma/index.h | 6 +++--- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - src/liblzma/api/lzma/vli.h | 2 +- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/chunk_size.c | 4 ++-- - src/liblzma/common/common.h | 4 ++-- - src/liblzma/common/filter_buffer_decoder.c | 2 +- - src/liblzma/common/filter_encoder.c | 4 ++-- - src/liblzma/common/index.c | 6 +++--- - src/liblzma/common/index_encoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - src/liblzma/lzma/lzma2_encoder.c | 2 +- - src/liblzma/lzma/lzma_decoder.c | 4 ++-- - src/liblzma/lzma/lzma_decoder.h | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/subblock/subblock_encoder.c | 2 +- - src/scripts/xzdiff.1 | 2 +- - src/scripts/xzless.1 | 10 +++++----- - src/xz/coder.c | 2 +- - src/xz/file_io.c | 2 +- - src/xz/main.c | 6 +++--- - src/xz/main.h | 2 +- - src/xz/message.c | 10 +++++----- - src/xz/message.h | 2 +- - src/xz/xz.1 | 16 ++++++++-------- - src/xzdec/lzmadec_w32res.rc | 2 +- - src/xzdec/xzdec_w32res.rc | 2 +- - tests/test_index.c | 2 +- - windows/build.sh | 4 ++-- - 47 files changed, 77 insertions(+), 77 deletions(-) - -commit 4785f2021aa6a23f1caf724fcc823e562584f225 -Author: Lasse Collin -Date: 2010-02-12 12:41:20 +0200 - - Fix jl -> jb in ASM files. - - src/liblzma/check/crc32_x86.S | 2 +- - src/liblzma/check/crc64_x86.S | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 6b50c9429bf85521d355adc61745d06ee017f8c8 -Author: Lasse Collin -Date: 2010-02-12 12:31:22 +0200 - - Use __APPLE__ instead of __MACH__ in ASM files. - - This allows the files to work on HURD. - - Thanks to Jonathan Nieder. - - src/liblzma/check/crc32_x86.S | 8 ++++---- - src/liblzma/check/crc64_x86.S | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit 6503fde658a5cdbdd907a788865470dd64771601 -Author: Lasse Collin -Date: 2010-02-07 19:48:06 +0200 - - Subtle change to liblzma Block handling API. - - lzma_block.version has to be initialized even for - lzma_block_header_decode(). This way a future version - of liblzma won't allocate memory in a way that an old - application doesn't know how to free it. - - The subtlety of this change is that all current apps - using lzma_block_header_decode() will keep working for - now, because the only possible version value is zero, - and lzma_block_header_decode() unconditionally sets the - version to zero even now. Unless fixed, these apps will - break in the future if a new version of the Block options - is ever needed. - - src/liblzma/api/lzma/block.h | 39 ++++++++++++++++--------------------- - src/liblzma/common/stream_decoder.c | 3 +++ - 2 files changed, 20 insertions(+), 22 deletions(-) - -commit dd7c3841ff78cb94ce02b0220c6e4748460970f7 -Author: Lasse Collin -Date: 2010-02-02 11:50:11 +0200 - - Fix wrong assertion. - - This was added in 455e68c030fde8a8c2f5e254c3b3ab9489bf3735. - - src/xz/main.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -commit 9d67588c1597849504a3e5ac8bf6f06e7d2ee8be -Author: Lasse Collin -Date: 2010-02-01 22:48:42 +0200 - - Updated TODO. - - TODO | 4 ---- - 1 file changed, 4 deletions(-) - -commit fef6333f52c8801308c3b78acb7942988541d137 -Author: Lasse Collin -Date: 2010-02-01 22:47:54 +0200 - - Fix typos in comments. - - src/xz/list.c | 2 +- - windows/build.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 455e68c030fde8a8c2f5e254c3b3ab9489bf3735 -Author: Lasse Collin -Date: 2010-02-01 22:46:56 +0200 - - Fix signal handling for --list. - - src/xz/main.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -commit 82220a149015616f75641ee8bbea415137535b9b -Author: Lasse Collin -Date: 2010-02-01 11:44:45 +0200 - - Fix compression of symlinks with --force. - - xz --force accepted symlinks, but didn't remove - them after successful compression. Instead, an error - message was displayed. - - src/xz/file_io.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -commit d4da177d5ba3d2ef7323a6f1e06ca16e0478810e -Author: Lasse Collin -Date: 2010-02-01 10:20:57 +0200 - - Fix a comment. - - windows/build.sh | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -commit f9dd797a423a148903cf345b4146cb1fe1eab11d -Author: Lasse Collin -Date: 2010-01-31 23:43:54 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit ee5ddb8b28419fe4923ded5c18a50570a762dcab -Author: Lasse Collin -Date: 2010-01-31 23:41:29 +0200 - - Updated TODO. - - TODO | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -commit 11936ad3f5a2e97bda3463c7a56a2f4bb9265ea6 -Author: Lasse Collin -Date: 2010-01-31 23:35:04 +0200 - - Mention TODO in README. - - README | 1 + - 1 file changed, 1 insertion(+) - -commit 2901a8e7e82af05675b8cd8758a8ceddb111359f -Author: Lasse Collin -Date: 2010-01-31 23:31:14 +0200 - - Updated INSTALL. - - INSTALL | 52 ++++++++++++++++++++++++++-------------------------- - 1 file changed, 26 insertions(+), 26 deletions(-) - -commit 8884e16864ba53fb4b58623d7537d7ef30c28e11 -Author: Lasse Collin -Date: 2010-01-31 23:28:51 +0200 - - Revise the Windows build files. - - The old Makefile + config.h was deleted, because it - becomes outdated too easily and building with the - Autotools based build system works fine even on Windows. - - windows/build.sh hasn't got much testing, but it should - work to build 32-bit x86 and x86-64 versions of XZ Utils - using MSYS, MinGW or MinGW-w32, and MinGW-w64. - - windows/INSTALL-Windows.txt describes what packages are - needed and how to install them. - - windows/README-Windows.txt is a readme file for the binary - package that build.sh hopefully builds. - - There are no instructions about using Autotools for now, - so those using a git snapshot may want to run - "autoreconf -fi && ./configure && make mydist" on a UN*X - box and then copy the resulting .tar.gz to a Windows. - - windows/INSTALL-Windows.txt | 131 ++++++++++++++++++ - windows/Makefile | 320 -------------------------------------------- - windows/README | 155 --------------------- - windows/README-Windows.txt | 115 ++++++++++++++++ - windows/build.sh | 189 ++++++++++++++++++++++++++ - windows/config.h | 170 ----------------------- - 6 files changed, 435 insertions(+), 645 deletions(-) - -commit 34eb5e201d62f7f46bbe6fe97cfe08cb31b3b88c -Author: Lasse Collin -Date: 2010-01-31 19:52:38 +0200 - - Select the default integrity check type at runtime. - - Previously it was set statically to CRC64 or CRC32 - depending on options passed to the configure script. - - src/xz/coder.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -commit 96a4f840e3b9ca5c81e5711ff9c267b194f93ef1 -Author: Lasse Collin -Date: 2010-01-31 18:17:50 +0200 - - Improve displaying of the memory usage limit. - - src/xz/coder.c | 8 +++----- - src/xz/message.c | 37 +++++++++++++++++++++++++++++-------- - src/xz/util.c | 7 +++++++ - src/xz/util.h | 6 ++++++ - 4 files changed, 45 insertions(+), 13 deletions(-) - -commit b3cc4d8edd68a0250cc69680c99b9f7343f99cf2 -Author: Lasse Collin -Date: 2010-01-31 12:53:56 +0200 - - Don't use uninitialized sigset_t. - - If signal handlers haven't been established, then it's - useless to try to block them, especially since the sigset_t - used for blocking hasn't been initialized yet. - - src/xz/signals.c | 34 ++++++++++++++++++++++++---------- - 1 file changed, 24 insertions(+), 10 deletions(-) - -commit 231c3c7098f1099a56abb8afece76fc9b8699f05 -Author: Lasse Collin -Date: 2010-01-31 12:01:54 +0200 - - Delay opening the destionation file and other fixes. - - The opening of the destination file is now delayed a little. - The coder is initialized, and if decompressing, the memory - usage of the first Block compared against the memory - usage limit before the destination file is opened. This - means that if --force was used, the old "target" file won't - be deleted so easily when something goes wrong very early. - Thanks to Mark K for the bug report. - - The above fix required some changes to progress message - handling. Now there is a separate function for setting and - printing the filename. It is used also in list.c. - - list_file() now handles stdin correctly (gives an error). - - A useless check for user_abort was removed from file_io.c. - - src/xz/coder.c | 64 ++++++++++++++++++++++----------- - src/xz/file_io.c | 107 +++++++++++++++++++++++++++---------------------------- - src/xz/file_io.h | 8 +++-- - src/xz/list.c | 28 +++++---------- - src/xz/message.c | 46 +++++++++++++----------- - src/xz/message.h | 29 ++++++++++----- - 6 files changed, 157 insertions(+), 125 deletions(-) - -commit 0dbd0641db99d5e73d51d04ce7a71e52dc6b4105 -Author: Lasse Collin -Date: 2010-01-29 22:48:04 +0200 - - Add list.h to src/xz/Makefile.am. - - This should have been already in - 0bc9eab243dee3be764b3530433a7fcdc3f7c6a1. - - src/xz/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit b4b1a56e0cbd597157858264f5c7189201ac9018 -Author: Lasse Collin -Date: 2010-01-29 13:24:27 +0200 - - Add lzmainfo.1 to manfiles list to convert to .txt and .pdf. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 5574d64e03ad3a3d6e00e4b0d3e81c7b5529ec95 -Author: Lasse Collin -Date: 2010-01-27 16:42:11 +0200 - - Silence two compiler warnings on DOS-like systems. - - src/common/tuklib_open_stdxxx.c | 6 +++++- - src/xz/file_io.c | 3 +++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -commit b063cc34a30a4edf109343ff373b2b62b8ca72d3 -Author: Lasse Collin -Date: 2010-01-27 13:31:03 +0200 - - Use PACKAGE_URL instead of custom PACKAGE_HOMEPAGE. - - configure.ac | 9 ++------- - src/liblzma/liblzma.pc.in | 2 +- - src/lzmainfo/lzmainfo.c | 2 +- - src/xz/message.c | 2 +- - src/xzdec/xzdec.c | 2 +- - 5 files changed, 6 insertions(+), 11 deletions(-) - -commit 38b8035b5cb5f56457c5fa5a891d6900fcf5984f -Author: Lasse Collin -Date: 2010-01-26 23:37:46 +0200 - - Add a missing space to an error message. - - Thanks to Robert Readman. - - src/xz/args.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e5496f9628ff5979392a80421d0b63a4de8015b4 -Author: Lasse Collin -Date: 2010-01-26 22:53:37 +0200 - - Use past tense in error message in io_unlink(). - - Added a note to translators too. - - Thanks to Robert Readman. - - THANKS | 1 + - src/xz/file_io.c | 14 ++++++++++++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -commit d9a9800597ea540090e434132c3b511217df0a2b -Author: Lasse Collin -Date: 2010-01-26 15:42:24 +0200 - - Fix too small static buffer in util.c. - - This was introduced in - 0dd6d007669b946543ca939a44243833c79e08f4 two days ago. - - src/xz/util.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -commit d0b4bbf5da068503c099cd456e294d7673548cc0 -Author: Lasse Collin -Date: 2010-01-26 14:46:43 +0200 - - Minor comment fix. - - src/xz/main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 0bc9eab243dee3be764b3530433a7fcdc3f7c6a1 -Author: Lasse Collin -Date: 2010-01-24 23:50:54 +0200 - - Add initial version of xz --list. - - This is a bit rough but should be useful for basic things. - Ideas (with detailed examples) about the output format are - welcome. - - The output of --robot --list is not necessarily stable yet, - although I don't currently have any plans about changing it. - - The man page hasn't been updated yet. - - src/xz/Makefile.am | 1 + - src/xz/list.c | 988 ++++++++++++++++++++++++++++++++++------------------- - src/xz/list.h | 18 + - src/xz/main.c | 19 +- - src/xz/private.h | 1 + - 5 files changed, 668 insertions(+), 359 deletions(-) - -commit df254ce03be016e217b511e7acd5d493f9929ca5 -Author: Lasse Collin -Date: 2010-01-24 22:46:11 +0200 - - Add io_pread(). - - It will be used by --list. - - src/xz/file_io.c | 25 +++++++++++++++++++++++++ - src/xz/file_io.h | 17 +++++++++++++++++ - 2 files changed, 42 insertions(+) - -commit ef68dd4a92976276304de2aedfbe34ae91a86abb -Author: Lasse Collin -Date: 2010-01-24 22:45:14 +0200 - - Set LC_NUMERIC=C when --robot is used. - - It is to ensure that floating point numbers - will always have a dot as the decimal separator. - - src/xz/args.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 0dd6d007669b946543ca939a44243833c79e08f4 -Author: Lasse Collin -Date: 2010-01-24 16:57:40 +0200 - - Some improvements to printing sizes in xz. - - src/xz/coder.c | 56 +++++++++++++++------------------------ - src/xz/message.c | 80 ++++++++++++++++++-------------------------------------- - src/xz/message.h | 4 +++ - src/xz/util.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/util.h | 44 +++++++++++++++++++++++++++++++ - 5 files changed, 166 insertions(+), 90 deletions(-) - -commit 2a98fdffd68c66371279c211c29153c808ad5c1d -Author: Lasse Collin -Date: 2010-01-20 22:02:35 +0200 - - Fix a typo in README. - - Thanks to R. Bijker. - - README | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 07a11dad44e041b01dcfc73e8d4e00731158c06d -Author: Lasse Collin -Date: 2010-01-17 11:59:54 +0200 - - Updated windows/Makefile. - - Thanks to Dan Shechter for the patch. - - It is likely that windows/Makefile will be removed - completely, because Autotols based build nowadays - works well with both 32-bit and 64-bit MinGW (I - just need to update the docs). - - windows/Makefile | 38 +++++++++++++++++++++++++------------- - windows/config.h | 2 ++ - 2 files changed, 27 insertions(+), 13 deletions(-) - -commit 37f31ead9d2b4e467df11450cf29ed7d7e3e25f3 -Author: Lasse Collin -Date: 2010-01-15 11:05:11 +0200 - - Update the xz man page to match the previous two commits. - - src/xz/xz.1 | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -commit 3ffd5d81a43210c8da56da5c5b3637d3f8bc63c7 -Author: Lasse Collin -Date: 2010-01-13 19:10:25 +0200 - - Don't read compressed data from a terminal or write it - to a terminal even if --force is specified. - - It just seems more reasonable this way. - - The new behavior matches bzip2. The old one matched gzip. - - src/xz/main.c | 20 +++++++++----------- - src/xz/util.c | 8 ++++---- - 2 files changed, 13 insertions(+), 15 deletions(-) - -commit 23ac2c44c3ac76994825adb7f9a8f719f78b5ee4 -Author: Lasse Collin -Date: 2010-01-13 18:12:40 +0200 - - Don't compress or decompress special files unless writing - to stdout even if --force is used. - - --force will still enable compression of symlinks, but only - in case they point to a regular file. - - The new way simply seems more reasonable. It matches gzip's - behavior while the old one matched bzip2's behavior. - - src/xz/file_io.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -commit cee12aa852ec0902983dc1f153346ef750157fb9 -Author: Lasse Collin -Date: 2010-01-12 16:30:33 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 153c7740c54b3c90129dbd3d6153ac1303c4d605 -Author: Lasse Collin -Date: 2010-01-12 16:18:14 +0200 - - Add IRIX-specific code to tuklib_physmem and tuklib_cpucores. - - This is untested but it will get tested soon and, if needed, - fixed before 5.0.0. - - Thanks to Stuart Shelton. - - m4/tuklib_cpucores.m4 | 11 +++++++++-- - m4/tuklib_physmem.m4 | 22 +++++++++++++++++++++- - src/common/tuklib_cpucores.c | 6 ++++++ - src/common/tuklib_physmem.c | 19 +++++++++++++++++++ - 4 files changed, 55 insertions(+), 3 deletions(-) - -commit 8ea8dc754a7a5bc2d60db1eac201839cabdab6a1 -Author: Lasse Collin -Date: 2010-01-01 00:29:10 +0200 - - Fix _memconfig() functions. - - This affects lzma_memusage() and lzma_memlimit_get(). - - src/liblzma/api/lzma/index.h | 7 ------- - src/liblzma/common/alone_decoder.c | 11 +++++++---- - src/liblzma/common/index_decoder.c | 10 ++++++---- - src/liblzma/common/stream_decoder.c | 11 +++++++---- - 4 files changed, 20 insertions(+), 19 deletions(-) - -commit 1a7ec87c8ee61dfc2e496d2e1fb7ab0939804691 -Author: Lasse Collin -Date: 2009-12-31 22:45:53 +0200 - - Revised the Index handling code. - - This breaks API and ABI but most apps are not affected - since most apps don't use this part of the API. You will - get a compile error if you are using anything that got - broken. - - Summary of changes: - - - Ability to store Stream Flags, which are needed - for random-access reading in multi-Stream files. - - - Separate function to set size of Stream Padding. - - - Iterator structure makes it possible to read the same - lzma_index from multiple threads at the same time. - - - A lot faster code to locate Blocks. - - - Removed lzma_index_equal() without adding anything - to replace it. I don't know what it should do exactly - with the new features and what actually needs this - function in the first place other than test_index.c, - which now has its own code to compare lzma_indexes. - - src/liblzma/api/lzma/index.h | 572 +++++++--- - src/liblzma/common/index.c | 1553 ++++++++++++++++++---------- - src/liblzma/common/index.h | 6 + - src/liblzma/common/index_decoder.c | 12 +- - src/liblzma/common/index_encoder.c | 36 +- - src/liblzma/common/index_encoder.h | 2 +- - src/liblzma/common/stream_buffer_encoder.c | 6 +- - src/liblzma/common/stream_encoder.c | 3 +- - tests/test_index.c | 371 ++++--- - 9 files changed, 1703 insertions(+), 858 deletions(-) - -commit f29997a846e673cb3b8cbd57de47ed313b3978bb -Author: Lasse Collin -Date: 2009-12-31 21:13:25 +0200 - - Remove c-format tag in cs.po. - - It was fixed in the C code earlier. - - po/cs.po | 1 - - 1 file changed, 1 deletion(-) - -commit 097bad000363e0bf29f8274ad2d7ab59f7dbf644 -Author: Lasse Collin -Date: 2009-12-31 21:11:05 +0200 - - Add missing lzma_nothrow in filter.h. - - src/liblzma/api/lzma/filter.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit b56cb1fc31fa2381f92eefc040df85667048d626 -Author: Lasse Collin -Date: 2009-12-09 18:13:44 +0200 - - Remove redefinition of _(msgid) macro from lzmainfo.c. - - src/lzmainfo/lzmainfo.c | 7 ------- - 1 file changed, 7 deletions(-) - -commit 171b03febfe09d9fae6ac8be6aa4518bcaf427d2 -Author: Jonathan Nieder -Date: 2009-12-08 19:41:57 -0600 - - update po/.gitignore - - Since the *.gmo files are deleted by the maintainer-clean target, - I assume they are not meant to be tracked. - - Also add the other files listed in the Makefile’s clean targets - (stamp-poT, xz.po, xz.[12].po, *.new.po, xz.mo) to make sure they - are not accidentally tracked. Most of these are intermediate - files that would not appear unless a build is interrupted or - fails. - - Split the list of untracked files by origin to make it easier to - tell if files are missing in the future. - - Signed-off-by: Jonathan Nieder - - po/.gitignore | 28 ++++++++++++++++++++++------ - 1 file changed, 22 insertions(+), 6 deletions(-) - -commit f7e44c6c11f630519072971b8b07a5729c096c36 -Author: Lasse Collin -Date: 2009-12-09 00:38:55 +0200 - - Always rely on GCC's auto-import on Windows. - - I understood that this is nicer, because then people - don't need to worry about the LZMA_API_STATIC macro. - - Thanks to Charles Wilson and Keith Marshall. - - src/liblzma/api/lzma.h | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -commit 7b76a3e2336f25088957cba92b0dbd854d9caa3c -Author: Lasse Collin -Date: 2009-12-07 21:46:53 +0200 - - Fix file_io.c on DOS-like systems. - - The problem was introduced when adding sparse file - support in 465d1b0d6518c5d980f2db4c2d769f9905bdd902. - - Thanks to Charles Wilson. - - src/xz/file_io.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 0696f5d268362221380e039bad48a86e29067c6a -Author: Lasse Collin -Date: 2009-12-07 20:54:21 +0200 - - Add Czech translation. - - Thanks to Marek Černocký. - - Other people planning to translate xz: Note that the - messages are a little bit in flux still. Translations - are still welcome, just be prepared to some extra work - in case there are changes. - - THANKS | 1 + - po/LINGUAS | 1 + - po/cs.po | 637 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 639 insertions(+) - -commit 5e817a50d276f0a3607638c1c1d449d50b9aa4e5 -Author: Lasse Collin -Date: 2009-12-07 20:32:08 +0200 - - Add a note for translators to add a bug reporting address - for translation bugs. - - src/xz/message.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 6db1c35be9e1e364cdacff6878910e1b7aac2a37 -Author: Lasse Collin -Date: 2009-12-07 20:07:02 +0200 - - Prevent xgettext from taking one regular string as a C format string. - - Thanks to Marek Černocký. - - src/xz/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e0c2776b6ffbd2b1900fde353aceac734edc93d7 -Author: Lasse Collin -Date: 2009-11-28 17:45:22 +0200 - - Remove duplicate code in io_open_dest(). - - Fix a missing _() in the error message too. - - src/xz/file_io.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -commit f057a33c6f7c5992389479f2d4feabf2900ba7ee -Author: Lasse Collin -Date: 2009-11-26 10:11:23 +0200 - - Typo fix to sysdefs.h. - - Thanks to Jonathan Nieder. - - src/common/sysdefs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8767b41534eafdf5e742e12190646bf5740b0cdb -Author: Lasse Collin -Date: 2009-11-26 10:10:36 +0200 - - Fix a memory leak in test_index.c. - - This was introduced in - bd13b04e202b6f495a68eb0766f97085b7c50a06. - - Thanks to Jim Meyering for noticing it. - - tests/test_index.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 919fbaff860acdaa4bcd216500a0b1c960a6db92 -Author: Lasse Collin -Date: 2009-11-25 14:22:19 +0200 - - Add missing error check to coder.c. - - With bad luck this could cause a segfault due to - reading (but not writing) past the end of the buffer. - - src/xz/coder.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit bd13b04e202b6f495a68eb0766f97085b7c50a06 -Author: Lasse Collin -Date: 2009-11-25 13:04:10 +0200 - - Fix bugs in lzma_index_read() and lzma_index_cat(). - - lzma_index_read() didn't skip over Stream Padding - if it was the first record in the Index. - - lzma_index_cat() didn't combine small Indexes correctly. - - The test suite was updated to check for these bugs. - - These bugs didn't affect the xz command line tool or - most users of liblzma in any way. - - src/liblzma/common/index.c | 30 +++++++++++++++++++----------- - tests/test_index.c | 28 +++++++++++++++++++++++++--- - 2 files changed, 44 insertions(+), 14 deletions(-) - -commit 1f196909143b888e062bd9a0c4ba8c34d3019bfa -Author: Lasse Collin -Date: 2009-11-25 12:52:56 +0200 - - Index decoder fixes. - - The Index decoder code didn't perfectly match the API docs, - which said that *i will be set to point to the decoded Index - only after decoding has succeeded. The docs were a bit unclear - too. - - Now the decoder will initially set *i to NULL. *i will be set - to point to the decoded Index once decoding has succeeded. - This simplifies applications too, since it avoids dangling - pointers. - - src/liblzma/api/lzma/index.h | 23 ++++++++++++----------- - src/liblzma/common/index_decoder.c | 26 ++++++++++++++++++++------ - 2 files changed, 32 insertions(+), 17 deletions(-) - -commit 465d1b0d6518c5d980f2db4c2d769f9905bdd902 -Author: Lasse Collin -Date: 2009-11-25 11:19:20 +0200 - - Create sparse files by default when decompressing into - a regular file. - - Sparse file creation can be disabled with --no-sparse. - I don't promise yet that the name of this option won't - change before 5.0.0. It's possible that the code, that - checks when it is safe to use sparse output on stdout, - is not good enough, and a more flexible command line - option is needed to configure sparse file handling. - - src/xz/args.c | 6 ++ - src/xz/coder.c | 33 ++++---- - src/xz/file_io.c | 243 +++++++++++++++++++++++++++++++++++++++++++++++-------- - src/xz/file_io.h | 34 ++++++-- - src/xz/message.c | 1 + - src/xz/xz.1 | 11 +++ - 6 files changed, 272 insertions(+), 56 deletions(-) - -commit 37de544414fc2dc5039471d1002ebd015eb3e627 -Author: Lasse Collin -Date: 2009-11-22 12:43:06 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit f1a28b96c900c658fe016852ff62f6c24d1f50fa -Author: Lasse Collin -Date: 2009-11-22 12:05:33 +0200 - - Add missing consts to pointer casts. - - src/liblzma/check/crc32_fast.c | 4 ++-- - src/liblzma/check/crc64_fast.c | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef -Author: Lasse Collin -Date: 2009-11-22 12:00:30 +0200 - - Enable assembler code only if it is known to work - on that operating system. - - I'm too lazy to think how to make a good Autoconf test - for this and it's not that important anyway. - - No longer define HAVE_ASM_X86 or HAVE_ASM_X86_64. - Inline assembler (if any) is used if a macro like - __i386__ or __x86_64__ is defined. - - configure.ac | 26 ++++++++++++-------------- - 1 file changed, 12 insertions(+), 14 deletions(-) - -commit 0733f4c9994db696420a405810d5f02c79ebc404 -Author: Lasse Collin -Date: 2009-11-22 11:55:03 +0200 - - Make fastpos.h use tuklib_integer.h instead of bsr.h - when --enable-small has been specified. - - src/liblzma/common/Makefile.inc | 1 - - src/liblzma/common/bsr.h | 60 ----------------------------------------- - src/liblzma/lzma/fastpos.h | 5 +--- - 3 files changed, 1 insertion(+), 65 deletions(-) - -commit 7ac3985d891dcc5773543f84cc5bce6c14841b12 -Author: Lasse Collin -Date: 2009-11-22 11:52:30 +0200 - - Update tuklib_integer.h with bit scan functions. - - Thanks to Joachim Henke for the original patch. - - src/common/tuklib_integer.h | 189 ++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 181 insertions(+), 8 deletions(-) - -commit c74c132f7f79a842c073c66575a4fdb985e4c2e3 -Author: Lasse Collin -Date: 2009-11-20 12:51:19 +0200 - - Update tuklib_cpucores.m4 and tuklib_physmem.m4 from tuklib, - which now use AC_CACHE_CHECK. Using the cache variable, - configure now warns if there is no method to detect the amount - of RAM and recommends using --enable-assume-ram. - - configure.ac | 16 ++++++++++++++++ - m4/tuklib_cpucores.m4 | 31 ++++++++++++++++++------------- - m4/tuklib_physmem.m4 | 50 +++++++++++++++++++++++++++----------------------- - 3 files changed, 61 insertions(+), 36 deletions(-) - -commit d315ca4930ff96e1428c6021c96f209e1abdd83e -Author: Lasse Collin -Date: 2009-11-16 18:16:45 +0200 - - Add support for --info-memory and --robot to xz. - - Currently --robot works only with --info-memory and - --version. --help and --long-help work too, but --robot - has no effect on them. - - Thanks to Jonathan Nieder for the original patches. - - src/xz/args.c | 85 +++++++++++++++++++++++++++++++++----------------------- - src/xz/args.h | 1 + - src/xz/main.c | 11 +++++--- - src/xz/message.c | 47 +++++++++++++++++++++++-------- - src/xz/message.h | 4 +++ - src/xz/xz.1 | 40 +++++++++++++++++++++++--- - 6 files changed, 133 insertions(+), 55 deletions(-) - -commit e330fb7e6b8162894280c8a3dc22fdc05cd2d85e -Author: Lasse Collin -Date: 2009-11-15 12:54:45 +0200 - - Fix wrong indentation caused by incorrect settings - in the text editor. - - src/liblzma/lz/lz_decoder.c | 18 +++++++++--------- - src/liblzma/lzma/lzma2_encoder.c | 6 +++--- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- - 3 files changed, 13 insertions(+), 13 deletions(-) - -commit 93e418562cf127a9171e87bcd4e9af8e1bfcdae4 -Author: Lasse Collin -Date: 2009-11-15 12:40:17 +0200 - - Add lzma_physmem(). - - I had hoped to keep liblzma as purely a compression - library as possible (e.g. file I/O will go into - a different library), but it seems that applications - linking agaisnt liblzma need some way to determine - the memory usage limit, and knowing the amount of RAM - is one reasonable way to help making such decisions. - - Thanks to Jonathan Nieder for the original patch. - - src/liblzma/Makefile.am | 5 ++-- - src/liblzma/api/Makefile.am | 1 + - src/liblzma/api/lzma.h | 3 +++ - src/liblzma/api/lzma/hardware.h | 51 +++++++++++++++++++++++++++++++++++ - src/liblzma/common/Makefile.inc | 1 + - src/liblzma/common/hardware_physmem.c | 25 +++++++++++++++++ - src/xz/Makefile.am | 1 - - src/xz/hardware.c | 3 +-- - src/xzdec/Makefile.am | 6 ++--- - src/xzdec/xzdec.c | 3 +-- - 10 files changed, 88 insertions(+), 11 deletions(-) - -commit cf39faca59083d38422058c6c97aa757ea7797d0 -Author: Lasse Collin -Date: 2009-11-14 20:21:19 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 2ddcae247c284cc2f396b6cfdab57790c7588b5f -Author: Lasse Collin -Date: 2009-11-14 20:20:03 +0200 - - Some updates to xz man page. - - src/xz/xz.1 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 49 insertions(+), 5 deletions(-) - -commit 19b2674f07f8b588dfaf6638396b4b42866d7e23 -Author: Lasse Collin -Date: 2009-11-14 19:51:03 +0200 - - Fix description of --memory in --long-help. - - src/xz/message.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -commit 2291346f0cccf88e605d84b75c9c5aaaaddb5df8 -Author: Lasse Collin -Date: 2009-11-14 19:45:39 +0200 - - Update the debug programs so that they compile again. - - debug/crc32.c | 1 + - debug/memusage.c | 6 ++++-- - debug/sync_flush.c | 14 +++++++++----- - 3 files changed, 14 insertions(+), 7 deletions(-) - -commit 418d64a32e8144210f98a810738fed5a897e8367 -Author: Lasse Collin -Date: 2009-11-14 18:59:19 +0200 - - Fix a design error in liblzma API. - - Originally the idea was that using LZMA_FULL_FLUSH - with Stream encoder would read the filter chain - from the same array that was used to intialize the - Stream encoder. Since most apps wouldn't use - LZMA_FULL_FLUSH, most apps wouldn't need to keep - the filter chain available after initializing the - Stream encoder. However, due to my mistake, it - actually required keeping the array always available. - - Since setting the new filter chain via the array - used at initialization time is not a nice way to do - it for a couple of reasons, this commit ditches it - and introduces lzma_filters_update(). This new function - replaces also the "persistent" flag used by LZMA2 - (and to-be-designed Subblock filter), which was also - an ugly thing to do. - - Thanks to Alexey Tourbin for reminding me about the problem - that Stream encoder used to require keeping the filter - chain allocated. - - src/liblzma/api/lzma/filter.h | 30 +++++++++++++ - src/liblzma/api/lzma/lzma.h | 13 ------ - src/liblzma/common/block_encoder.c | 14 ++++++ - src/liblzma/common/common.c | 20 ++++++++- - src/liblzma/common/common.h | 22 ++++++++++ - src/liblzma/common/easy_encoder.c | 63 ++------------------------- - src/liblzma/common/filter_common.c | 3 ++ - src/liblzma/common/filter_encoder.c | 27 ++++++++++++ - src/liblzma/common/filter_encoder.h | 2 +- - src/liblzma/common/stream_encoder.c | 76 ++++++++++++++++++++++++++++----- - src/liblzma/delta/delta_common.c | 5 +-- - src/liblzma/delta/delta_decoder.c | 3 +- - src/liblzma/delta/delta_encoder.c | 17 +++++++- - src/liblzma/delta/delta_private.h | 2 +- - src/liblzma/lz/lz_encoder.c | 17 ++++++++ - src/liblzma/lz/lz_encoder.h | 4 ++ - src/liblzma/lzma/lzma2_encoder.c | 59 ++++++++++++++----------- - src/liblzma/lzma/lzma_encoder_presets.c | 1 - - src/liblzma/simple/simple_coder.c | 12 ++++++ - src/xz/options.c | 1 - - 20 files changed, 273 insertions(+), 118 deletions(-) - -commit f0bf7634b77263a4dd02b20c71861ab67995da68 -Author: Lasse Collin -Date: 2009-10-17 11:11:58 +0300 - - Fix wrong function name in the previous commit. - - It was meant to be lzma_filters_copy(), not lzma_filters_dup(). - - src/liblzma/api/lzma/filter.h | 2 +- - src/liblzma/common/filter_common.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 6d118a0b9def82e96afba7386ec8d7da0b59649f -Author: Lasse Collin -Date: 2009-10-17 01:47:07 +0300 - - Add lzma_filters_copy(). - - This will be needed internally by liblzma once I fix - a design mistake in the encoder API. This function may - be useful to applications too so it's good to export it. - - src/liblzma/api/lzma/filter.h | 31 ++++++++++++++ - src/liblzma/common/filter_common.c | 82 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 113 insertions(+) - -commit 78e92c18470483e161388e679c1ee556adb3a691 -Author: Jonathan Nieder -Date: 2009-10-15 20:44:13 -0500 - - Escape dashes in xzmore.1 - - A minus sign is larger, easier to see in a printout, and more - likely to use the same glyph as ASCII hyphen-minus in a terminal - than a hyphen. Since broken manual pagers do not find hyphens - when the user searches for a hyphen-minus, minus signs are also - easier to search for. So use minus signs instead of hyphens to - render sample terminal output. - - src/scripts/xzmore.1 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 7b7fe902d98da28e5769e2aa1e0c08c92384f7ee -Author: Lasse Collin -Date: 2009-10-16 20:35:39 +0300 - - Mention --check=none in --long-help. It was already in - the man page though. - - Thanks to Jim Meyering for noticing this. - - src/xz/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24 -Author: Lasse Collin -Date: 2009-10-04 22:57:12 +0300 - - Use a tuklib module for integer handling. - - This replaces bswap.h and integer.h. - - The tuklib module uses on GNU, - on *BSDs and - on Solaris, which may contain optimized code - like inline assembly. - - configure.ac | 54 +---- - m4/tuklib_integer.m4 | 74 +++++++ - src/common/bswap.h | 52 ----- - src/common/integer.h | 170 --------------- - src/common/tuklib_config.h | 8 +- - src/common/tuklib_integer.h | 350 ++++++++++++++++++++++++++++++ - src/liblzma/check/check.c | 4 +- - src/liblzma/check/crc32_fast.c | 4 +- - src/liblzma/check/crc32_tablegen.c | 8 +- - src/liblzma/check/crc64_fast.c | 4 +- - src/liblzma/check/crc64_tablegen.c | 8 +- - src/liblzma/check/crc_macros.h | 2 - - src/liblzma/check/sha256.c | 18 +- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/common/block_header_decoder.c | 2 +- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/common.h | 2 +- - src/liblzma/common/stream_flags_decoder.c | 6 +- - src/liblzma/common/stream_flags_encoder.c | 6 +- - src/liblzma/lz/lz_encoder_hash.h | 2 +- - src/liblzma/lzma/lzma_decoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/simple/simple_decoder.c | 2 +- - src/liblzma/simple/simple_encoder.c | 2 +- - tests/test_block_header.c | 4 +- - tests/test_stream_flags.c | 6 +- - tests/tests.h | 2 +- - 28 files changed, 467 insertions(+), 333 deletions(-) - -commit 29fd321033276261b87da7be5223db33d879a4c7 -Author: Lasse Collin -Date: 2009-10-02 14:35:56 +0300 - - Add support for --enable-assume-ram=SIZE. - - INSTALL | 16 ++++++++++++++++ - configure.ac | 24 ++++++++++++++++++++++++ - src/xz/hardware.c | 7 +++---- - src/xzdec/xzdec.c | 5 +++-- - 4 files changed, 46 insertions(+), 6 deletions(-) - -commit 3782b3fee4812b0dd4ffdfa6563ed49f73060f25 -Author: Lasse Collin -Date: 2009-10-02 11:28:17 +0300 - - Use unaligned access (if possible) on both endiannesses - in lz_encoder_hash.h. - - src/liblzma/lz/lz_encoder_hash.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit c5f68b5cc79085a87f950fea53843e27f328068e -Author: Lasse Collin -Date: 2009-10-02 11:03:26 +0300 - - Make liblzma produce the same output on both endiannesses. - - Seems that it is a problem in some cases if the same - version of XZ Utils produces different output on different - endiannesses, so this commit fixes that problem. The output - will still vary between different XZ Utils versions, but I - cannot avoid that for now. - - This commit bloatens the code on big endian systems by 1 KiB, - which should be OK since liblzma is bloated already. ;-) - - src/liblzma/check/crc32_tablegen.c | 30 +++++++++++++++ - src/liblzma/lz/Makefile.inc | 1 + - src/liblzma/lz/lz_encoder.c | 7 +++- - src/liblzma/lz/lz_encoder_hash.h | 35 +++++++++++------ - src/liblzma/lz/lz_encoder_hash_table.h | 68 ++++++++++++++++++++++++++++++++++ - src/liblzma/lz/lz_encoder_mf.c | 1 - - 6 files changed, 128 insertions(+), 14 deletions(-) - -commit 4a84d1adfda35e4fb4d41ecf0feb8223b100517a -Author: Mike Frysinger -Date: 2009-09-26 12:51:50 -0400 - - add lzmainfo to gitignore - - Signed-off-by: Mike Frysinger - - .gitignore | 2 ++ - 1 file changed, 2 insertions(+) - -commit 188a1dcd0cc7867810ed3a55c598d0680922c63b -Author: Lasse Collin -Date: 2009-09-27 11:53:36 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit db9119b9181b307e7ac5d2bae82444d04b902b59 -Author: Lasse Collin -Date: 2009-09-27 11:48:54 +0300 - - Work around a bug in Interix header files. - - Thanks to Markus Duft for the patch. - - src/common/sysdefs.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit b3d105e69786a45963176fd2193abe75e05ba738 -Author: Lasse Collin -Date: 2009-09-24 17:50:17 +0300 - - Fix an error in OpenVMS-specific code. - - Thanks to Jouk Jansen. - - src/xz/file_io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 5e000ff00d4d01e559397b49eb648ad3f159d496 -Author: Lasse Collin -Date: 2009-09-22 18:59:56 +0300 - - Added OpenVMS-specific information to INSTALL. - - INSTALL | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -commit 932b2e204463d70f3eee5b8a1ea5a23bf9d001a4 -Author: Lasse Collin -Date: 2009-09-22 14:03:02 +0300 - - Better fixes for OpenVMS support. - - Thanks to Jouk Jansen. - - src/xz/file_io.c | 19 ++++++++++++++++--- - 1 file changed, 16 insertions(+), 3 deletions(-) - -commit 4c3630ec4179fe9265407a35c4db1374ffc82372 -Author: Lasse Collin -Date: 2009-09-22 13:40:19 +0300 - - Avoid non-standard preprocessor construct. - - Thanks to Jouk Jansen. - - src/common/tuklib_common.h | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -commit 0deb1bb60addd1306b525e0ac0ad2a84eb0390d9 -Author: Lasse Collin -Date: 2009-09-21 19:50:09 +0300 - - Make sure that TUKLIB_DOSLIKE doesn't get defined on Cygwin. - - Thanks to Charles Wilson. - - src/common/tuklib_common.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit e599bba4216c0edb8cc8f40adad3a6dba88685f4 -Author: Lasse Collin -Date: 2009-09-19 09:47:30 +0300 - - Various changes. - - Separate a few reusable components from XZ Utils specific - code. The reusable code is now in "tuklib" modules. A few - more could be separated still, e.g. bswap.h. - - Fix some bugs in lzmainfo. - - Fix physmem and cpucores code on OS/2. Thanks to Elbert Pol - for help. - - Add OpenVMS support into physmem. Add a few #ifdefs to ease - building XZ Utils on OpenVMS. Thanks to Jouk Jansen for the - original patch. - - THANKS | 1 + - configure.ac | 12 +-- - m4/lc_physmem.m4 | 84 --------------- - m4/tuklib_common.m4 | 22 ++++ - m4/{lc_cpucores.m4 => tuklib_cpucores.m4} | 83 ++++++++------ - m4/tuklib_physmem.m4 | 119 +++++++++++++++++++++ - m4/tuklib_progname.m4 | 25 +++++ - src/common/sysdefs.h | 4 - - src/common/tuklib_common.h | 67 ++++++++++++ - src/common/tuklib_config.h | 1 + - src/common/{cpucores.h => tuklib_cpucores.c} | 39 +++---- - src/common/tuklib_cpucores.h | 23 ++++ - src/common/tuklib_exit.c | 57 ++++++++++ - src/common/tuklib_exit.h | 25 +++++ - src/common/tuklib_gettext.h | 44 ++++++++ - src/common/{open_stdxxx.h => tuklib_open_stdxxx.c} | 24 +++-- - src/common/tuklib_open_stdxxx.h | 23 ++++ - src/common/{physmem.h => tuklib_physmem.c} | 58 +++++----- - src/common/tuklib_physmem.h | 28 +++++ - src/common/tuklib_progname.c | 50 +++++++++ - src/common/tuklib_progname.h | 32 ++++++ - src/lzmainfo/Makefile.am | 5 +- - src/lzmainfo/lzmainfo.c | 65 ++++------- - src/xz/Makefile.am | 7 +- - src/xz/args.c | 8 +- - src/xz/file_io.c | 43 ++++---- - src/xz/hardware.c | 8 +- - src/xz/main.c | 100 ++++------------- - src/xz/main.h | 7 -- - src/xz/message.c | 30 +++--- - src/xz/message.h | 8 +- - src/xz/private.h | 11 +- - src/xz/signals.c | 2 + - src/xz/signals.h | 17 ++- - src/xz/suffix.c | 2 +- - src/xzdec/Makefile.am | 13 ++- - src/xzdec/xzdec.c | 55 +++------- - 37 files changed, 768 insertions(+), 434 deletions(-) - -commit 49cfc8d392cf535f8dd10233225b1fc726fec9ef -Author: Lasse Collin -Date: 2009-09-15 21:07:23 +0300 - - Fix incorrect use of "restrict". - - src/liblzma/api/lzma/vli.h | 4 ++-- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/common/vli_encoder.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit 15ffd675ab7af84592eb1c23b0e9f4699aa0fd8c -Author: Lasse Collin -Date: 2009-09-12 14:09:17 +0300 - - Fix GCC version check for nothrow attribute. - - src/liblzma/api/lzma.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6bfdd3a88a819f04c8f202e7d3c6f88a01c7d224 -Author: Lasse Collin -Date: 2009-09-12 14:08:15 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 4ab7b16b9573bdfa32279e4adadff684d5cd58ac -Author: Lasse Collin -Date: 2009-09-12 14:07:36 +0300 - - A few grammar fixes. - - Thanks to Christian Weisgerber for pointing out some of these. - - src/liblzma/api/lzma.h | 4 ++-- - src/liblzma/api/lzma/vli.h | 4 ++-- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/lz/lz_encoder.h | 10 +++++----- - src/xz/message.c | 22 +++++++++++----------- - src/xzdec/xzdec.c | 2 +- - 7 files changed, 23 insertions(+), 23 deletions(-) - -commit 8905a33daadcd2d6557c83c81c490b827d566c94 -Author: Lasse Collin -Date: 2009-09-11 17:08:15 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 68059334ff435300ab1ce2c616b0eee1b0d88dd9 -Author: Lasse Collin -Date: 2009-09-11 17:06:32 +0300 - - Add PACKAGE_HOMEPAGE to {windows,dos}/config.h to fix build errors. - - dos/config.h | 3 +++ - windows/config.h | 3 +++ - 2 files changed, 6 insertions(+) - -commit 221be761f467da76875247bc02d7a1716682075d -Author: Lasse Collin -Date: 2009-09-11 10:24:09 +0300 - - Use $(LN_EXEEXT) in symlinks to executables. - - This fixes "make install" on operating systems using - a suffix for executables. - - Cygwin is treated specially. The symlink names won't have - .exe suffix even though the executables themselves have. - Thanks to Charles Wilson. - - configure.ac | 9 +++++++++ - src/xz/Makefile.am | 4 ++-- - 2 files changed, 11 insertions(+), 2 deletions(-) - -commit 18a4233a53d9b82abac7db7d7804684c5fea9c2c -Author: Lasse Collin -Date: 2009-09-11 09:25:09 +0300 - - Fix a couple of warnings. - - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 5 +---- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 8 ++++---- - tests/tests.h | 2 +- - 5 files changed, 8 insertions(+), 11 deletions(-) - -commit 429910b2ba67611d8df60d1a9da9641bdb5f82b4 -Author: Lasse Collin -Date: 2009-09-05 18:39:21 +0300 - - Add OS/2-specific code to physmem.h. - - Also move DJGPP-specific code near the code meant - for other DOS-like systems. - - src/common/physmem.h | 32 +++++++++++++++++++++----------- - 1 file changed, 21 insertions(+), 11 deletions(-) - -commit 7aca7b3174bcbba4a4915682ff0cd405d63f5740 -Author: Lasse Collin -Date: 2009-09-05 01:21:15 +0300 - - Updated THANKS. - - THANKS | 2 ++ - 1 file changed, 2 insertions(+) - -commit 60ccb80c9c4a0d771acc5b7d9d6f32b17fed1071 -Author: Lasse Collin -Date: 2009-09-05 01:20:29 +0300 - - Use sysctl() != -1 instead of !sysctl() to check if - the function call succeeded. - - NetBSD 4.0 returns positive values on success, but - NetBSD Current and FreeBSD return zero. OpenBSD's - man page doesn't tell what sysctl() returns on - success. All these BSDs return -1 on error. - - Thanks to Robert Elz and Thomas Klausner. - - src/common/cpucores.h | 2 +- - src/common/physmem.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 173368911cf09ab0b03fc4db8f3d4b81d86dce32 -Author: Lasse Collin -Date: 2009-09-02 09:43:51 +0300 - - Mention in INSTALL that --enable-small doesn't modify CFLAGS. - - INSTALL | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 319a0fd7d7e9ebbb71ca6930abfc20777cb4aacc -Author: Lasse Collin -Date: 2009-09-01 20:40:01 +0300 - - Refactored option parsing. - - src/xz/options.c | 70 ++++++++++++++++++++++++++++---------------------------- - 1 file changed, 35 insertions(+), 35 deletions(-) - -commit 25adaaa56e2e51a47a910a8d73452414619a2e53 -Author: Lasse Collin -Date: 2009-09-01 20:23:30 +0300 - - Fix options parsing bug in xz. - - xz used to reject "xz --lzma2=pb=2," while - "xz --lzma2=pb=2,," worked. Now both work. - - src/xz/options.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -commit 5f6dddc6c911df02ba660564e78e6de80947c947 -Author: Lasse Collin -Date: 2009-09-01 20:20:19 +0300 - - Updated TODO. - - TODO | 3 +++ - 1 file changed, 3 insertions(+) - -commit 655457b9ada5ec7db398c5392e41290f3f332ea8 -Author: Lasse Collin -Date: 2009-08-31 21:59:25 +0300 - - Revert 43f44160b1ddcbf7e5205c37db09b3bebe7226f9 - and use a fix that works on all systems using - GNU assembler. - - Maybe the assembler code is used e.g. on Solaris x86 - but let's worry about it if this doesn't work on it. - - src/liblzma/check/crc32_x86.S | 7 ++----- - src/liblzma/check/crc64_x86.S | 7 ++----- - 2 files changed, 4 insertions(+), 10 deletions(-) - -commit 162189c3477953805a28f96d3a75cb9ab9417928 -Author: Lasse Collin -Date: 2009-08-30 17:29:19 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 2331f5f97af3e5897e23da45d9df3d664099c7f8 -Author: Lasse Collin -Date: 2009-08-30 17:28:52 +0300 - - Add more OS/2 specific info to INSTALL. - - INSTALL | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 94c66b3297b3ad307eee93cf6b160e3c43997f11 -Author: Lasse Collin -Date: 2009-08-29 14:43:52 +0300 - - Use even more hackish way to support thousand separators. - - Seems that in addition on Windows and DOS, also OpenBSD - lacks support for %'d style printf() format strings. - So far that is the only modern POSIX-like system I know - with this problem, but after this hack, the thousand - separator shouldn't be a problem on any system. - - Maybe testing if a format string like %'d produces - reasonable output is invoking undefined behavior on some - systems, but so far all the problematic systems I've tried - just print the raw format string (e.g. %'d prints 'd). - - Maybe Autoconf test would have been better, but this - hack works also for cross-compilation, and avoids - recompilation in case the system libc starts to support - the thousand separator. - - src/xz/util.c | 36 +++++++++++++++++++++++++----------- - 1 file changed, 25 insertions(+), 11 deletions(-) - -commit 3432e9c6aab851da1227b63dce645d7f190c04d8 -Author: Lasse Collin -Date: 2009-08-29 13:42:56 +0300 - - Updated THANKS. - - THANKS | 3 +++ - 1 file changed, 3 insertions(+) - -commit 27414daadf5727e8ab942374b5ec1c8990122878 -Author: Lasse Collin -Date: 2009-08-29 13:39:21 +0300 - - Fix sysctl() usage. - - This fixes build on *BSDs and Darwin. - - Thanks to Jukka Salmi for the patches. - Richard Koch reported the problem too. - - m4/lc_cpucores.m4 | 2 +- - m4/lc_physmem.m4 | 2 +- - src/common/cpucores.h | 2 +- - src/common/physmem.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 43f44160b1ddcbf7e5205c37db09b3bebe7226f9 -Author: Lasse Collin -Date: 2009-08-29 13:35:23 +0300 - - Fix x86 assembler on GCC 3. - - Thanks to Karl Berry. - - src/liblzma/check/crc32_x86.S | 7 +++++-- - src/liblzma/check/crc64_x86.S | 7 +++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 682efdc1f9492fdd76c9ce82e7c00ca0768067e8 -Author: Lasse Collin -Date: 2009-08-27 18:36:59 +0300 - - "make dist" fixes - - Makefile.am | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -commit c8c184db1c95bf70f78256ec6237845a57f342af -Author: Lasse Collin -Date: 2009-08-27 17:08:33 +0300 - - Update xz man page date. - - src/xz/xz.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9756fce565e98b8fa5fe6ead296d84e7601ec254 -Author: Lasse Collin -Date: 2009-08-27 17:00:22 +0300 - - Fix the debug directory. - - 6a2eb54092fc625d59921a607ff68cd1a90aa898 and - 71f18e8a066a01dda0c8e5508b135ef104e43e4c required - some changes that weren't applied in debug. - - debug/Makefile.am | 5 +++-- - debug/full_flush.c | 1 + - debug/known_sizes.c | 1 + - debug/memusage.c | 1 + - debug/sync_flush.c | 1 + - 5 files changed, 7 insertions(+), 2 deletions(-) - -commit 77007a7fb20187fcf3d1dd9839c79ace2d63f2ea -Author: Lasse Collin -Date: 2009-08-27 16:36:40 +0300 - - Add missing files to EXTRA_DIST. - - Makefile.am | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -commit 04dcbfdeb921e5f361a4487134e91e23fffbe09d -Author: Lasse Collin -Date: 2009-08-27 16:21:22 +0300 - - Bumped version to 4.999.9beta. - - src/liblzma/api/lzma/version.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fd7618611a22f42a6913bc8d518c9bbc9252d6b4 -Author: Lasse Collin -Date: 2009-08-27 16:17:47 +0300 - - Updated THANKS. - - THANKS | 2 ++ - 1 file changed, 2 insertions(+) - -commit c29e76c0f910fca0a90a50b78d337f6c32623e9d -Author: Lasse Collin -Date: 2009-08-27 16:12:52 +0300 - - .xz file format specification 1.0.4 (probably). - - Thanks to Christian von Roques, Peter Lawler, - and Jim Meyering for the fixes. - - doc/xz-file-format.txt | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -commit 696d7ee3953beaf4f0ed18e78917ccf300431966 -Author: Lasse Collin -Date: 2009-08-27 15:43:54 +0300 - - Require GNU libtool 2.2. - - configure.ac | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -commit 4c3558aa8305a8f8b6c43b8569eb539717ca9e8d -Author: Lasse Collin -Date: 2009-08-27 15:34:45 +0300 - - Add "dos" to EXTRA_DIST. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 35b29e4424ced5a3ababf132283e519080c7b298 -Author: Lasse Collin -Date: 2009-08-27 15:23:27 +0300 - - Updated TODO. - - TODO | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit 23414377192c21f3f34c84cdfe0ef0fbd06a1dea -Author: Lasse Collin -Date: 2009-08-27 15:17:00 +0300 - - Some xz man page improvements. - - src/xz/xz.1 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 62 insertions(+), 16 deletions(-) - -commit 371b04e19fc9051dbaeec51ec0badec6a1f0699d -Author: Lasse Collin -Date: 2009-08-27 10:41:01 +0300 - - Removed doc/bugs.txt. - - doc/bugs.txt | 46 ---------------------------------------------- - 1 file changed, 46 deletions(-) - -commit d88c4072b36d3a76f839185799fb1d91037a1b81 -Author: Lasse Collin -Date: 2009-08-27 10:40:25 +0300 - - Updated README. - - It now includes bug reporting instructions/tips. - - README | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 55 insertions(+), 10 deletions(-) - -commit 92e536d8b8d33a6b12d0802bcd7be4437046f13e -Author: Lasse Collin -Date: 2009-08-27 10:21:18 +0300 - - Fix a typo in FAQ. - - Thanks to Jim Meyering. - - (From now on, I try to always remember to put - the relevant thanks to commit messages.) - - doc/faq.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3e2ba8b58585743e59251e69ad2783eb08357079 -Author: Lasse Collin -Date: 2009-08-27 10:13:46 +0300 - - Updates to liblzma API headers. - - Added lzma_nothrow for every function. It adds - throw() when the header is used in C++ code. - - Some lzma_attrs were added or removed. - - Lots of comments were improved. - - src/liblzma/api/lzma.h | 20 ++++++++ - src/liblzma/api/lzma/base.h | 48 +++++++++--------- - src/liblzma/api/lzma/block.h | 38 ++++++++------- - src/liblzma/api/lzma/check.h | 22 +++++---- - src/liblzma/api/lzma/container.h | 36 ++++++++------ - src/liblzma/api/lzma/filter.h | 81 +++++++++++++++++++------------ - src/liblzma/api/lzma/index.h | 97 ++++++++++++++++++++++--------------- - src/liblzma/api/lzma/index_hash.h | 14 ++++-- - src/liblzma/api/lzma/lzma.h | 87 +++++++++++++++++---------------- - src/liblzma/api/lzma/stream_flags.h | 12 ++--- - src/liblzma/api/lzma/version.h | 10 ++-- - src/liblzma/api/lzma/vli.h | 7 +-- - 12 files changed, 275 insertions(+), 197 deletions(-) - -commit 8e8ebc17c535a1f8846718059b48417409c37050 -Author: Lasse Collin -Date: 2009-08-18 00:30:09 +0300 - - Install faq.txt. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit b198e770a146e4a41f91a93f0b233713f2515848 -Author: Lasse Collin -Date: 2009-08-18 00:26:48 +0300 - - Updated faq.txt. - - Some questions worth answering were removed, because I - currently don't have good up to date answers to them. - - doc/faq.txt | 239 +++++++++++++++++++----------------------------------------- - 1 file changed, 73 insertions(+), 166 deletions(-) - -commit fe111a25cd788d31b581996e4533910388a7f0a9 -Author: Lasse Collin -Date: 2009-08-17 22:45:50 +0300 - - Some xz man changes. - - src/xz/xz.1 | 88 ++++++++++++++++++++++++++++++------------------------------- - 1 file changed, 43 insertions(+), 45 deletions(-) - -commit 10242a21e9abda0c5c6a03501703cc40b8a699a5 -Author: Lasse Collin -Date: 2009-08-16 22:15:42 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 3ce1916c83041113b9cad9ead5c97a527cf8aa1d -Author: Lasse Collin -Date: 2009-08-16 22:15:13 +0300 - - Fix data corruption in LZ/LZMA2 encoder. - - Thanks to Jonathan Stott for the bug report. - - src/liblzma/lz/lz_encoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 66da129c8ec33dd66acc92f113f7c1ca740ca81a -Author: Lasse Collin -Date: 2009-08-13 15:15:37 +0300 - - Updated INSTALL and PACKAGERS to match the changes - made in --enable-dynamic. - - INSTALL | 20 ++++++++++++++++---- - PACKAGERS | 11 ++++++----- - 2 files changed, 22 insertions(+), 9 deletions(-) - -commit 8238c4b2402f952c4e492e5b778aa272e57b6705 -Author: Lasse Collin -Date: 2009-08-13 15:03:46 +0300 - - Link lzmainfo against shared liblzma by default. - - src/lzmainfo/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 71f18e8a066a01dda0c8e5508b135ef104e43e4c -Author: Lasse Collin -Date: 2009-08-13 15:00:21 +0300 - - Make --enable-dynamic a tristate option. - - Some programs will by default be linked against static - liblzma and some against shared liblzma. --enable-dynamic - now allows overriding the default to both directions - (all dynamic or all static) even when building both - shared and static liblzma. - - This is quite messy compared to how simple thing it is supposed - to be. The complexity is mostly due to Windows support. - - configure.ac | 77 ++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 57 insertions(+), 20 deletions(-) - -commit 5aa4678b2342dcfc1d2b31aa9fa4f39c539e4b61 -Author: Lasse Collin -Date: 2009-08-13 12:56:47 +0300 - - Fix xz Makefile.am for the man page. - - install-exec-hook -> install-data-hook - - src/xz/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -commit e51b4e49e800bd84e6d589dca2964d3985e88139 -Author: Lasse Collin -Date: 2009-08-13 12:55:45 +0300 - - Add lzmainfo for backward compatibility with LZMA Utils. - - lzmainfo now links against static liblzma. In contrast - to other command line tools in XZ Utils, linking lzmainfo - against static liblzma by default is dumb. This will be - fixed once I have fixed some related issues in configure.ac. - - configure.ac | 1 + - src/Makefile.am | 2 +- - src/lzmainfo/Makefile.am | 29 ++++++ - src/lzmainfo/lzmainfo.1 | 55 +++++++++++ - src/lzmainfo/lzmainfo.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 328 insertions(+), 1 deletion(-) - -commit a4165d0584376d948c213ec93c6065d24ff6a5e7 -Author: Lasse Collin -Date: 2009-08-13 12:42:36 +0300 - - Sync some error messages from xz to xzdec. - - Make xz error message translation usable outside - xz (at least in upcoming lzmainfo). - - src/xz/main.c | 4 ++-- - src/xzdec/xzdec.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit df636eb4e066b4e154ce8e66e82c87ba1db652a6 -Author: Lasse Collin -Date: 2009-08-13 09:37:21 +0300 - - Add xz man page to manfiles in toplevel Makefile.am. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit 180bdf58ea5bb07941e0a99b304d9aa832198748 -Author: Lasse Collin -Date: 2009-08-13 09:37:01 +0300 - - Fix first line of xz man page. - - src/xz/xz.1 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit e1ce2291e759b50ebfcf7cbbcc04cd098f1705a4 -Author: Lasse Collin -Date: 2009-08-10 11:22:31 +0300 - - Added a rough version of the xz man page. - - src/xz/Makefile.am | 15 + - src/xz/xz.1 | 1206 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1221 insertions(+) - -commit e71903fc6101f1c039d702e335b08aad1e1b4100 -Author: Jonathan Nieder -Date: 2009-08-09 13:41:20 -0500 - - “xzdiff a.xz b.xz” always fails - - Attempts to compare two compressed files result in no output and - exit status 2. - - Instead of going to standard output, ‘diff’ output is being - captured in the xz_status variable along with the exit status from - the decompression commands. Later, when this variable is examined - for nonzero status codes, numerals from dates in the ‘diff’ output - make it appear as though decompression failed. - - So let the ‘diff’ output leak to standard output with another file - descriptor. (This trick is used in all similar contexts elsewhere - in xzdiff and in the analogous context in gzip’s zdiff script.) - - src/scripts/xzdiff.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1d314b81aa5b0c4530638ffabd4e0edb52e5362c -Author: Jonathan Nieder -Date: 2009-08-09 13:22:12 -0500 - - xzless: Support compressed standard input - - It can be somewhat confusing that - - less < some_file.txt - - works fine, whereas - - xzless < some_file.txt.xz - - does not. Since version 429, ‘less’ allows a filter specified in - the LESSOPEN environment variable to preprocess its input even if - it comes from standard input, if $LESSOPEN begins with ‘|-’. So - set $LESSOPEN to take advantage of this feature. - - Check less’s version at runtime so xzless can continue to work - with older versions. - - src/scripts/xzless.in | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -commit a7f5d2fe4826ac68839d00059f05004fb81d5c69 -Author: Lasse Collin -Date: 2009-08-09 20:57:46 +0300 - - GPLv2+ not GPLv2 for Doxyfile.in is probably OK. - - Doxyfile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b735cde20cc14857136ae65a0e5d336ed7ddc862 -Author: Lasse Collin -Date: 2009-08-02 00:27:29 +0300 - - Added a copyright notice to Doxyfile.in since it contains - lots of comments from Doxygen. - - It seems that the Doxygen authors' intent is to not apply - their copyright on generated files, but since it doesn't - matter for XZ Utils at all, better safe than sorry. - - Doxyfile.in | 3 +++ - 1 file changed, 3 insertions(+) - -commit 0fd157cc008446adfc8f91394f5503868025a642 -Author: Lasse Collin -Date: 2009-08-02 00:11:37 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit b198da96ff9ac8c89b466b4d196c5f3fe1c7904f -Author: Lasse Collin -Date: 2009-08-02 00:10:22 +0300 - - Updated TODO. - - TODO | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 669413bb2db954bbfde3c4542fddbbab53891eb4 -Author: Lasse Collin -Date: 2009-07-30 12:25:55 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit dbbd8fb870ae789d96497911006c869d37148c15 -Author: Jonathan Nieder -Date: 2009-07-28 17:37:24 -0500 - - xzdiff: add missing ;; to case statement - - src/scripts/xzdiff.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit adbad2d16cb5909f85d4a429011005613ea62ffe -Author: Lasse Collin -Date: 2009-07-24 13:15:06 +0300 - - Added history.txt to doc_DATA. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit e0236f12569eb36f9b81ce7a1e52e0f73698ac27 -Author: Lasse Collin -Date: 2009-07-24 12:00:40 +0300 - - Updated .gitignore files. - - .gitignore | 36 +++++++++++++++++++----------------- - po/.gitignore | 3 +++ - 2 files changed, 22 insertions(+), 17 deletions(-) - -commit 2f34fb269265e3aba43a2a9c734020a45268826d -Author: Lasse Collin -Date: 2009-07-24 11:34:02 +0300 - - Minor improvements to COPYING. - - COPYING | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -commit 0db1befcfbc120377df4b89923762f16d25f548a -Author: Lasse Collin -Date: 2009-07-23 19:10:55 +0300 - - Fix incorrect usage of getopt_long(), which caused - invalid memory access if XZ_OPT was defined. - - src/xz/args.c | 1 - - 1 file changed, 1 deletion(-) - -commit 8f8ec942d6d21ada2096eaf063411bc8bc7e2d48 -Author: Lasse Collin -Date: 2009-07-20 15:43:32 +0300 - - Avoid internal error with --format=xz --lzma1. - - src/xz/coder.c | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -commit 99f9e879a6a8bb54a65da99c12e0f390216c152a -Author: Lasse Collin -Date: 2009-07-19 13:14:20 +0300 - - Major documentation update. - - Installation and packaging instructions were added. - README and other generic docs were revised. - - Some of the documentation files are now installed to $docdir. - - AUTHORS | 35 +++--- - ChangeLog | 7 +- - INSTALL | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - INSTALL.generic | 302 +++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 11 ++ - PACKAGERS | 278 +++++++++++++++++++++++++++++++++++++++++++++++ - README | 263 ++++++++++++++++++++------------------------- - THANKS | 17 +-- - 8 files changed, 1070 insertions(+), 170 deletions(-) - -commit ef4cf1851de89022cba5674784f1a8f6343c15b0 -Author: Lasse Collin -Date: 2009-07-19 11:09:31 +0300 - - Added missing author notice to xzless.in. - - src/scripts/xzless.in | 1 + - 1 file changed, 1 insertion(+) - -commit 4c9c989d45b188667799a7a1d6c728ed43f7bf77 -Author: Lasse Collin -Date: 2009-07-18 18:54:55 +0300 - - Use AC_CONFIG_AUX_DIR to clean up the toplevel directory - a little. - - Fixed a related bug in the toplevel Makefile.am. - - Added the build-aux directory to .gitignore. - - .gitignore | 1 + - Makefile.am | 1 - - configure.ac | 3 ++- - 3 files changed, 3 insertions(+), 2 deletions(-) - -commit 366e436090a7a87215e9bf0e3ddcd55f05b50587 -Author: Lasse Collin -Date: 2009-07-18 14:34:08 +0300 - - Updated the totally outdated TODO file. - - TODO | 117 ++++++++++++++++--------------------------------------------------- - 1 file changed, 27 insertions(+), 90 deletions(-) - -commit 64e498c89d8b9966e8663f43bf64d47c26c55c62 -Author: Lasse Collin -Date: 2009-07-18 11:26:39 +0300 - - Added public domain notice into a few files. - - src/common/common_w32res.rc | 9 ++++++++- - src/liblzma/liblzma.pc.in | 7 +++++++ - src/liblzma/liblzma_w32res.rc | 7 +++++++ - src/xz/xz_w32res.rc | 7 +++++++ - src/xzdec/xzdec_w32res.rc | 7 +++++++ - 5 files changed, 36 insertions(+), 1 deletion(-) - -commit a35755c5de808df027675688855d1b621a4fb428 -Author: Lasse Collin -Date: 2009-07-14 21:10:36 +0300 - - Allow extra commas in filter-specific options on xz command line. - - This may slightly ease writing scripts that construct - filter-specific option strings dynamically. - - src/xz/options.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 98f3cac1ad31191c5160a7e48398bf85141e941c -Author: Lasse Collin -Date: 2009-07-14 18:04:31 +0300 - - Accept --lzma2=preset=6e where "e" is equivalent to --extreme - when no custom chain is in use. - - src/xz/options.c | 80 +++++++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 59 insertions(+), 21 deletions(-) - -commit d873a09e956363e54bf58c577c8f7e487b6fb464 -Author: Lasse Collin -Date: 2009-07-12 19:08:30 +0300 - - Add dist-hook to create ChangeLog from the commit log, - and to conver the man pages to PDF and plain text, which - may be convenient to those who cannot render man pages. - - Makefile.am | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -commit cd69a5a6c16c289f6f8e2823b03c72289472270f -Author: Lasse Collin -Date: 2009-07-10 11:39:38 +0300 - - BCJ filters: Reject invalid start offsets with LZMA_OPTIONS_ERROR. - - This is a quick and slightly dirty fix to make the code - conform to the latest file format specification. Without - this patch, it's possible to make corrupt files by - specifying start offset that is not a multiple of the - filter's alignment. Custom start offset is almost never - used, so this was only a minor bug. - - The xz command line tool doesn't validate the start offset, - so one will get a bit unclear error message if trying to use - an invalid start offset. - - src/liblzma/simple/arm.c | 2 +- - src/liblzma/simple/armthumb.c | 2 +- - src/liblzma/simple/ia64.c | 2 +- - src/liblzma/simple/powerpc.c | 2 +- - src/liblzma/simple/simple_coder.c | 5 ++++- - src/liblzma/simple/simple_private.h | 3 ++- - src/liblzma/simple/sparc.c | 2 +- - src/liblzma/simple/x86.c | 2 +- - 8 files changed, 12 insertions(+), 8 deletions(-) - -commit eed9953732b801f6c97317fb3160445a8754180b -Author: Lasse Collin -Date: 2009-07-10 11:33:21 +0300 - - Look for full command names instead of substrings - like "un", "cat", and "lz" when determining if - xz is run as unxz, xzcat, lzma, unlzma, or lzcat. - - This is to ensure that if xz is renamed (e.g. via - --program-transform-name), it doesn't so easily - work in wrong mode. - - src/xz/args.c | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -commit 6f62fa88f4ff7ba78565c314c0e6e71c498fa658 -Author: Lasse Collin -Date: 2009-07-08 23:06:46 +0300 - - Updated THANKS. - - THANKS | 2 ++ - 1 file changed, 2 insertions(+) - -commit 1754b7e03e2aa7e2e0196807fe8b0f3f5a637b0e -Author: Lasse Collin -Date: 2009-07-08 23:05:29 +0300 - - Portability improvement to version.sh. - - version.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 3bdb53792c0e3e3febe9370e56eda5b08f89410f -Author: Lasse Collin -Date: 2009-07-08 22:50:16 +0300 - - Remove --force from xzdec. - - It was ignored for compatibility with xz, but now that - --decompress --stdout --force copies unrecognized files - as is to stdout, simply ignoring --force in xzdec would - be wrong. xzdec will not support copying unrecognized - data as is to stdout, so it cannot support --force. - - src/xzdec/xzdec.1 | 5 ----- - src/xzdec/xzdec.c | 5 +---- - 2 files changed, 1 insertion(+), 9 deletions(-) - -commit 5f16ef4abf220028a9ddbcb138217597a9455f62 -Author: Lasse Collin -Date: 2009-07-06 10:36:04 +0300 - - Use sed instead of $(SED) so that we don't need to - use AC_PROG_SED. We don't do anything fancy with sed, - so this should work OK. libtool 2.2 sets SED but 1.5 - doesn't, so $(SED) happened to work when using libtool 2.2. - - src/liblzma/Makefile.am | 2 +- - src/scripts/Makefile.am | 28 ++++++++++++++-------------- - src/xz/Makefile.am | 6 +++--- - src/xzdec/Makefile.am | 6 +++--- - 4 files changed, 21 insertions(+), 21 deletions(-) - -commit 96e4b257e101d72072d43e144897d92920270669 -Author: Lasse Collin -Date: 2009-07-05 22:25:17 +0300 - - Major update to the xzgrep and other scripts based on - the latest versions found from gzip CVS repository. - - configure will try to find a POSIX shell to be used by - the scripts. This should ease portability on systems - which have pre-POSIX /bin/sh. - - xzgrep and xzdiff support .xz, .lzma, .gz, and .bz2 files. - xzmore and xzless support only .xz and .lzma files. - - The name of the xz executable used in these scripts is - now correct even if --program-transform-name has been used. - - configure.ac | 14 ++++ - m4/posix-shell.m4 | 63 ++++++++++++++++ - src/scripts/Makefile.am | 24 +++--- - src/scripts/xzdiff | 67 ----------------- - src/scripts/xzdiff.1 | 58 ++++++++------ - src/scripts/xzdiff.in | 172 ++++++++++++++++++++++++++++++++++++++++++ - src/scripts/xzgrep | 123 ------------------------------ - src/scripts/xzgrep.1 | 85 ++++++++++++--------- - src/scripts/xzgrep.in | 196 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/scripts/xzless.1 | 66 ++++++++++++++++ - src/scripts/xzless.in | 51 +++++++++++++ - src/scripts/xzmore | 74 ------------------ - src/scripts/xzmore.1 | 64 +++++++--------- - src/scripts/xzmore.in | 78 +++++++++++++++++++ - 14 files changed, 766 insertions(+), 369 deletions(-) - -commit 25cc7a6e8c2506a0d80084a4c1c67d33e7439100 -Author: Lasse Collin -Date: 2009-07-05 19:26:53 +0300 - - Use @PACKAGE_HOMEPAGE@ in liblzma.pc.in. - - src/liblzma/liblzma.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 18c10c30d2833f394cd7bce0e6a821044b15832f -Author: Lasse Collin -Date: 2009-07-04 00:40:44 +0300 - - Make "xz --decompress --stdout --force" copy unrecognized - files as is to standard output. - - This feature is needed to be more compatible with gzip's - behavior. This was more complicated to implement than it - sounds, because the way liblzma is able to return errors with - files of only a few bytes in size. xz now has its own file - type detection code and no longer uses lzma_auto_decoder(). - - src/xz/coder.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 178 insertions(+), 35 deletions(-) - -commit 0a289c01ac821ea9c4250aa906b0ae3cfa953633 -Author: Lasse Collin -Date: 2009-07-02 14:30:38 +0300 - - Define PACKAGE_HOMEPAGE in configure.ac and use it in - xz and xzdec. - - Use also PACKAGE_NAME instead of hardcoding "XZ Utils". - - configure.ac | 5 +++++ - src/xz/message.c | 4 ++-- - src/xzdec/xzdec.c | 4 ++-- - 3 files changed, 9 insertions(+), 4 deletions(-) - -commit 5cc99db5bae8633f85559e5cdaef4cd905a4ee9c -Author: Lasse Collin -Date: 2009-07-01 12:21:24 +0300 - - Avoid visibility related compiler warnings on Windows. - - configure.ac | 20 +++++++++----------- - 1 file changed, 9 insertions(+), 11 deletions(-) - -commit 7653d1cf48080e63b189ed9d58dea0e82b6b1c5e -Author: Lasse Collin -Date: 2009-06-30 17:14:39 +0300 - - Use static liblzma by default also for tests. - - tests/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit f42ee981668b545ab6d06c6072e262c29605273c -Author: Lasse Collin -Date: 2009-06-30 17:09:57 +0300 - - Build system fixes - - Don't use libtool convenience libraries to avoid recently - discovered long-standing subtle but somewhat severe bugs - in libtool (at least 1.5.22 and 2.2.6 are affected). It - was found when porting XZ Utils to Windows - - but the problem is significant also e.g. on GNU/Linux. - - Unless --disable-shared is passed to configure, static - library built from a set of convenience libraries will - contain PIC objects. That is, while libtool builds non-PIC - objects too, only PIC objects will be used from the - convenience libraries. On 32-bit x86 (tested on mobile XP2400+), - using PIC instead of non-PIC makes the decompressor 10 % slower - with the default CFLAGS. - - So while xz was linked against static liblzma by default, - it got the slower PIC objects unless --disable-shared was - used. I tend develop and benchmark with --disable-shared - due to faster build time, so I hadn't noticed the problem - in benchmarks earlier. - - This commit also adds support for building Windows resources - into liblzma and executables. - - configure.ac | 34 ++++++++++------ - src/liblzma/Makefile.am | 79 +++++++++++++++++++++++++++++-------- - src/liblzma/check/Makefile.am | 47 ---------------------- - src/liblzma/check/Makefile.inc | 51 ++++++++++++++++++++++++ - src/liblzma/common/Makefile.am | 78 ------------------------------------ - src/liblzma/common/Makefile.inc | 67 +++++++++++++++++++++++++++++++ - src/liblzma/common/common.h | 16 +++++--- - src/liblzma/delta/Makefile.am | 28 ------------- - src/liblzma/delta/Makefile.inc | 23 +++++++++++ - src/liblzma/lz/Makefile.am | 29 -------------- - src/liblzma/lz/Makefile.inc | 21 ++++++++++ - src/liblzma/lzma/Makefile.am | 51 ------------------------ - src/liblzma/lzma/Makefile.inc | 43 ++++++++++++++++++++ - src/liblzma/rangecoder/Makefile.am | 26 ------------ - src/liblzma/rangecoder/Makefile.inc | 21 ++++++++++ - src/liblzma/simple/Makefile.am | 51 ------------------------ - src/liblzma/simple/Makefile.inc | 47 ++++++++++++++++++++++ - src/liblzma/subblock/Makefile.am | 26 ------------ - src/liblzma/subblock/Makefile.inc | 20 ++++++++++ - src/xz/Makefile.am | 11 +++++- - src/xzdec/Makefile.am | 20 +++++++++- - 21 files changed, 417 insertions(+), 372 deletions(-) - -commit 89dac1db6f168d7469cfbc4432651d4724c5c0de -Author: Lasse Collin -Date: 2009-06-29 22:19:51 +0300 - - Added a comment about "autoconf -fi" to autogen.sh. - - autogen.sh | 3 +++ - 1 file changed, 3 insertions(+) - -commit 6e685aae4594bc0af1b5032e01bb37d0edaa3ebd -Author: Lasse Collin -Date: 2009-06-28 10:04:24 +0300 - - Add -no-undefined to get shared liblzma on Windows. - - src/liblzma/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 73f560ee5fa064992b76688d9472baf139432540 -Author: Lasse Collin -Date: 2009-06-27 22:57:15 +0300 - - Make physmem() work on Cygwin 1.5 and older. - - src/common/physmem.h | 77 +++++++++++++++++++++++++++------------------------- - 1 file changed, 40 insertions(+), 37 deletions(-) - -commit 7ff0004fbce24ae72eddfe392828ffd7d4639ed1 -Author: Lasse Collin -Date: 2009-06-27 17:28:01 +0300 - - Moved the Windows resource files outside the windows directory - to prepare for building them with Autotools. - - windows/common.rc => src/common/common_w32res.rc | 0 - .../liblzma.rc => src/liblzma/liblzma_w32res.rc | 2 +- - windows/xz.rc => src/xz/xz_w32res.rc | 2 +- - windows/lzmadec.rc => src/xzdec/lzmadec_w32res.rc | 2 +- - windows/xzdec.rc => src/xzdec/xzdec_w32res.rc | 2 +- - windows/Makefile | 35 ++++++++++++---------- - 6 files changed, 23 insertions(+), 20 deletions(-) - -commit 449c634674f35336a4815d398172e447659a135e -Author: Lasse Collin -Date: 2009-06-27 13:05:03 +0300 - - Added missing $(EXEEXT). - - src/xz/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 792db79f27ad9ab1fb977e23be65c7761f545752 -Author: Lasse Collin -Date: 2009-06-27 12:32:40 +0300 - - Create correct symlinks even when - --program-{prefix,suffix,transform} is passed to configure. - - src/scripts/Makefile.am | 80 ++++++++++++++++++++++++++++--------------------- - src/xz/Makefile.am | 21 ++++++++----- - src/xzdec/Makefile.am | 9 ++++-- - 3 files changed, 65 insertions(+), 45 deletions(-) - -commit 0adc72feb84f5b903f6ad9d3f759b1c326fafc6b -Author: Lasse Collin -Date: 2009-06-27 10:02:24 +0300 - - Silence a compiler warning on DOS-like systems. - - src/xz/file_io.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit ad12edc95254ede3f0cb8dec8645e8789e984c4f -Author: Lasse Collin -Date: 2009-06-27 09:35:15 +0300 - - Updated the filenames in POTFILES.in too. - - po/POTFILES.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit b2b1f867532732fe9969131f8713bdd6b0731763 -Author: Lasse Collin -Date: 2009-06-27 00:43:06 +0300 - - Hopefully improved portability of the assembler code in - Autotools based builds on Windows. - - src/liblzma/check/crc32_x86.S | 8 +++++++- - src/liblzma/check/crc64_x86.S | 8 +++++++- - 2 files changed, 14 insertions(+), 2 deletions(-) - -commit c393055947247627a09b6a6b8f20aa0c32f9be16 -Author: Lasse Collin -Date: 2009-06-26 21:17:29 +0300 - - Updated THANKS (most of today's commits are based on - Charles Wilson's patches). - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit da0af22e4b4139b8a10710945f8b245b3a77c97d -Author: Lasse Collin -Date: 2009-06-26 21:00:35 +0300 - - Updated comments to match renamed files. - - src/xz/coder.c | 2 +- - src/xz/coder.h | 2 +- - src/xz/file_io.c | 2 +- - src/xz/file_io.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 65014fd211dfbd4be48685998cb5a12aaa29c8d2 -Author: Lasse Collin -Date: 2009-06-26 20:49:54 +0300 - - Rename process.[hc] to coder.[hc] and io.[hc] to file_io.[hc] - to avoid problems on systems with system headers with those - names. - - dos/Makefile | 4 ++-- - src/xz/Makefile.am | 8 ++++---- - src/xz/{process.c => coder.c} | 0 - src/xz/{process.h => coder.h} | 0 - src/xz/{io.c => file_io.c} | 0 - src/xz/{io.h => file_io.h} | 0 - src/xz/private.h | 4 ++-- - windows/Makefile | 4 ++-- - 8 files changed, 10 insertions(+), 10 deletions(-) - -commit 5e1257466dcb66f1d7a3f71814a5ad885cba43e8 -Author: Lasse Collin -Date: 2009-06-26 20:43:36 +0300 - - Rename process_file() to coder_run(). - - src/xz/main.c | 6 +++--- - src/xz/process.c | 6 +++--- - src/xz/process.h | 5 ++--- - 3 files changed, 8 insertions(+), 9 deletions(-) - -commit cad62551c5fa9865dbe0841a0b3bc729c4fbe8fc -Author: Lasse Collin -Date: 2009-06-26 20:36:45 +0300 - - Ugly hack to make it possible to use the thousand separator - format character with snprintf() on POSIX systems but not - on non-POSIX systems and still keep xgettext working. - - dos/Makefile | 16 +++------------- - src/xz/message.c | 17 +++++++++-------- - src/xz/process.c | 30 +++++++++++++++--------------- - src/xz/util.c | 34 ++++++++++++++++++++++++++++++++++ - src/xz/util.h | 20 ++++++++++++++++++++ - windows/Makefile | 13 +++---------- - 6 files changed, 84 insertions(+), 46 deletions(-) - -commit fe378d47074b16c52b00fe184d119287c68ce2e7 -Author: Lasse Collin -Date: 2009-06-26 15:40:40 +0300 - - Added missing source files to windows/Makefile. - - windows/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -commit 390a6408563067613b29de895cb40e4d0386d62c -Author: Lasse Collin -Date: 2009-06-26 15:37:53 +0300 - - Basic support for building with Cygwin and MinGW using - the Autotools based build system. It's not good yet, more - fixes will follow. - - configure.ac | 7 +++++++ - src/liblzma/api/lzma.h | 7 +++++-- - src/liblzma/check/crc32_x86.S | 7 ++++--- - src/liblzma/check/crc64_x86.S | 7 ++++--- - src/liblzma/common/common.h | 2 +- - windows/Makefile | 16 +++++++--------- - 6 files changed, 28 insertions(+), 18 deletions(-) - -commit 1c9360b7d1197457aaad2f8888b99f1149861579 -Author: Lasse Collin -Date: 2009-06-26 14:47:31 +0300 - - Fix @variables@ to $(variables) in Makefile.am files. - Fix the ordering of libgnu.a and LTLIBINTL on the linker - command line and added missing LTLIBINTL to tests/Makefile.am. - - debug/Makefile.am | 12 ++++++------ - src/liblzma/check/Makefile.am | 4 ++-- - src/liblzma/common/Makefile.am | 16 ++++++++-------- - src/liblzma/delta/Makefile.am | 4 ++-- - src/liblzma/lz/Makefile.am | 6 +++--- - src/liblzma/lzma/Makefile.am | 8 ++++---- - src/liblzma/rangecoder/Makefile.am | 4 ++-- - src/liblzma/simple/Makefile.am | 4 ++-- - src/liblzma/subblock/Makefile.am | 4 ++-- - src/xz/Makefile.am | 21 +++++++++++---------- - src/xzdec/Makefile.am | 19 ++++++++++--------- - tests/Makefile.am | 12 +++++++----- - 12 files changed, 59 insertions(+), 55 deletions(-) - -commit d45615c555e250209ebb55aa3649abe790f1eeac -Author: Lasse Collin -Date: 2009-06-26 14:20:02 +0300 - - Allow to explicitly specify autotool versions in autogen.sh. - - autogen.sh | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -commit eaf8367368a329afa48785380f9dca6b681f3397 -Author: Lasse Collin -Date: 2009-06-26 14:18:32 +0300 - - Add version.sh to EXTRA_DIST. - - Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit b317b218e2d383dd27a700094c0de4510540ea18 -Author: Lasse Collin -Date: 2009-06-24 20:14:10 +0300 - - Support HW_PHYSMEM64 - - src/common/physmem.h | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -commit ae82dde5d9cc60c80cc89601b6c51cc1611d48e7 -Author: Lasse Collin -Date: 2009-06-24 13:01:59 +0300 - - Cast a char argument to isspace() to unsigned char. - - src/xz/args.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -commit 1735d31ea347210e914df038eeea4b2626e76e42 -Author: Lasse Collin -Date: 2009-06-05 13:46:26 +0300 - - A few more spelling fixes. Released the .xz spec 1.0.3. - - doc/xz-file-format.txt | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -commit 8ed156ce894966103e895aa08f2a9fb912f6fad5 -Author: Lasse Collin -Date: 2009-06-04 23:42:12 +0300 - - Added xzdec man page. - - src/xzdec/Makefile.am | 11 ++++ - src/xzdec/xzdec.1 | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 184 insertions(+) - -commit f6df39afaa84f71439507178a49b2a5dda6e824c -Author: Lasse Collin -Date: 2009-06-04 23:26:47 +0300 - - Harmonized xzdec --memory with xz --memory and made - minor cleanups. - - src/xzdec/xzdec.c | 74 +++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 53 insertions(+), 21 deletions(-) - -commit 1774f27c61ce294a56712ca2f4785f90a62441bc -Author: Lasse Collin -Date: 2009-06-04 22:59:55 +0300 - - Fix purporse -> purpose. Thanks to Andrew Dudman. - Released .xz spec 1.0.2 due to this fix too. - - THANKS | 1 + - doc/xz-file-format.txt | 8 +++++--- - src/liblzma/liblzma.pc.in | 2 +- - windows/Makefile | 2 +- - 4 files changed, 8 insertions(+), 5 deletions(-) - -commit cb613455642f48fb51059e22018615f64c59b70f -Author: Lasse Collin -Date: 2009-06-01 14:53:57 +0300 - - The .xz file format version 1.0.1 - - doc/xz-file-format.txt | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) - -commit 083c23c680ff844846d177cfc58bb7a874e7e6b9 -Author: Lasse Collin -Date: 2009-05-26 14:48:48 +0300 - - Make the raw value of the Check field available to applications - via lzma_block structure. - - This changes ABI but not doesn't break API. - - src/liblzma/api/lzma/block.h | 17 ++++++++++++++++ - src/liblzma/common/block_buffer_encoder.c | 1 + - src/liblzma/common/block_decoder.c | 34 ++++++++++++++----------------- - src/liblzma/common/block_encoder.c | 21 ++++++++----------- - 4 files changed, 42 insertions(+), 31 deletions(-) - -commit b4f5c814090dc07d4350453576305e41eb9c998d -Author: Lasse Collin -Date: 2009-05-23 16:57:21 +0300 - - Remove undocumented alternative option names --bcj, --ppc, - and --itanium. - - src/xz/args.c | 3 --- - 1 file changed, 3 deletions(-) - -commit b1edee2cdc7ef4411b1a21c07094ec763f071281 -Author: Lasse Collin -Date: 2009-05-23 15:12:23 +0300 - - Add support for specifying the BCJ filter start offset - in the xz command line tool. - - src/xz/args.c | 36 +++++++++++++++++++++--------------- - src/xz/message.c | 14 ++++++++------ - src/xz/options.c | 40 ++++++++++++++++++++++++++++++++++++++++ - src/xz/options.h | 7 +++++++ - 4 files changed, 76 insertions(+), 21 deletions(-) - -commit 72aa0e9c5f4289f10ef5bf240a9448d3017f1ceb -Author: Lasse Collin -Date: 2009-05-23 14:51:09 +0300 - - Updated THANKS. - - THANKS | 2 ++ - 1 file changed, 2 insertions(+) - -commit dcedb6998cefeca6597dd1219328a3abf5acf66d -Author: Lasse Collin -Date: 2009-05-22 16:40:50 +0300 - - Added support for --quiet and --no-warn to xzdec. - Cleaned up the --help message a little. - - src/xzdec/xzdec.c | 76 +++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 49 insertions(+), 27 deletions(-) - -commit 5f735dae80aa629853f4831d7b84ec1c614979eb -Author: Lasse Collin -Date: 2009-05-22 15:11:52 +0300 - - Use the 40 % of RAM memory usage limit in xzdec too. - - Update the memory usage info text in --help to match - the text in xz --long-help. - - src/xzdec/xzdec.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit b60376249e0c586910c4121fab4f791820cc1289 -Author: Lasse Collin -Date: 2009-05-22 14:43:00 +0300 - - Add --no-warn. - - src/xz/args.c | 8 +++++++- - src/xz/main.c | 17 +++++++++++++++++ - src/xz/main.h | 6 ++++++ - src/xz/message.c | 4 ++++ - 4 files changed, 34 insertions(+), 1 deletion(-) - -commit b4f92f522d4b854c0adb7c38be7531e1a6a7b008 -Author: Lasse Collin -Date: 2009-05-22 14:27:40 +0300 - - Fix a comment. - - src/xz/main.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 4dd21d23f22569285ae706b58b0e5904b8db1839 -Author: Lasse Collin -Date: 2009-05-22 14:21:20 +0300 - - Remove the --info option, which was an alias for --list. - - src/xz/args.c | 1 - - 1 file changed, 1 deletion(-) - -commit 8836139b63ce774bdd62abf17ab69b290e08229e -Author: Lasse Collin -Date: 2009-05-22 12:27:43 +0300 - - If xz is run as lzma, unlzma, or lzcat, simply imply - --format=lzma. This means that xz emulating lzma - doesn't decompress .xz files, while before this - commit it did. The new way is slightly simpler in - code and especially in upcoming documentation. - - src/xz/args.c | 17 ++++++----------- - 1 file changed, 6 insertions(+), 11 deletions(-) - -commit b0063023f8adb06ea735ec4af5c6f5b7bdb8e84d -Author: Lasse Collin -Date: 2009-05-22 11:29:50 +0300 - - Make the default memory usage limit 40 % of RAM for both - compressing and decompressing. This should be OK now that - xz automatically scales down the compression settings if - they would exceed the memory usage limit (earlier, the limit - for compression was increased to 90 % because low limit broke - scripts that used "xz -9" on systems with low RAM). - - Support spcifying the memory usage limit as a percentage - of RAM (e.g. --memory=50%). - - Support --threads=0 to reset the thread limit to the default - value (number of available CPU cores). Use UINT32_MAX instead - of SIZE_MAX as the maximum in args.c. hardware.c was already - expecting uint32_t value. - - Cleaned up the output of --help and --long-help. - - src/xz/args.c | 28 +++++++++++++----- - src/xz/hardware.c | 86 +++++++++++++++++++++++-------------------------------- - src/xz/hardware.h | 10 +++---- - src/xz/message.c | 28 +++++++++--------- - src/xz/process.c | 18 +++++------- - 5 files changed, 82 insertions(+), 88 deletions(-) - -commit 071b825b23911a69dd1cd2f8cda004ef8a781fae -Author: Lasse Collin -Date: 2009-05-21 17:22:01 +0300 - - Support special value "max" where xz and xzdec accept an integer. - Don't round the memory usage limit in xzdec --help to avoid - an integer overflow and to not give wrong impression that - the limit is high enough when it may not actually be. - - src/xz/util.c | 4 ++++ - src/xzdec/xzdec.c | 6 +++++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -commit 03ca67fd37dd43fa7f590de340899cd497c10802 -Author: ABCD -Date: 2009-05-20 17:31:18 -0400 - - Install lzdiff, lzgrep, and lzmore as symlinks - - This adds lzdiff, lzgrep, and lzmore to the list of symlinks to install. - It also installs symlinks for the manual pages and removes the new - symlinks on uninstall. - - src/scripts/Makefile.am | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -commit a6f43e64128a6da5cd641de1e1e527433b3e5638 -Author: Lasse Collin -Date: 2009-05-02 16:10:14 +0300 - - Use a GCC-specific #pragma instead of GCC-specific - -Wno-uninitialized to silence a bogus warning. - - configure.ac | 13 ------------- - src/liblzma/check/Makefile.am | 5 ----- - src/liblzma/check/sha256.c | 5 +++++ - 3 files changed, 5 insertions(+), 18 deletions(-) - -commit f6ce63ebdb45a857c8949960c83c9580ae888951 -Author: Lasse Collin -Date: 2009-05-02 14:46:50 +0300 - - Removed --disable-encoder and --disable-decoder. Use the values - given to --enable-encoders and --enable-decoders to determine - if any encoder or decoder support is wanted. - - configure.ac | 48 ++++++++---------------------------------------- - 1 file changed, 8 insertions(+), 40 deletions(-) - -commit be06858d5cf8ba46557395035d821dc332f3f830 -Author: Lasse Collin -Date: 2009-05-01 11:28:52 +0300 - - Remove docs that are too outdated to be updated - (rewrite will be better). - - doc/liblzma-advanced.txt | 324 ----------------------------------------------- - doc/liblzma-hacking.txt | 112 ---------------- - doc/liblzma-intro.txt | 194 ---------------------------- - doc/liblzma-security.txt | 219 -------------------------------- - doc/lzma-intro.txt | 107 ---------------- - 5 files changed, 956 deletions(-) - -commit 0255401e57c96af87c6b159eca28974e79430a82 -Author: Lasse Collin -Date: 2009-05-01 11:21:46 +0300 - - Added documentation about the legacy .lzma file format. - - doc/lzma-file-format.txt | 166 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 166 insertions(+) - -commit 1496ff437c46f38303e0e94c511ca604b3a11f85 -Author: Lasse Collin -Date: 2009-05-01 11:20:23 +0300 - - Renamed the file format specification to xz-file-format.txt - which is the filename used on the WWW. - - doc/{file-format.txt => xz-file-format.txt} | 0 - 1 file changed, 0 insertions(+), 0 deletions(-) - -commit 21c6b94373d239d7e86bd480fcd558e30391712f -Author: Lasse Collin -Date: 2009-04-28 23:08:32 +0300 - - Fixed a crash in liblzma. - - liblzma tries to avoid useless free()/malloc() pairs in - initialization when multiple files are handled using the - same lzma_stream. This didn't work with filter chains - due to comparison of wrong pointers in lzma_next_coder_init(), - making liblzma think that no memory reallocation is needed - even when it actually is. - - Easy way to trigger this bug is to decompress two files with - a single xz command. The first file should have e.g. x86+LZMA2 - as the filter chain, and the second file just LZMA2. - - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/alone_encoder.c | 4 ++-- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/block_encoder.c | 2 +- - src/liblzma/common/common.h | 4 ++-- - src/liblzma/common/easy_encoder.c | 2 +- - src/liblzma/common/index_decoder.c | 2 +- - src/liblzma/common/index_encoder.c | 2 +- - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- - 11 files changed, 13 insertions(+), 13 deletions(-) - -commit e518d167aa5958e469982f4fb3a24b9b6a2b5d1c -Author: Lasse Collin -Date: 2009-04-15 14:13:38 +0300 - - Fix uint32_t -> size_t in ARM and ARM-Thumb filters. - - On 64-bit system it would have gone into infinite - loop if a single input buffer was over 4 GiB (unlikely). - - src/liblzma/simple/arm.c | 2 +- - src/liblzma/simple/armthumb.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 31decdce041581e57c0d8a407d4795b114ef27ca -Author: Lasse Collin -Date: 2009-04-14 11:48:46 +0300 - - Minor fixes to test files' README. - - tests/files/README | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -commit 4787d654434891c7df5b43959b0d2873718f06e0 -Author: Lasse Collin -Date: 2009-04-13 16:36:41 +0300 - - Updated history.txt. - - doc/history.txt | 123 ++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 66 insertions(+), 57 deletions(-) - -commit 2f0bc9cd40f709152a0177c8e585c0757e9af9c9 -Author: Lasse Collin -Date: 2009-04-13 14:49:48 +0300 - - Quick & dirty update to support xz in diff/grep/more scripts. - - src/scripts/Makefile.am | 38 +++++++++++++++++++----------- - src/scripts/{lzdiff => xzdiff} | 24 +++++++++---------- - src/scripts/{lzdiff.1 => xzdiff.1} | 29 ++++++++++++++--------- - src/scripts/{lzgrep => xzgrep} | 10 ++++---- - src/scripts/{lzgrep.1 => xzgrep.1} | 48 +++++++++++++++++++++++++------------- - src/scripts/{lzmore => xzmore} | 12 +++++----- - src/scripts/{lzmore.1 => xzmore.1} | 33 +++++++++++++++++--------- - 7 files changed, 119 insertions(+), 75 deletions(-) - -commit 02ddf09bc3079b3e17297729b9e43f14d407b8fc -Author: Lasse Collin -Date: 2009-04-13 11:27:40 +0300 - - Put the interesting parts of XZ Utils into the public domain. - Some minor documentation cleanups were made at the same time. - - COPYING | 67 ++++++++++++++++++++------ - ChangeLog | 2 +- - Doxyfile.in | 8 +-- - Makefile.am | 13 ++--- - autogen.sh | 9 ++++ - configure.ac | 13 ++--- - debug/Makefile.am | 13 ++--- - debug/crc32.c | 13 ++--- - debug/full_flush.c | 13 ++--- - debug/hex2bin.c | 7 ++- - debug/known_sizes.c | 13 ++--- - debug/memusage.c | 13 ++--- - debug/repeat.c | 13 ++--- - debug/sync_flush.c | 13 ++--- - doc/faq.txt | 38 ++------------- - lib/Makefile.am | 18 +++---- - src/Makefile.am | 13 ++--- - src/common/bswap.h | 7 ++- - src/common/cpucores.h | 7 ++- - src/common/integer.h | 7 ++- - src/common/mythread.h | 4 +- - src/common/open_stdxxx.h | 7 ++- - src/common/physmem.h | 7 ++- - src/common/sysdefs.h | 13 ++--- - src/liblzma/Makefile.am | 13 ++--- - src/liblzma/api/Makefile.am | 13 ++--- - src/liblzma/api/lzma.h | 38 +++++++++------ - src/liblzma/api/lzma/base.h | 20 +++----- - src/liblzma/api/lzma/bcj.h | 18 +++---- - src/liblzma/api/lzma/block.h | 18 +++---- - src/liblzma/api/lzma/check.h | 18 +++---- - src/liblzma/api/lzma/container.h | 18 +++---- - src/liblzma/api/lzma/delta.h | 18 +++---- - src/liblzma/api/lzma/filter.h | 18 +++---- - src/liblzma/api/lzma/index.h | 18 +++---- - src/liblzma/api/lzma/index_hash.h | 22 +++------ - src/liblzma/api/lzma/lzma.h | 18 +++---- - src/liblzma/api/lzma/stream_flags.h | 18 +++---- - src/liblzma/api/lzma/subblock.h | 18 +++---- - src/liblzma/api/lzma/version.h | 18 +++---- - src/liblzma/api/lzma/vli.h | 46 ++++++++---------- - src/liblzma/check/Makefile.am | 8 ++- - src/liblzma/check/check.c | 7 ++- - src/liblzma/check/check.h | 7 ++- - src/liblzma/check/crc32_fast.c | 30 +++++------- - src/liblzma/check/crc32_small.c | 7 ++- - src/liblzma/check/crc32_table.c | 7 ++- - src/liblzma/check/crc32_tablegen.c | 7 ++- - src/liblzma/check/crc32_x86.S | 21 +++++--- - src/liblzma/check/crc64_fast.c | 20 +++----- - src/liblzma/check/crc64_small.c | 7 ++- - src/liblzma/check/crc64_table.c | 7 ++- - src/liblzma/check/crc64_tablegen.c | 7 ++- - src/liblzma/check/crc64_x86.S | 14 ++++-- - src/liblzma/check/crc_macros.h | 9 ++-- - src/liblzma/check/sha256.c | 23 +++++---- - src/liblzma/common/Makefile.am | 13 ++--- - src/liblzma/common/alone_decoder.c | 13 ++--- - src/liblzma/common/alone_decoder.h | 13 ++--- - src/liblzma/common/alone_encoder.c | 13 ++--- - src/liblzma/common/auto_decoder.c | 13 ++--- - src/liblzma/common/block_buffer_decoder.c | 13 ++--- - src/liblzma/common/block_buffer_encoder.c | 13 ++--- - src/liblzma/common/block_decoder.c | 13 ++--- - src/liblzma/common/block_decoder.h | 13 ++--- - src/liblzma/common/block_encoder.c | 13 ++--- - src/liblzma/common/block_encoder.h | 13 ++--- - src/liblzma/common/block_header_decoder.c | 13 ++--- - src/liblzma/common/block_header_encoder.c | 13 ++--- - src/liblzma/common/block_util.c | 13 ++--- - src/liblzma/common/bsr.h | 7 ++- - src/liblzma/common/chunk_size.c | 13 ++--- - src/liblzma/common/common.c | 13 ++--- - src/liblzma/common/common.h | 13 ++--- - src/liblzma/common/easy_buffer_encoder.c | 13 ++--- - src/liblzma/common/easy_decoder_memusage.c | 13 ++--- - src/liblzma/common/easy_encoder.c | 13 ++--- - src/liblzma/common/easy_encoder_memusage.c | 13 ++--- - src/liblzma/common/easy_preset.c | 13 ++--- - src/liblzma/common/easy_preset.h | 13 ++--- - src/liblzma/common/filter_buffer_decoder.c | 13 ++--- - src/liblzma/common/filter_buffer_encoder.c | 13 ++--- - src/liblzma/common/filter_common.c | 13 ++--- - src/liblzma/common/filter_common.h | 13 ++--- - src/liblzma/common/filter_decoder.c | 13 ++--- - src/liblzma/common/filter_decoder.h | 13 ++--- - src/liblzma/common/filter_encoder.c | 13 ++--- - src/liblzma/common/filter_encoder.h | 13 ++--- - src/liblzma/common/filter_flags_decoder.c | 13 ++--- - src/liblzma/common/filter_flags_encoder.c | 13 ++--- - src/liblzma/common/index.c | 13 ++--- - src/liblzma/common/index.h | 13 ++--- - src/liblzma/common/index_decoder.c | 13 ++--- - src/liblzma/common/index_encoder.c | 13 ++--- - src/liblzma/common/index_encoder.h | 13 ++--- - src/liblzma/common/index_hash.c | 13 ++--- - src/liblzma/common/stream_buffer_decoder.c | 13 ++--- - src/liblzma/common/stream_buffer_encoder.c | 13 ++--- - src/liblzma/common/stream_decoder.c | 13 ++--- - src/liblzma/common/stream_decoder.h | 13 ++--- - src/liblzma/common/stream_encoder.c | 13 ++--- - src/liblzma/common/stream_encoder.h | 13 ++--- - src/liblzma/common/stream_flags_common.c | 13 ++--- - src/liblzma/common/stream_flags_common.h | 13 ++--- - src/liblzma/common/stream_flags_decoder.c | 13 ++--- - src/liblzma/common/stream_flags_encoder.c | 13 ++--- - src/liblzma/common/vli_decoder.c | 13 ++--- - src/liblzma/common/vli_encoder.c | 13 ++--- - src/liblzma/common/vli_size.c | 13 ++--- - src/liblzma/delta/Makefile.am | 13 ++--- - src/liblzma/delta/delta_common.c | 13 ++--- - src/liblzma/delta/delta_common.h | 13 ++--- - src/liblzma/delta/delta_decoder.c | 13 ++--- - src/liblzma/delta/delta_decoder.h | 13 ++--- - src/liblzma/delta/delta_encoder.c | 13 ++--- - src/liblzma/delta/delta_encoder.h | 13 ++--- - src/liblzma/delta/delta_private.h | 13 ++--- - src/liblzma/lz/Makefile.am | 13 ++--- - src/liblzma/lz/lz_decoder.c | 17 ++----- - src/liblzma/lz/lz_decoder.h | 17 ++----- - src/liblzma/lz/lz_encoder.c | 17 ++----- - src/liblzma/lz/lz_encoder.h | 17 ++----- - src/liblzma/lz/lz_encoder_hash.h | 13 ++--- - src/liblzma/lz/lz_encoder_mf.c | 17 ++----- - src/liblzma/lzma/Makefile.am | 13 ++--- - src/liblzma/lzma/fastpos.h | 17 ++----- - src/liblzma/lzma/fastpos_tablegen.c | 17 ++----- - src/liblzma/lzma/lzma2_decoder.c | 17 ++----- - src/liblzma/lzma/lzma2_decoder.h | 17 ++----- - src/liblzma/lzma/lzma2_encoder.c | 17 ++----- - src/liblzma/lzma/lzma2_encoder.h | 17 ++----- - src/liblzma/lzma/lzma_common.h | 17 ++----- - src/liblzma/lzma/lzma_decoder.c | 17 ++----- - src/liblzma/lzma/lzma_decoder.h | 17 ++----- - src/liblzma/lzma/lzma_encoder.c | 17 ++----- - src/liblzma/lzma/lzma_encoder.h | 17 ++----- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 13 ++--- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 13 ++--- - src/liblzma/lzma/lzma_encoder_presets.c | 13 ++--- - src/liblzma/lzma/lzma_encoder_private.h | 17 ++----- - src/liblzma/rangecoder/Makefile.am | 13 ++--- - src/liblzma/rangecoder/price.h | 13 ++--- - src/liblzma/rangecoder/price_tablegen.c | 16 ++---- - src/liblzma/rangecoder/range_common.h | 17 ++----- - src/liblzma/rangecoder/range_decoder.h | 17 ++----- - src/liblzma/rangecoder/range_encoder.h | 17 ++----- - src/liblzma/simple/Makefile.am | 13 ++--- - src/liblzma/simple/arm.c | 17 ++----- - src/liblzma/simple/armthumb.c | 17 ++----- - src/liblzma/simple/ia64.c | 17 ++----- - src/liblzma/simple/powerpc.c | 17 ++----- - src/liblzma/simple/simple_coder.c | 13 ++--- - src/liblzma/simple/simple_coder.h | 14 ++---- - src/liblzma/simple/simple_decoder.c | 13 ++--- - src/liblzma/simple/simple_decoder.h | 13 ++--- - src/liblzma/simple/simple_encoder.c | 13 ++--- - src/liblzma/simple/simple_encoder.h | 13 ++--- - src/liblzma/simple/simple_private.h | 13 ++--- - src/liblzma/simple/sparc.c | 17 ++----- - src/liblzma/simple/x86.c | 17 ++----- - src/liblzma/subblock/Makefile.am | 13 ++--- - src/liblzma/subblock/subblock_decoder.c | 13 ++--- - src/liblzma/subblock/subblock_decoder.h | 13 ++--- - src/liblzma/subblock/subblock_decoder_helper.c | 13 ++--- - src/liblzma/subblock/subblock_decoder_helper.h | 13 ++--- - src/liblzma/subblock/subblock_encoder.c | 13 ++--- - src/liblzma/subblock/subblock_encoder.h | 13 ++--- - src/scripts/Makefile.am | 7 +++ - src/xz/Makefile.am | 13 ++--- - src/xz/args.c | 13 ++--- - src/xz/args.h | 13 ++--- - src/xz/hardware.c | 13 ++--- - src/xz/hardware.h | 13 ++--- - src/xz/io.c | 13 ++--- - src/xz/io.h | 13 ++--- - src/xz/list.c | 13 ++--- - src/xz/main.c | 13 ++--- - src/xz/main.h | 13 ++--- - src/xz/message.c | 13 ++--- - src/xz/message.h | 13 ++--- - src/xz/options.c | 13 ++--- - src/xz/options.h | 13 ++--- - src/xz/private.h | 13 ++--- - src/xz/process.c | 13 ++--- - src/xz/process.h | 13 ++--- - src/xz/signals.c | 13 ++--- - src/xz/signals.h | 13 ++--- - src/xz/suffix.c | 13 ++--- - src/xz/suffix.h | 13 ++--- - src/xz/util.c | 13 ++--- - src/xz/util.h | 13 ++--- - src/xzdec/Makefile.am | 13 ++--- - src/xzdec/xzdec.c | 13 ++--- - tests/Makefile.am | 13 ++--- - tests/bcj_test.c | 7 ++- - tests/create_compress_files.c | 13 ++--- - tests/test_block.c | 13 ++--- - tests/test_block_header.c | 13 ++--- - tests/test_check.c | 13 ++--- - tests/test_compress.sh | 13 ++--- - tests/test_files.sh | 13 ++--- - tests/test_filter_flags.c | 13 ++--- - tests/test_index.c | 13 ++--- - tests/test_stream_flags.c | 13 ++--- - tests/tests.h | 13 ++--- - windows/common.rc | 2 +- - 206 files changed, 868 insertions(+), 2023 deletions(-) - -commit e79c42d854657ae7f75613bd80c1a35ff7c525cb -Author: Lasse Collin -Date: 2009-04-10 11:17:02 +0300 - - Fix off-by-one in LZ decoder. - - Fortunately, this bug had no security risk other than accepting - some corrupt files as valid. - - src/liblzma/lz/lz_decoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 94eb9ad46f1fded6d8369cf3d38bb9754c1375af -Author: Pavel Roskin -Date: 2009-03-31 12:15:01 -0400 - - Fix minor typos in README - - README | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 9bab5336ebd765ec4e12252f416eefdf04eba750 -Author: Lasse Collin -Date: 2009-03-31 21:52:51 +0300 - - Add a note and work-around instructions to README about - problems detecting a C99 compiler when some standard - headers are missing. - - README | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -commit a0497ff7a06f9350349264fe9b52dfefc6d53ead -Author: Lasse Collin -Date: 2009-03-18 16:54:38 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 390e69887fc5e0a108eb41203bed9acd100a3d76 -Author: Lasse Collin -Date: 2009-03-18 16:51:41 +0200 - - Fix wrong macro names in lc_cpucores.m4 and cpucores.h. - Thanks to Bert Wesarg. - - m4/lc_cpucores.m4 | 4 ++-- - src/common/cpucores.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 0df9299e2478c2a0c62c05b1ae14a85a353e20d6 -Author: Lasse Collin -Date: 2009-03-01 09:03:08 +0200 - - Test for Linux-specific sysinfo() only on Linux systems. - Some other systems have sysinfo() with different semantics. - - m4/lc_physmem.m4 | 28 +++++++++++++++++++--------- - 1 file changed, 19 insertions(+), 9 deletions(-) - -commit cf751edfde3ad6e088dc18e0522d31ae38405933 -Author: Lasse Collin -Date: 2009-03-01 09:00:06 +0200 - - Added AC_CONFIG_MACRO_DIR to configure.ac. - - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -commit 63df14c57dee7c461717784287056688482a7eb9 -Author: Lasse Collin -Date: 2009-03-01 08:58:41 +0200 - - Fix the Autoconf test for getopt_long replacement. - It was broken by e114502b2bc371e4a45449832cb69be036360722. - - m4/getopt.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -commit fd6a380f4eda4f00be5f2aa8d222992cd74a714f -Author: Lasse Collin -Date: 2009-02-22 19:07:54 +0200 - - Add a rough explanation of --extreme to output of --help. - - src/xz/message.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 68bf7ac2984d3627369a240ef0491934d53f7899 -Author: Lasse Collin -Date: 2009-02-22 18:52:49 +0200 - - Fixes to progress message handling in xz: - - - Don't use Windows-specific code on Windows. The old code - required at least Windows 2000. Now it should work on - Windows 98 and later, and maybe on Windows 95 too. - - - Use less precision when showing estimated remaining time. - - - Fix some small design issues. - - src/xz/message.c | 483 +++++++++++++++++++++++++++++++++++-------------------- - src/xz/message.h | 28 ++-- - src/xz/process.c | 53 +++--- - 3 files changed, 351 insertions(+), 213 deletions(-) - -commit 47c2e21f82242f50f18713a27d644c2c94ab3fea -Author: Lasse Collin -Date: 2009-02-18 13:00:10 +0200 - - Added files missing from the previous commit. - - src/liblzma/api/lzma/container.h | 33 +++++++++++++++++++++++++++++++++ - src/liblzma/common/Makefile.am | 7 ++++++- - 2 files changed, 39 insertions(+), 1 deletion(-) - -commit 489a3dbaa0465f04400804e956a1cfbbee3654a2 -Author: Lasse Collin -Date: 2009-02-17 10:43:00 +0200 - - Added lzma_easy_buffer_encode(). Splitted easy.c into small - pieces to avoid unneeded dependencies making statically - linked applications bigger than needed. - - dos/Makefile | 6 ++- - src/liblzma/common/easy_buffer_encoder.c | 34 +++++++++++++++++ - src/liblzma/common/easy_decoder_memusage.c | 31 ++++++++++++++++ - src/liblzma/common/{easy.c => easy_encoder.c} | 53 +++------------------------ - src/liblzma/common/easy_encoder_memusage.c | 31 ++++++++++++++++ - src/liblzma/common/easy_preset.c | 34 +++++++++++++++++ - src/liblzma/common/easy_preset.h | 39 ++++++++++++++++++++ - windows/Makefile | 6 ++- - 8 files changed, 185 insertions(+), 49 deletions(-) - -commit 7494816ab08d82f4d6409788825930c4e43cfd0d -Author: Lasse Collin -Date: 2009-02-15 15:48:45 +0200 - - Make physmem.h work on old Windows versions. - Thanks to Hongbo Ni for the original patch. - - src/common/physmem.h | 31 +++++++++++++++++++++++++++---- - 1 file changed, 27 insertions(+), 4 deletions(-) - -commit 11ae4ae35fd70182c713f2d914b7cb1143bc76f0 -Author: Lasse Collin -Date: 2009-02-14 20:44:52 +0200 - - Fix microsecond vs. nanosecond confusion in my_time(). - - src/xz/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3084d662d2646ab7eb58daf0dc32cf3f9a74eec7 -Author: Lasse Collin -Date: 2009-02-14 00:45:29 +0200 - - Cleanups to the code that detects the amount of RAM and - the number of CPU cores. Added support for using sysinfo() - on Linux systems whose libc lacks appropriate sysconf() - support (at least dietlibc). The Autoconf macros were - split into separate files, and CPU core count detection - was moved from hardware.c to cpucores.h. The core count - isn't used for anything real for now, so a problematic - part in process.c was commented out. - - configure.ac | 89 ++------------------------------------------------- - m4/lc_cpucores.m4 | 57 +++++++++++++++++++++++++++++++++ - m4/lc_physmem.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++ - src/common/cpucores.h | 52 ++++++++++++++++++++++++++++++ - src/common/physmem.h | 21 +++++++----- - src/xz/args.c | 4 +-- - src/xz/hardware.c | 50 +++++++++++++---------------- - src/xz/hardware.h | 11 +++++-- - src/xz/message.c | 5 +-- - src/xz/process.c | 2 ++ - 10 files changed, 235 insertions(+), 130 deletions(-) - -commit 9c62371eab2706c46b1072f5935e28cb4cd9dca8 -Author: Lasse Collin -Date: 2009-02-13 18:23:50 +0200 - - Initial port to DOS using DJGPP. - - dos/Makefile | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - dos/README | 113 ++++++++++++++++++++++++++ - dos/config.h | 150 ++++++++++++++++++++++++++++++++++ - 3 files changed, 524 insertions(+) - -commit 0dae8b7751d09e9c5a482d5519daaee4800ce203 -Author: Lasse Collin -Date: 2009-02-13 18:02:05 +0200 - - Windows port: Take advantage of the version number macros. - Now the version number is not duplicated in the - Windows-specific files anymore. - - windows/Makefile | 2 +- - windows/common.rc | 16 ++++++++-------- - windows/config.h | 15 --------------- - 3 files changed, 9 insertions(+), 24 deletions(-) - -commit fdbc0cfa71f7d660855098a609175ba384259529 -Author: Lasse Collin -Date: 2009-02-13 18:00:03 +0200 - - Changed how the version number is specified in various places. - Now configure.ac will get the version number directly from - src/liblzma/api/lzma/version.h. The intent is to reduce the - number of places where the version number is duplicated. In - future, support for displaying Git commit ID may be added too. - - configure.ac | 3 +- - src/liblzma/api/lzma/version.h | 70 ++++++++++++++++++++++++++++++++++++++++-- - src/liblzma/common/common.c | 2 +- - src/xz/message.c | 2 +- - src/xzdec/xzdec.c | 2 +- - version.sh | 23 ++++++++++++++ - 6 files changed, 95 insertions(+), 7 deletions(-) - -commit 1d924e584b146136989f48c13fff2632896efb3d -Author: Lasse Collin -Date: 2009-02-13 17:30:30 +0200 - - Fix handling of integrity check type in the xz command line tool. - - src/xz/args.c | 9 ++++++++- - src/xz/process.c | 4 ++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -commit 96c46df7deb231ea68a03d8d1da9de4c774e36d8 -Author: Lasse Collin -Date: 2009-02-13 17:29:02 +0200 - - Improve support for DOS-like systems. - Here DOS-like means DOS, Windows, and OS/2. - - src/common/physmem.h | 12 ++++++++++++ - src/common/sysdefs.h | 4 ++++ - src/liblzma/check/crc32_x86.S | 6 +++--- - src/liblzma/check/crc64_x86.S | 6 +++--- - src/xz/args.c | 13 +++++-------- - src/xz/io.c | 39 +++++++++++++++++++++++++-------------- - src/xz/main.c | 23 +++++++++++++++++++++++ - src/xz/message.c | 3 +++ - src/xz/suffix.c | 5 +++++ - src/xzdec/xzdec.c | 5 +++-- - 10 files changed, 86 insertions(+), 30 deletions(-) - -commit b6a30ee8c2de60ecd722cd05223e4ba72f822e33 -Author: Lasse Collin -Date: 2009-02-11 20:02:32 +0200 - - Remove dead directories from .gitignore. - - .gitignore | 2 -- - 1 file changed, 2 deletions(-) - -commit 1ec5b0027911d94cb6f98892cbc690f818d8a861 -Author: Jim Meyering -Date: 2009-02-11 14:45:14 +0100 - - .gitignore vs. Makefiles - - How about this for those of us who do srcdir builds? - - .gitignore | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -commit 154f5aec2de201c674841de4fcc9804c2a87af07 -Author: Lasse Collin -Date: 2009-02-10 21:48:35 +0200 - - Removed Makefile from .gitignore since not all Makefiles - in the repository are generated by Autotools. People - should do test builds in a separate build directory anyway. - - .gitignore | 1 - - 1 file changed, 1 deletion(-) - -commit e605c2663691b0a4c307786aa368d124ea081daa -Author: Lasse Collin -Date: 2009-02-10 21:48:05 +0200 - - Added resource files for the Windows build. - - windows/Makefile | 37 ++++++++++++++++++++++--------------- - windows/common.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - windows/liblzma.rc | 5 +++++ - windows/lzmadec.rc | 5 +++++ - windows/xz.rc | 5 +++++ - windows/xzdec.rc | 5 +++++ - 6 files changed, 88 insertions(+), 15 deletions(-) - -commit a3bbbe05d32b1f7ea9eb98805df4dda2e811b476 -Author: Lasse Collin -Date: 2009-02-09 14:54:31 +0200 - - Let the user specify custom CFLAGS on the make command - line. Previously custom CFLAGS worked only when they were - passed to configure. - - configure.ac | 58 ++++++++++++++++++++++--------------------- - src/liblzma/check/Makefile.am | 2 +- - 2 files changed, 31 insertions(+), 29 deletions(-) - -commit 53f7598998b1860a69c51243b5d2e34623c6bf60 -Author: Lasse Collin -Date: 2009-02-08 21:35:11 +0200 - - Fix aliasing issue in physmem.h. - - src/common/physmem.h | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -commit 0e27028d74c5c7a8e036ae2a9b8cecb0ac79d3a6 -Author: Lasse Collin -Date: 2009-02-08 18:24:50 +0200 - - Add a separate internal function to initialize the CRC32 - table, which is used also by LZ encoder. This was needed - because calling lzma_crc32() and ignoring the result is - a no-op due to lzma_attr_pure. - - src/liblzma/check/check.h | 1 + - src/liblzma/check/crc32_small.c | 10 +++++++++- - src/liblzma/lz/lz_encoder.c | 4 ++-- - 3 files changed, 12 insertions(+), 3 deletions(-) - -commit ae1ad9af54210c9a2be336b1316532da5071516c -Author: Lasse Collin -Date: 2009-02-08 18:17:05 +0200 - - Make "xz --force" to write to terminal as the error - message suggests. - - src/xz/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 79e25eded48d2fe33f31441ab7a034f902e335f8 -Author: Lasse Collin -Date: 2009-02-08 10:37:50 +0200 - - Support both slash and backslash as path component - separator on Windows when parsing argv[0]. - - src/xz/args.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit bc7c7109cc4410055a888c1c70cbd1c9445c4361 -Author: Lasse Collin -Date: 2009-02-07 23:18:13 +0200 - - Omit the wrong and (even if corrected) nowadays useless rm - from autogen.sh. - - autogen.sh | 28 ---------------------------- - 1 file changed, 28 deletions(-) - -commit edfc2031e56f8a2ccda063f02936b3a848d88723 -Author: Lasse Collin -Date: 2009-02-07 21:41:52 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 880c3309386aac58fc4f3d7ca99bd31bcb1526a3 -Author: Lasse Collin -Date: 2009-02-07 21:17:07 +0200 - - Make it easy to choose if command line tools should be - linked statically or dynamically against liblzma. The - default is still to use static liblzma, but it can now - be changed by passing --enable-dynamic to configure. - Thanks to Mike Frysinger for the original patch. - - Fixed a few minor bugs in configure.ac. - - configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ - src/xz/Makefile.am | 8 +++----- - src/xzdec/Makefile.am | 5 +++-- - 3 files changed, 45 insertions(+), 7 deletions(-) - -commit 3f86532407e4ace3debb62be16035e009b56ca36 -Author: Mike Frysinger -Date: 2009-02-06 23:38:39 -0500 - - add gitignore files - - Signed-off-by: Mike Frysinger - - .gitignore | 32 ++++++++++++++++++++++++++++++++ - m4/.gitignore | 35 +++++++++++++++++++++++++++++++++++ - po/.gitignore | 12 ++++++++++++ - 3 files changed, 79 insertions(+) - -commit bd7ca1dad5c146b6217799ffaa230c32d207a3e5 -Author: Lasse Collin -Date: 2009-02-07 17:07:52 +0200 - - Assume 32 MiB of RAM on unsupported operating systems like - the comment in hardware.c already said. - - src/xz/hardware.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d0ab8c1c73ae712adb0d26fbb9da762d99a63618 -Author: Lasse Collin -Date: 2009-02-07 16:26:58 +0200 - - MinGW support: Don't build fastpos_tablegen.c as part of - liblzma. Build both static and dynamic liblzma, and also - static and dynamic versions of the command line tools. - - windows/Makefile | 92 ++++++++++++++++++++++++++++++++++++++++++-------------- - windows/README | 10 ------ - 2 files changed, 69 insertions(+), 33 deletions(-) - -commit bfd91198e44a52bd9bfe3cd6dcae5edab7c6eb45 -Author: Lasse Collin -Date: 2009-02-07 15:55:47 +0200 - - Support LZMA_API_STATIC in assembler files to - avoid __declspec(dllexport) equivalent. - - src/liblzma/check/crc32_x86.S | 4 ++++ - src/liblzma/check/crc64_x86.S | 2 ++ - 2 files changed, 6 insertions(+) - -commit 3306cf3883492720b3c34baa02f4eb4227d91c73 -Author: Lasse Collin -Date: 2009-02-07 11:11:50 +0200 - - Introduced LZMA_API_STATIC macro, which the applications - need to #define when linking against static liblzma on - platforms like Windows. Most developers don't need to - care about LZMA_API_STATIC at all. - - src/liblzma/api/lzma.h | 31 ++++++++++++++++++++++++------- - src/liblzma/common/common.h | 2 +- - 2 files changed, 25 insertions(+), 8 deletions(-) - -commit b719e63c5f4c91d2d5e2ea585d4c055ec3767d0b -Author: Lasse Collin -Date: 2009-02-06 16:55:45 +0200 - - Another grammar fix - - README | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit fe5434f940f75fec3611cf9d9edf78c4da8ac760 -Author: Lasse Collin -Date: 2009-02-06 12:30:23 +0200 - - Grammar fix in README. - - README | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3dfa58a9eedf5a0e566452b078801c9cbcf7a245 -Author: Lasse Collin -Date: 2009-02-06 10:06:32 +0200 - - Some MSYS installations (e.g. MsysGit) don't include - install.exe, so don't rely on it. - - windows/Makefile | 12 +++++++----- - windows/README | 11 ++++++----- - 2 files changed, 13 insertions(+), 10 deletions(-) - -commit 975d8fd72a5148d46b2e1745f7a211cf1dfd9d31 -Author: Lasse Collin -Date: 2009-02-06 09:13:15 +0200 - - Recreated the BCJ test files for x86 and SPARC. The old files - were linked with crt*.o, which are copyrighted, and thus the - old test files were not in the public domain as a whole. They - are freely distributable though, but it is better to be careful - and avoid including any copyrighted pieces in the test files. - The new files are just compiled and assembled object files, - and thus don't contain any copyrighted code. - - tests/bcj_test.c | 2 +- - tests/compress_prepared_bcj_sparc | Bin 6804 -> 1240 bytes - tests/compress_prepared_bcj_x86 | Bin 4649 -> 1388 bytes - tests/files/good-1-sparc-lzma2.xz | Bin 2296 -> 612 bytes - tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 716 bytes - 5 files changed, 1 insertion(+), 1 deletion(-) - -commit 094b1b09a531f0d201ec81f2b07346a995fd80b9 -Author: Lasse Collin -Date: 2009-02-05 21:21:27 +0200 - - Add the "windows" directory to EXTRA_DIST. - - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -commit e1c3412eec7acec7ca3b32c9c828f3147dc65b49 -Author: Lasse Collin -Date: 2009-02-05 09:17:51 +0200 - - Added initial experimental makefile for use with MinGW. - - windows/Makefile | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - windows/README | 164 ++++++++++++++++++++++++++++++++++++ - windows/config.h | 180 +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 597 insertions(+) - -commit 75905a9afc0ee89954ede7d08af70d1148bf0fd9 -Author: Lasse Collin -Date: 2009-02-05 09:12:57 +0200 - - Various code cleanups the the xz command line tool. - It now builds with MinGW. - - src/common/physmem.h | 13 ++++ - src/xz/Makefile.am | 2 + - src/xz/args.h | 8 --- - src/xz/hardware.h | 10 +-- - src/xz/io.c | 93 +++++++++++++++++++------- - src/xz/io.h | 12 ++-- - src/xz/main.c | 132 ++----------------------------------- - src/xz/main.h | 22 ------- - src/xz/message.c | 65 ++++++++++++++++--- - src/xz/message.h | 6 -- - src/xz/options.h | 8 --- - src/xz/private.h | 18 ++++-- - src/xz/process.h | 10 +-- - src/xz/signals.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/signals.h | 51 +++++++++++++++ - src/xz/suffix.h | 5 -- - src/xz/util.c | 5 +- - src/xz/util.h | 5 -- - 18 files changed, 399 insertions(+), 246 deletions(-) - -commit d0c0b9e94e0af59d1d8f7f4829695d6efe19ccfe -Author: Lasse Collin -Date: 2009-02-03 12:15:17 +0200 - - Another utime() fix. - - src/xz/io.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -commit ccf92a29e8c7234284f1568c1ec0fd7cb98356ca -Author: Lasse Collin -Date: 2009-02-03 10:41:11 +0200 - - Fix wrong filename argument for utime() and utimes(). - This doesn't affect most systems, since most systems - have better functions available. - - src/xz/io.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 99c1c2abfae2e87f3c17e929783e6d1bb7a3f302 -Author: Lasse Collin -Date: 2009-02-02 21:19:01 +0200 - - Updated the x86 assembler code: - - Use call/ret pair to get instruction pointer for PIC. - - Use PIC only if PIC or __PIC__ is #defined. - - The code should work on MinGW and Darwin in addition - to GNU/Linux and Solaris. - - configure.ac | 6 ---- - src/liblzma/check/crc32_x86.S | 84 ++++++++++++++++++++++++++++++++++++------- - src/liblzma/check/crc64_x86.S | 82 ++++++++++++++++++++++++++++++++++++------ - 3 files changed, 144 insertions(+), 28 deletions(-) - -commit 22a0c6dd940b78cdac2f4a4b4b0e7cc0ac15021f -Author: Lasse Collin -Date: 2009-02-02 20:14:03 +0200 - - Modify LZMA_API macro so that it works on Windows with - other compilers than MinGW. This may hurt readability - of the API headers slightly, but I don't know any - better way to do this. - - src/liblzma/api/lzma.h | 6 ++--- - src/liblzma/api/lzma/base.h | 11 ++++---- - src/liblzma/api/lzma/block.h | 22 ++++++++-------- - src/liblzma/api/lzma/check.h | 10 ++++---- - src/liblzma/api/lzma/container.h | 22 ++++++++-------- - src/liblzma/api/lzma/filter.h | 28 ++++++++++----------- - src/liblzma/api/lzma/index.h | 40 +++++++++++++++--------------- - src/liblzma/api/lzma/index_hash.h | 10 ++++---- - src/liblzma/api/lzma/lzma.h | 6 ++--- - src/liblzma/api/lzma/stream_flags.h | 10 ++++---- - src/liblzma/api/lzma/version.h | 4 +-- - src/liblzma/api/lzma/vli.h | 6 ++--- - src/liblzma/check/check.c | 4 +-- - src/liblzma/check/crc32_fast.c | 2 +- - src/liblzma/check/crc32_small.c | 2 +- - src/liblzma/check/crc64_fast.c | 2 +- - src/liblzma/check/crc64_small.c | 2 +- - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_buffer_decoder.c | 2 +- - src/liblzma/common/block_buffer_encoder.c | 4 +-- - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/block_encoder.c | 2 +- - src/liblzma/common/block_header_decoder.c | 2 +- - src/liblzma/common/block_header_encoder.c | 4 +-- - src/liblzma/common/block_util.c | 6 ++--- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/common.c | 16 ++++++------ - src/liblzma/common/common.h | 2 +- - src/liblzma/common/easy.c | 6 ++--- - src/liblzma/common/filter_buffer_decoder.c | 2 +- - src/liblzma/common/filter_buffer_encoder.c | 2 +- - src/liblzma/common/filter_decoder.c | 8 +++--- - src/liblzma/common/filter_encoder.c | 12 ++++----- - src/liblzma/common/filter_flags_decoder.c | 2 +- - src/liblzma/common/filter_flags_encoder.c | 4 +-- - src/liblzma/common/index.c | 32 ++++++++++++------------ - src/liblzma/common/index_decoder.c | 4 +-- - src/liblzma/common/index_encoder.c | 4 +-- - src/liblzma/common/index_hash.c | 10 ++++---- - src/liblzma/common/stream_buffer_decoder.c | 2 +- - src/liblzma/common/stream_buffer_encoder.c | 4 +-- - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- - src/liblzma/common/stream_flags_common.c | 2 +- - src/liblzma/common/stream_flags_decoder.c | 4 +-- - src/liblzma/common/stream_flags_encoder.c | 4 +-- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/common/vli_encoder.c | 2 +- - src/liblzma/common/vli_size.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 2 +- - 54 files changed, 177 insertions(+), 176 deletions(-) - -commit 8dd7b6052e18621e2e6c62f40f762ee88bd3eb65 -Author: Lasse Collin -Date: 2009-02-01 22:40:35 +0200 - - Fix a bug in lzma_block_buffer_decode(), although this - function should be rewritten anyway. - - src/liblzma/common/block_buffer_decoder.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit 55fd41431e61fb8178858283d636b6781e33e847 -Author: Lasse Collin -Date: 2009-02-01 22:39:07 +0200 - - Added initial version of raw buffer-to-buffer coding - functions, and cleaned up filter.h API header a little. - May be very buggy, not tested yet. - - src/liblzma/api/lzma/filter.h | 84 +++++++++++++++++++------- - src/liblzma/common/Makefile.am | 2 + - src/liblzma/common/filter_buffer_decoder.c | 94 ++++++++++++++++++++++++++++++ - src/liblzma/common/filter_buffer_encoder.c | 61 +++++++++++++++++++ - 4 files changed, 221 insertions(+), 20 deletions(-) - -commit 3e54ecee5cad30a5ca361a88a99230407abc0699 -Author: Lasse Collin -Date: 2009-02-01 00:11:20 +0200 - - Fix missing newlines in xzdec.c. - - src/xzdec/xzdec.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit d64ca34f1b6f34e86adefc7f735b4eff8e6d4a35 -Author: Lasse Collin -Date: 2009-02-01 00:10:07 +0200 - - Use __cdecl also for function pointers in liblzma API when - on Windows. - - src/liblzma/api/lzma.h | 18 +++++++++++------- - src/liblzma/api/lzma/base.h | 4 ++-- - src/liblzma/common/common.h | 18 +++++++----------- - 3 files changed, 20 insertions(+), 20 deletions(-) - -commit 6a2eb54092fc625d59921a607ff68cd1a90aa898 -Author: Lasse Collin -Date: 2009-01-31 11:01:48 +0200 - - Add LZMA_API to liblzma API headers. It's useful at least - on Windows. sysdefs.h no longer #includes lzma.h, so lzma.h - has to be #included separately where needed. - - src/common/sysdefs.h | 2 -- - src/liblzma/api/lzma.h | 17 ++++++++++++++ - src/liblzma/api/lzma/base.h | 10 ++++---- - src/liblzma/api/lzma/block.h | 25 +++++++++++--------- - src/liblzma/api/lzma/check.h | 12 ++++++---- - src/liblzma/api/lzma/container.h | 23 +++++++++--------- - src/liblzma/api/lzma/filter.h | 24 +++++++++---------- - src/liblzma/api/lzma/index.h | 47 +++++++++++++++++++++---------------- - src/liblzma/api/lzma/index_hash.h | 11 +++++---- - src/liblzma/api/lzma/lzma.h | 8 ++++--- - src/liblzma/api/lzma/stream_flags.h | 10 ++++---- - src/liblzma/api/lzma/version.h | 4 ++-- - src/liblzma/api/lzma/vli.h | 10 ++++---- - src/liblzma/common/common.h | 13 ++++++++-- - src/xz/private.h | 1 + - src/xzdec/xzdec.c | 1 + - tests/tests.h | 1 + - 17 files changed, 131 insertions(+), 88 deletions(-) - -commit d9993fcb4dfc1f93abaf31ae23b3ef1f3123892b -Author: Lasse Collin -Date: 2009-01-31 10:13:09 +0200 - - Use _WIN32 instead of WIN32 in xzdec.c to test if compiling on Windows. - - src/xzdec/xzdec.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 2dbdc5befb33c3703e4609809101047c67caf343 -Author: Lasse Collin -Date: 2009-01-31 10:02:52 +0200 - - Fix two lines in lzma.h on which the # wasn't at the - beginning of the line. - - src/liblzma/api/lzma.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 4ab760109106dc04f39dd81c97d50f528d1b51c1 -Author: Lasse Collin -Date: 2009-01-31 09:55:05 +0200 - - Add support for using liblzma headers in MSVC, which has no - stdint.h or inttypes.h. - - src/liblzma/api/lzma.h | 70 +++++++++++++++++++++++++++++++++----------------- - 1 file changed, 46 insertions(+), 24 deletions(-) - -commit b2172cf823d3be34cb0246cb4cb32d105e2a34c9 -Author: Lasse Collin -Date: 2009-01-31 08:49:54 +0200 - - Fix # -> ## in a macro in lzma.h. - - src/liblzma/api/lzma.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1aae8698746d3c87a93f8398cdde2de9ba1f7208 -Author: Lasse Collin -Date: 2009-01-30 18:50:16 +0200 - - Updated README. - - README | 30 ++++++++++++++++++++---------- - 1 file changed, 20 insertions(+), 10 deletions(-) - -commit f54bcf6f80d585236bc03ce49f7c73e1abaa17eb -Author: Lasse Collin -Date: 2009-01-30 00:29:58 +0200 - - Remove dangling crc64_init.c. - - src/liblzma/check/crc64_init.c | 55 ------------------------------------------ - 1 file changed, 55 deletions(-) - -commit 982da7ed314398420c38bf154a8f759d5f18b480 -Author: Lasse Collin -Date: 2009-01-28 17:16:38 +0200 - - The .xz file format specification version 1.0.0 is now - officially released. The format has been technically the same - since 2008-11-19, but now that it is frozen, people can start - using it without a fear that the format will break. - - doc/file-format.txt | 84 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 49 insertions(+), 35 deletions(-) - -commit c4683a660b4372156bdaf92f0cdc54a58f95ee6f -Author: Lasse Collin -Date: 2009-01-28 08:45:59 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 3241317093595db9f79104faafe93cb989c9f858 -Author: Lasse Collin -Date: 2009-01-28 08:43:26 +0200 - - Fix uninitialized variables in alone_decoder.c. This bug was - triggered by the previous commit, since these variables were - not used by anything before support for a preset dictionary. - - src/liblzma/common/alone_decoder.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit f76e39cf930f888d460b443d18f977ebedea8b2a -Author: Lasse Collin -Date: 2009-01-27 18:36:05 +0200 - - Added initial support for preset dictionary for raw LZMA1 - and LZMA2. It is not supported by the .xz format or the xz - command line tool yet. - - src/liblzma/lz/lz_decoder.c | 35 +++++++++++++++++++++++++---------- - src/liblzma/lz/lz_decoder.h | 9 ++++++++- - src/liblzma/lz/lz_encoder.c | 18 ++++++++++++++++-- - src/liblzma/lzma/lzma2_decoder.c | 9 ++++++--- - src/liblzma/lzma/lzma2_encoder.c | 12 +++++++----- - src/liblzma/lzma/lzma_decoder.c | 10 ++++++---- - src/liblzma/lzma/lzma_decoder.h | 2 +- - src/liblzma/lzma/lzma_encoder.c | 9 ++++++++- - 8 files changed, 77 insertions(+), 27 deletions(-) - -commit 449b8c832b26c3633f3bec60095e57d2d3ada1f3 -Author: Lasse Collin -Date: 2009-01-26 20:09:17 +0200 - - Regenerate the CRC tables without trailing blanks. - - src/liblzma/check/crc32_table_be.h | 1008 +++++++++++++++++------------------ - src/liblzma/check/crc32_table_le.h | 1008 +++++++++++++++++------------------ - src/liblzma/check/crc64_table_be.h | 1016 ++++++++++++++++++------------------ - src/liblzma/check/crc64_table_le.h | 1016 ++++++++++++++++++------------------ - 4 files changed, 2024 insertions(+), 2024 deletions(-) - -commit 850f7400428dc9c5fd08a2f35a5bd2c9e45aede2 -Author: Jim Meyering -Date: 2009-01-19 21:37:16 +0100 - - remove trailing blanks from all but .xz files - - debug/known_sizes.c | 2 +- - extra/scanlzma/scanlzma.c | 5 ++--- - src/liblzma/check/crc32_tablegen.c | 2 +- - src/liblzma/check/crc64_tablegen.c | 2 +- - src/scripts/lzdiff.1 | 4 ++-- - src/scripts/lzmore.1 | 6 +++--- - tests/test_compress.sh | 4 ++-- - 7 files changed, 12 insertions(+), 13 deletions(-) - -commit 667481f1aad34e1ed15738e7913a9c7e256b4cf5 -Author: Lasse Collin -Date: 2009-01-26 14:34:10 +0200 - - Add lzma_block_buffer_decode(). - - src/liblzma/api/lzma/block.h | 41 +++++++++++++++ - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/block_buffer_decoder.c | 87 +++++++++++++++++++++++++++++++ - 3 files changed, 129 insertions(+) - -commit 5fb34d8324d3e7e0061df25d0086b64c8726b19d -Author: Lasse Collin -Date: 2009-01-26 14:33:28 +0200 - - Add more sanity checks to lzma_stream_buffer_decode(). - - src/liblzma/common/stream_buffer_decoder.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit c129748675a5daa8838df92bde32cc04f6ce61ba -Author: Lasse Collin -Date: 2009-01-26 14:33:13 +0200 - - Avoid hardcoded constant in easy.c. - - src/liblzma/common/easy.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1859d22d75e072463db74c25bc3f5a7992e5fdf6 -Author: Lasse Collin -Date: 2009-01-26 13:06:49 +0200 - - Tiny bit better sanity check in block_util.c - - src/liblzma/common/block_util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2c5fe958e4bbe9b147b10c255955dfe2827fb8e7 -Author: Lasse Collin -Date: 2009-01-25 01:35:56 +0200 - - Fix a dumb bug in Block decoder, which made it return - LZMA_DATA_ERROR with valid data. The bug was added in - e114502b2bc371e4a45449832cb69be036360722. - - src/liblzma/common/block_decoder.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit c81f13ff29271de7293f8af3d81848b1dcae3d19 -Author: Lasse Collin -Date: 2009-01-23 22:27:50 +0200 - - Added lzma_stream_buffer_decode() and made minor cleanups. - - src/liblzma/api/lzma/block.h | 3 +- - src/liblzma/api/lzma/container.h | 51 ++++++++++++++++- - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/stream_buffer_decoder.c | 91 ++++++++++++++++++++++++++++++ - 4 files changed, 144 insertions(+), 2 deletions(-) - -commit 0b3318661ce749550b8531dfd469639a08930391 -Author: Lasse Collin -Date: 2009-01-22 12:53:33 +0200 - - Fix a comment. - - src/liblzma/common/common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9ec80355a7212a0a2f8c89d98e51b1d8b4e34eec -Author: Lasse Collin -Date: 2009-01-20 16:37:27 +0200 - - Add some single-call buffer-to-buffer coding functions. - - src/liblzma/api/lzma/block.h | 57 ++++++ - src/liblzma/api/lzma/container.h | 56 ++++++ - src/liblzma/api/lzma/index.h | 70 ++++++- - src/liblzma/common/Makefile.am | 2 + - src/liblzma/common/block_buffer_encoder.c | 305 +++++++++++++++++++++++++++++ - src/liblzma/common/index_decoder.c | 83 ++++++-- - src/liblzma/common/index_encoder.c | 59 +++++- - src/liblzma/common/stream_buffer_encoder.c | 138 +++++++++++++ - tests/test_index.c | 24 +++ - 9 files changed, 768 insertions(+), 26 deletions(-) - -commit d8b58d099340f8f4007b24b211ee41a7210c061c -Author: Lasse Collin -Date: 2009-01-20 13:45:41 +0200 - - Block encoder cleanups - - src/liblzma/common/block_encoder.c | 28 +++++++--------------------- - src/liblzma/common/block_encoder.h | 25 +++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 21 deletions(-) - -commit 0c09810cb3635cb575cb54e694d41523e7d0a335 -Author: Lasse Collin -Date: 2009-01-20 10:35:15 +0200 - - Use LZMA_PROG_ERROR in lzma_code() as documented in base.h. - - src/liblzma/common/common.c | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -commit 2f1a8e8eb898f6c036cde55d153ad348bfab3c00 -Author: Lasse Collin -Date: 2009-01-19 22:53:18 +0200 - - Fix handling of non-fatal errors in lzma_code(). - - src/liblzma/common/common.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -commit 4810b6bc25087be872960b9dd1d11ff07735dc88 -Author: Lasse Collin -Date: 2009-01-19 14:00:33 +0200 - - Move some LZMA2 constants to lzma2_encoder.h so that they - can be used outside lzma2_encoder.c. - - src/liblzma/lzma/lzma2_encoder.c | 13 ------------- - src/liblzma/lzma/lzma2_encoder.h | 14 ++++++++++++++ - src/liblzma/lzma/lzma_encoder.c | 3 ++- - 3 files changed, 16 insertions(+), 14 deletions(-) - -commit 00be5d2e09f9c7a6a8563465ad8b8042866817a4 -Author: Lasse Collin -Date: 2009-01-19 13:52:36 +0200 - - Remove dead code. - - src/liblzma/lzma/lzma_encoder.h | 8 -------- - 1 file changed, 8 deletions(-) - -commit 128586213f77c9bd82b7e9a62927f6d0c3769d85 -Author: Lasse Collin -Date: 2009-01-17 14:24:25 +0200 - - Beta was supposed to be API stable but I had forgot to rename - lzma_memlimit_encoder and lzma_memlimit_decoder to - lzma_raw_encoder_memlimit and lzma_raw_decoder_memlimit. :-( - Now it is fixed. Hopefully it doesn't cause too much trouble - to those who already thought API is stable. - - src/liblzma/api/lzma/filter.h | 4 ++-- - src/liblzma/common/easy.c | 4 ++-- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/common/filter_common.h | 2 +- - src/liblzma/common/filter_decoder.c | 4 ++-- - src/liblzma/common/filter_encoder.c | 4 ++-- - src/liblzma/common/stream_decoder.c | 2 +- - src/xz/process.c | 6 +++--- - 8 files changed, 14 insertions(+), 14 deletions(-) - -commit b056379490be5c584c264a967f0540041a163a1e -Author: Lasse Collin -Date: 2009-01-15 14:29:22 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit dc8f3be06d54ef6e6cfb5134dd3d25edd08cef89 -Author: Lasse Collin -Date: 2009-01-15 14:27:32 +0200 - - Fixed a bug in 7z2lzma.bash to make it work with .7z files - that use something else than 2^n as the dictionary size. - Thanks to Dan Shechter for the bug report. - - extra/7z2lzma/7z2lzma.bash | 47 +++++++++++++++++++++++----------------------- - 1 file changed, 24 insertions(+), 23 deletions(-) - -commit 8286a60b8f4bd5accfbc9d229d2204bac31994f2 -Author: Lasse Collin -Date: 2009-01-07 18:41:15 +0200 - - Use pthread_sigmask() instead of sigprocmask() when pthreads - are enabled. - - src/common/mythread.h | 6 ++++++ - src/xz/main.c | 4 ++-- - src/xz/private.h | 1 + - 3 files changed, 9 insertions(+), 2 deletions(-) - -commit 4fd43cb3a906f6da2943f69239ee984c4787c9a9 -Author: Lasse Collin -Date: 2008-12-31 20:01:00 +0200 - - Bumped version to 4.999.8beta right after the release - of 4.999.7beta. - - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 061748f5932719643cda73383db715167d543c22 -Author: Lasse Collin -Date: 2008-12-31 18:59:02 +0200 - - Disable Subblock filter from test_compress.sh since it is - disabled by default in configure.ac. - - tests/test_compress.sh | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -commit 9c45658ddc8bd4a7819ef8547d3e7ccf73203e78 -Author: Lasse Collin -Date: 2008-12-31 17:44:20 +0200 - - Disable both Subblock encoder and decoder my default, - since they are not finished and may have security issues too. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit b59f1e98f50694cf6a8f1b342fd878feebdb2f88 -Author: Lasse Collin -Date: 2008-12-31 17:42:50 +0200 - - Update some files in debug directory. - - debug/full_flush.c | 2 -- - debug/memusage.c | 2 -- - debug/sync_flush.c | 2 -- - 3 files changed, 6 deletions(-) - -commit d1d17a40d33a9682424ca37282813492f2cba6d0 -Author: Lasse Collin -Date: 2008-12-31 17:41:46 +0200 - - Prepare for 4.999.7beta release. - - AUTHORS | 4 ++-- - README | 34 +++++++++++++++++----------------- - configure.ac | 4 ++-- - src/liblzma/api/lzma/version.h | 2 +- - 4 files changed, 22 insertions(+), 22 deletions(-) - -commit 88d3e6b0b18e24142b6d3b41dc1b84b00c49fef3 -Author: Lasse Collin -Date: 2008-12-31 17:15:03 +0200 - - Cleaned up some comments in the API headers. - - src/liblzma/api/lzma/check.h | 23 +++++++++++------------ - src/liblzma/api/lzma/container.h | 2 +- - src/liblzma/api/lzma/version.h | 4 +++- - 3 files changed, 15 insertions(+), 14 deletions(-) - -commit 322ecf93c961e45a1da8c4a794a7fdacefcd7f40 -Author: Lasse Collin -Date: 2008-12-31 16:29:39 +0200 - - Renamed lzma_options_simple to lzma_options_bcj in the API. - The internal implementation is still using the name "simple". - It may need some cleanups, so I look at it later. - - src/liblzma/api/Makefile.am | 2 +- - src/liblzma/api/lzma.h | 2 +- - src/liblzma/api/lzma/{simple.h => bcj.h} | 22 +++++++++++----------- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/simple/simple_decoder.c | 4 ++-- - src/liblzma/simple/simple_encoder.c | 4 ++-- - tests/test_filter_flags.c | 8 ++++---- - 7 files changed, 22 insertions(+), 22 deletions(-) - -commit 7eea8bec3abfed883efba66264a1452a1c04f6b0 -Author: Lasse Collin -Date: 2008-12-31 00:57:27 +0200 - - Fixed missing quoting in configure.ac. - - configure.ac | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -commit 28e75f7086dbe9501d926c370375c69dfb1236ce -Author: Lasse Collin -Date: 2008-12-31 00:48:23 +0200 - - Updated src/liblzma/Makefile.am to use liblzma.pc.in, which - should have been in the previous commit. - - src/liblzma/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 7ed9d943b31d3ee9c5fb2387e84a241ba33afe90 -Author: Lasse Collin -Date: 2008-12-31 00:30:49 +0200 - - Remove lzma_init() and other init functions from liblzma API. - Half of developers were already forgetting to use these - functions, which could have caused total breakage in some future - liblzma version or even now if --enable-small was used. Now - liblzma uses pthread_once() to do the initializations unless - it has been built with --disable-threads which make these - initializations thread-unsafe. - - When --enable-small isn't used, liblzma currently gets needlessly - linked against libpthread (on systems that have it). While it is - stupid for now, liblzma will need threads in future anyway, so - this stupidity will be temporary only. - - When --enable-small is used, different code CRC32 and CRC64 is - now used than without --enable-small. This made the resulting - binary slightly smaller, but the main reason was to clean it up - and to handle the lack of lzma_init_check(). - - The pkg-config file lzma.pc was renamed to liblzma.pc. I'm not - sure if it works correctly and portably for static linking - (Libs.private includes -pthread or other operating system - specific flags). Hopefully someone complains if it is bad. - - lzma_rc_prices[] is now included as a precomputed array even - with --enable-small. It's just 128 bytes now that it uses uint8_t - instead of uint32_t. Smaller array seemed to be at least as fast - as the more bloated uint32_t array on x86; hopefully it's not bad - on other architectures. - - configure.ac | 29 ++++++++-- - src/common/mythread.h | 34 ++++++++++++ - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/init.h | 85 ----------------------------- - src/liblzma/check/Makefile.am | 29 ++++------ - src/liblzma/check/check.c | 10 ++-- - src/liblzma/check/check.h | 25 +++------ - src/liblzma/check/check_init.c | 37 ------------- - src/liblzma/check/{crc32.c => crc32_fast.c} | 0 - src/liblzma/check/crc32_init.c | 55 ------------------- - src/liblzma/check/crc32_small.c | 54 ++++++++++++++++++ - src/liblzma/check/crc32_tablegen.c | 55 ++++++++++++++++--- - src/liblzma/check/{crc64.c => crc64_fast.c} | 0 - src/liblzma/check/crc64_small.c | 54 ++++++++++++++++++ - src/liblzma/check/crc64_tablegen.c | 55 ++++++++++++++++--- - src/liblzma/common/Makefile.am | 3 - - src/liblzma/common/common.h | 1 + - src/liblzma/common/init.c | 39 ------------- - src/liblzma/common/init_decoder.c | 31 ----------- - src/liblzma/common/init_encoder.c | 40 -------------- - src/liblzma/{lzma.pc.in => liblzma.pc.in} | 5 +- - src/liblzma/lz/lz_encoder.c | 6 ++ - src/liblzma/rangecoder/Makefile.am | 8 +-- - src/liblzma/rangecoder/price.h | 16 +----- - src/liblzma/rangecoder/price_table.c | 2 +- - src/liblzma/rangecoder/price_table_init.c | 55 ------------------- - src/liblzma/rangecoder/price_tablegen.c | 51 ++++++++++++++--- - src/xz/Makefile.am | 5 +- - src/xz/main.c | 3 - - src/xzdec/xzdec.c | 3 - - tests/test_block_header.c | 1 - - tests/test_check.c | 2 - - tests/test_filter_flags.c | 2 - - tests/test_index.c | 2 - - tests/test_stream_flags.c | 2 - - tests/tests.h | 2 +- - 37 files changed, 347 insertions(+), 456 deletions(-) - -commit 5cda29b5665004fc0f21d0c41d78022a6a559ab2 -Author: Lasse Collin -Date: 2008-12-27 19:40:31 +0200 - - Use 28 MiB as memory usage limit for encoding in test_compress.sh. - - tests/test_compress.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 050eb14d29e2537c014662e83599fd8a77f13c45 -Author: Lasse Collin -Date: 2008-12-27 19:32:20 +0200 - - Revert a change made in 3b34851de1eaf358cf9268922fa0eeed8278d680 - that was related to LZMA_MODE_FAST. The original code is slightly - faster although it compresses slightly worse. But since it is fast - mode, it is better to select the faster version. - - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 23 ++++++++--------------- - 1 file changed, 8 insertions(+), 15 deletions(-) - -commit 4820f10d0f173864f6a2ea7479663b509ac53358 -Author: Lasse Collin -Date: 2008-12-27 19:30:19 +0200 - - Some xz command line tool improvements. - - src/xz/args.c | 23 +++++----- - src/xz/message.c | 4 +- - src/xz/options.c | 2 +- - src/xz/process.c | 133 +++++++++++++++++++++++++++++++++++++++++++------------ - src/xz/process.h | 3 ++ - 5 files changed, 121 insertions(+), 44 deletions(-) - -commit e33194e79d8f5ce07cb4aca909b324ae75098f7e -Author: Lasse Collin -Date: 2008-12-27 19:27:49 +0200 - - Bunch of liblzma tweaks, including some API changes. - The API and ABI should now be very close to stable, - although the code behind it isn't yet. - - src/liblzma/api/lzma.h | 8 ++-- - src/liblzma/api/lzma/block.h | 63 ++++++++++++++++++++++++- - src/liblzma/api/lzma/container.h | 76 +++++++++++++++---------------- - src/liblzma/api/lzma/lzma.h | 41 +++++++++-------- - src/liblzma/common/alone_decoder.c | 36 +++++++-------- - src/liblzma/common/alone_encoder.c | 22 ++++----- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 54 +++++++++++----------- - src/liblzma/common/block_decoder.h | 4 +- - src/liblzma/common/block_encoder.c | 37 ++++++++------- - src/liblzma/common/block_encoder.h | 4 +- - src/liblzma/common/block_header_decoder.c | 41 +++++++++-------- - src/liblzma/common/block_header_encoder.c | 51 ++++++++++----------- - src/liblzma/common/block_util.c | 3 +- - src/liblzma/common/easy.c | 45 ++++++------------ - src/liblzma/common/stream_decoder.c | 3 +- - src/liblzma/common/stream_decoder.h | 2 +- - src/liblzma/common/stream_encoder.c | 3 +- - src/liblzma/common/stream_encoder.h | 2 +- - src/liblzma/common/stream_flags_decoder.c | 2 +- - src/liblzma/common/stream_flags_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 53 +++++++-------------- - 23 files changed, 294 insertions(+), 262 deletions(-) - -commit 4d00652e75dd2736aedc3a3a8baff3dd0ea38074 -Author: Lasse Collin -Date: 2008-12-18 13:42:52 +0200 - - Updated Makefile.am that was missing from the previous commit. - - src/liblzma/common/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -commit 634636fa56ccee6e744f78b0abed76c8940f2f8f -Author: Lasse Collin -Date: 2008-12-17 21:49:53 +0200 - - Remove the alignment functions for now. Maybe they will - be added back in some form later, but the current version - wasn't modular, so it would need fixing anyway. - - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/alignment.h | 60 --------------------- - src/liblzma/common/alignment.c | 114 --------------------------------------- - 4 files changed, 176 deletions(-) - -commit 4fed98417d1687f5eccccb42a133fde3ec81216a -Author: Lasse Collin -Date: 2008-12-17 20:11:23 +0200 - - xz message handling improvements - - src/xz/message.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++----- - src/xz/message.h | 7 +++- - src/xz/process.c | 28 ++++++++++++- - 3 files changed, 146 insertions(+), 14 deletions(-) - -commit 653e457e3756ef35e5d1b2be3523b3e4b1e9ee4d -Author: Lasse Collin -Date: 2008-12-15 23:26:43 +0200 - - Fix a dumb bug in .lzma decoder which was introduced in - the previous commit. (Probably the previous commit has - other bugs too, it wasn't tested.) - - src/liblzma/common/alone_decoder.c | 29 ++++++++++++++--------------- - 1 file changed, 14 insertions(+), 15 deletions(-) - -commit 671a5adf1e844bfdd6fd327016c3c28694493158 -Author: Lasse Collin -Date: 2008-12-15 19:39:13 +0200 - - Bunch of liblzma API cleanups and fixes. - - src/liblzma/api/lzma.h | 122 +++++++++++---------- - src/liblzma/api/lzma/base.h | 174 ++++++++++++++++++----------- - src/liblzma/api/lzma/block.h | 211 +++++++++++++++++++++++------------- - src/liblzma/api/lzma/check.h | 28 ++--- - src/liblzma/api/lzma/container.h | 155 +++++++++++++------------- - src/liblzma/api/lzma/delta.h | 12 +- - src/liblzma/api/lzma/filter.h | 27 +++-- - src/liblzma/api/lzma/index.h | 97 ++++++++++++++--- - src/liblzma/api/lzma/index_hash.h | 26 +++-- - src/liblzma/api/lzma/init.h | 2 +- - src/liblzma/api/lzma/lzma.h | 12 +- - src/liblzma/api/lzma/simple.h | 4 +- - src/liblzma/api/lzma/stream_flags.h | 46 +++++--- - src/liblzma/api/lzma/version.h | 6 +- - src/liblzma/api/lzma/vli.h | 17 ++- - src/liblzma/common/alone_decoder.c | 47 +++++--- - src/liblzma/common/auto_decoder.c | 29 +++++ - src/liblzma/common/block_util.c | 52 +++++---- - src/liblzma/common/common.c | 58 ++++++++++ - src/liblzma/common/common.h | 9 +- - src/liblzma/common/easy.c | 33 ++++-- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/common/index.c | 11 ++ - src/liblzma/common/index_decoder.c | 46 ++++++-- - src/liblzma/common/stream_decoder.c | 47 ++++++-- - src/liblzma/lzma/lzma2_encoder.c | 6 +- - tests/test_index.c | 10 +- - 27 files changed, 863 insertions(+), 426 deletions(-) - -commit 17781c2c20fd77029cb32e77792889f2f211d69d -Author: Lasse Collin -Date: 2008-12-15 14:26:52 +0200 - - The LZMA2 decoder fix introduced a bug to LZ decoder, - which made LZ decoder return too early after dictionary - reset. This fixes it. - - src/liblzma/lz/lz_decoder.c | 33 +++++++++++++++++++++++---------- - 1 file changed, 23 insertions(+), 10 deletions(-) - -commit f9f2d1e74398500724041f7fb3c38db35ad8c8d8 -Author: Lasse Collin -Date: 2008-12-15 11:20:22 +0200 - - Added two new test files. - - tests/files/README | 7 +++++++ - tests/files/bad-1-lzma2-8.xz | Bin 0 -> 464 bytes - tests/files/good-1-lzma2-4.xz | Bin 0 -> 464 bytes - 3 files changed, 7 insertions(+) - -commit ff7fb2c605bccc411069e07b9f11fb957aea2ddf -Author: Lasse Collin -Date: 2008-12-15 10:01:59 +0200 - - Fix data corruption in LZMA2 decoder. - - src/liblzma/lz/lz_decoder.c | 17 ++++++++++++++++- - src/liblzma/lz/lz_decoder.h | 8 +++++--- - src/liblzma/lzma/lzma2_decoder.c | 15 +++++++++++---- - 3 files changed, 32 insertions(+), 8 deletions(-) - -commit 1ceebcf7e1bd30b95125f0ad67a09fdb6215d613 -Author: Lasse Collin -Date: 2008-12-13 00:54:11 +0200 - - Name the package "xz" in configure.ac. - - configure.ac | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -commit a94bf00d0af9b423851905b031be5a645a657820 -Author: Lasse Collin -Date: 2008-12-12 22:43:21 +0200 - - Some adjustments to GCC warning flags. The important change - is the removal of -pedantic. It messes up -Werror (which I - really want to keep so that I don't miss any warnings) with - printf format strings that are in POSIX but not in C99. - - configure.ac | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -commit 8582d392baacd2cdac07ca60041f8c661323676d -Author: Lasse Collin -Date: 2008-12-10 01:31:00 +0200 - - Remove obsolete comment. - - src/xz/message.c | 1 - - 1 file changed, 1 deletion(-) - -commit b1ae6dd731ea3636c3c2bfc7aefa71457d3328f1 -Author: Lasse Collin -Date: 2008-12-10 01:27:15 +0200 - - Use "decompression" consistently in --long-help. - - src/xz/message.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1ea9e7f15afd5d3981e2432710e932320597bca9 -Author: Lasse Collin -Date: 2008-12-10 01:23:58 +0200 - - Added preset=NUM to --lzma1 and --lzma2. This makes it easy - to take a preset as a template and modify it a little. - - src/xz/message.c | 1 + - src/xz/options.c | 8 ++++++++ - 2 files changed, 9 insertions(+) - -commit bceb3918dbb21f34976bfdd4c171a81319de71f7 -Author: Lasse Collin -Date: 2008-12-09 17:43:31 +0200 - - Put the file format specification into the public domain. - Same will be done to the actual code later. - - doc/file-format.txt | 24 +++++++++--------------- - 1 file changed, 9 insertions(+), 15 deletions(-) - -commit 6efa2d80d46a38861016f41f0eb6fa2ec9260fe6 -Author: Lasse Collin -Date: 2008-12-09 17:41:49 +0200 - - Make the memusage functions of LZMA1 and LZMA2 encoders - to validate the filter options. Add missing validation - to LZMA2 encoder when options are changed in the middle - of encoding. - - src/liblzma/lzma/lzma2_encoder.c | 5 ++++- - src/liblzma/lzma/lzma_encoder.c | 44 +++++++++++++++++++++++++++------------- - src/liblzma/lzma/lzma_encoder.h | 2 +- - 3 files changed, 35 insertions(+), 16 deletions(-) - -commit f20a03206b71ff01b827bb7a932411d6a6a4e06a -Author: Lasse Collin -Date: 2008-12-09 10:36:24 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit ef7890d56453dca1aeb2e12db29b7e418d93dde4 -Author: Lasse Collin -Date: 2008-12-01 23:04:12 +0200 - - In command line tool, take advantage of memusage calculation's - ability to also validate the filter chain and options (not - implemented yet for all filters). - - src/xz/process.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -commit ccd57afa09e332d664d6d6a7498702791ea5f659 -Author: Lasse Collin -Date: 2008-12-01 22:59:28 +0200 - - Validate the filter chain before checking filter-specific - memory usage. - - src/liblzma/common/filter_common.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -commit c596fda40b62fe1683d0ac34d0c673dcaae2aa15 -Author: Lasse Collin -Date: 2008-12-01 22:58:22 +0200 - - Make the memusage functions of LZMA1 and LZMA2 decoders - to validate the filter options. - - src/liblzma/lzma/lzma2_decoder.c | 7 ++----- - src/liblzma/lzma/lzma_decoder.c | 14 ++++++++++---- - src/liblzma/lzma/lzma_decoder.h | 5 +++++ - 3 files changed, 17 insertions(+), 9 deletions(-) - -commit c58f469be5bb9b0bdab825c6687445fd553f4f3a -Author: Lasse Collin -Date: 2008-12-01 22:55:18 +0200 - - Added the changes for Delta filter that should have been - part of 656ec87882ee74b192c4ea4a233a235eca7b04d4. - - src/liblzma/common/filter_decoder.c | 2 +- - src/liblzma/common/filter_encoder.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit cd708015202dbf7585b84a8781462a20c42a324b -Author: Lasse Collin -Date: 2008-12-01 22:50:28 +0200 - - LZMA2 decoder cleanups. Make it require new LZMA properties - also in the first LZMA chunk after a dictionary reset in - uncompressed chunk. - - src/liblzma/lzma/lzma2_decoder.c | 95 +++++++++++++++++----------------------- - 1 file changed, 41 insertions(+), 54 deletions(-) - -commit 656ec87882ee74b192c4ea4a233a235eca7b04d4 -Author: Lasse Collin -Date: 2008-12-01 16:30:11 +0200 - - Added lzma_delta_coder_memusage() which also validates - the options. - - src/liblzma/delta/Makefile.am | 3 ++- - src/liblzma/delta/delta_common.c | 28 ++++++++++++++++++------- - src/liblzma/delta/delta_common.h | 19 +---------------- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_decoder.h | 2 +- - src/liblzma/delta/delta_encoder.c | 14 ++++--------- - src/liblzma/delta/delta_encoder.h | 2 +- - src/liblzma/delta/delta_private.h | 44 +++++++++++++++++++++++++++++++++++++++ - 8 files changed, 75 insertions(+), 39 deletions(-) - -commit 691a9155b7a28882baf37e9d1e969e32e91dbc7a -Author: Lasse Collin -Date: 2008-11-29 10:03:49 +0200 - - Automake includes the m4 directory, so don't add it in - Makefile.am separately. - - Updated THANKS. - - Makefile.am | 1 - - THANKS | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -commit c7007ddf06ac2b0e018d71d281c21b99f16e7ae0 -Author: Lasse Collin -Date: 2008-11-28 12:00:48 +0200 - - Tested using COLUMNS environment variable to avoid broken - progress indicator but since COLUMNS isn't usually available, - the code was left commented out. - - src/xz/message.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -commit ae65dcfde27014e4d811e1a1308aa5d0fe8debbd -Author: Lasse Collin -Date: 2008-11-27 19:28:59 +0200 - - Cleanups to message.c. - - src/xz/message.c | 47 ++++++++++++++++++----------------------------- - 1 file changed, 18 insertions(+), 29 deletions(-) - -commit a8368b75cdcd5427299001cc42839287f27b244d -Author: Lasse Collin -Date: 2008-11-25 02:37:47 +0200 - - Remove the nowadays unneeded memory limitting malloc() wrapper. - - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/memlimit.h | 207 -------------------------- - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/memory_limiter.c | 288 ------------------------------------ - tests/Makefile.am | 2 - - tests/test_memlimit.c | 114 -------------- - 7 files changed, 614 deletions(-) - -commit 69472ee5f055a2bb6f28106f0923e1461fd1d080 -Author: Lasse Collin -Date: 2008-11-23 15:09:03 +0200 - - VLI encoder and decoder cleanups. Made encoder return - LZMA_PROG_ERROR in single-call mode if there's no output - space. - - src/liblzma/common/vli_decoder.c | 15 +++++++++------ - src/liblzma/common/vli_encoder.c | 31 ++++++++++++++++++++++++------- - 2 files changed, 33 insertions(+), 13 deletions(-) - -commit 4249c8c15a08f55b51b7012e6aaafce3aa9eb650 -Author: Lasse Collin -Date: 2008-11-22 17:44:33 +0200 - - Typo fix - - src/xz/process.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 6d1d6f4598d121253dbe1084c6866b66e95c361b -Author: Lasse Collin -Date: 2008-11-20 22:59:10 +0200 - - Support NetBSD's errno for O_NOFOLLOW. - - src/xz/io.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -commit f901a290eef67b8ea4720ccdf5f46edf775ed9d7 -Author: Lasse Collin -Date: 2008-11-20 18:05:52 +0200 - - Build xzdec and lzmadec from xzdec.c. xzdec supports only .xz - files and lzmadec only .lzma files. - - src/xzdec/Makefile.am | 7 +- - src/xzdec/xzdec.c | 311 ++++++++++++++++++++++---------------------------- - 2 files changed, 140 insertions(+), 178 deletions(-) - -commit 86a0ed8f01c8ed44721223f885e679c71b7bb94c -Author: Lasse Collin -Date: 2008-11-20 11:01:29 +0200 - - Minor cleanups to xzdec. - - src/xzdec/xzdec.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -commit 54f716ba8905d09752dcd1519455a40bd21d5317 -Author: Lasse Collin -Date: 2008-11-19 23:55:22 +0200 - - Added missing check for uint16_t. - - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -commit 1880a3927b23f265f63b2adb86fbdb81ea09eb06 -Author: Lasse Collin -Date: 2008-11-19 23:52:24 +0200 - - Renamed lzma to xz and lzmadec to xzdec. We create symlinks - lzma, unlzma, and lzcat in "make install" for backwards - compatibility with LZMA Utils 4.32.x; I'm not sure if this - should be the default though. - - configure.ac | 4 ++-- - po/POTFILES.in | 21 +++++++++------------ - src/Makefile.am | 2 +- - src/{lzma => xz}/Makefile.am | 32 +++++++++++++++++--------------- - src/{lzma => xz}/args.c | 0 - src/{lzma => xz}/args.h | 0 - src/{lzma => xz}/hardware.c | 0 - src/{lzma => xz}/hardware.h | 0 - src/{lzma => xz}/io.c | 0 - src/{lzma => xz}/io.h | 0 - src/{lzma => xz}/list.c | 0 - src/{lzma => xz}/main.c | 0 - src/{lzma => xz}/main.h | 0 - src/{lzma => xz}/message.c | 0 - src/{lzma => xz}/message.h | 0 - src/{lzma => xz}/options.c | 0 - src/{lzma => xz}/options.h | 0 - src/{lzma => xz}/private.h | 0 - src/{lzma => xz}/process.c | 0 - src/{lzma => xz}/process.h | 0 - src/{lzma => xz}/suffix.c | 0 - src/{lzma => xz}/suffix.h | 0 - src/{lzma => xz}/util.c | 0 - src/{lzma => xz}/util.h | 0 - src/{lzmadec => xzdec}/Makefile.am | 12 ++++++------ - src/{lzmadec/lzmadec.c => xzdec/xzdec.c} | 4 ++-- - tests/test_compress.sh | 29 ++++++++++++++--------------- - tests/test_files.sh | 4 ++-- - 28 files changed, 53 insertions(+), 55 deletions(-) - -commit e114502b2bc371e4a45449832cb69be036360722 -Author: Lasse Collin -Date: 2008-11-19 20:46:52 +0200 - - Oh well, big messy commit again. Some highlights: - - Updated to the latest, probably final file format version. - - Command line tool reworked to not use threads anymore. - Threading will probably go into liblzma anyway. - - Memory usage limit is now about 30 % for uncompression - and about 90 % for compression. - - Progress indicator with --verbose - - Simplified --help and full --long-help - - Upgraded to the last LGPLv2.1+ getopt_long from gnulib. - - Some bug fixes - - THANKS | 1 + - configure.ac | 48 +- - debug/full_flush.c | 6 +- - debug/known_sizes.c | 2 +- - debug/memusage.c | 2 +- - debug/sync_flush.c | 10 +- - doc/file-format.txt | 260 ++++---- - lib/Makefile.am | 10 +- - lib/getopt.c | 14 +- - lib/{getopt_.h => getopt.in.h} | 8 +- - lib/getopt1.c | 8 +- - lib/gettext.h | 240 ------- - m4/getopt.m4 | 64 +- - src/common/bswap.h | 15 +- - src/common/physmem.h | 4 + - src/common/sysdefs.h | 12 +- - src/liblzma/api/lzma/block.h | 47 +- - src/liblzma/api/lzma/filter.h | 8 + - src/liblzma/api/lzma/index.h | 20 +- - src/liblzma/api/lzma/index_hash.h | 4 +- - src/liblzma/common/block_decoder.c | 59 +- - src/liblzma/common/block_encoder.c | 41 +- - src/liblzma/common/block_header_decoder.c | 31 +- - src/liblzma/common/block_header_encoder.c | 69 +-- - src/liblzma/common/block_util.c | 45 +- - src/liblzma/common/common.h | 8 - - src/liblzma/common/filter_common.c | 4 +- - src/liblzma/common/index.c | 259 ++++---- - src/liblzma/common/index.h | 33 +- - src/liblzma/common/index_decoder.c | 31 +- - src/liblzma/common/index_encoder.c | 16 +- - src/liblzma/common/index_hash.c | 68 +- - src/liblzma/common/stream_decoder.c | 9 +- - src/liblzma/common/stream_encoder.c | 6 +- - src/liblzma/lz/lz_decoder.h | 4 +- - src/liblzma/subblock/subblock_decoder.c | 3 +- - src/lzma/Makefile.am | 9 +- - src/lzma/alloc.c | 106 ---- - src/lzma/alloc.h | 42 -- - src/lzma/args.c | 531 +++++++--------- - src/lzma/args.h | 42 +- - src/lzma/error.c | 162 ----- - src/lzma/error.h | 67 -- - src/lzma/hardware.c | 75 ++- - src/lzma/hardware.h | 16 +- - src/lzma/help.c | 170 ----- - src/lzma/help.h | 32 - - src/lzma/io.c | 757 +++++++++++------------ - src/lzma/io.h | 51 +- - src/lzma/main.c | 392 ++++++++---- - src/lzma/main.h | 60 ++ - src/lzma/message.c | 892 +++++++++++++++++++++++++++ - src/lzma/message.h | 132 ++++ - src/lzma/options.c | 42 +- - src/lzma/options.h | 6 +- - src/lzma/private.h | 28 +- - src/lzma/process.c | 525 ++++++++-------- - src/lzma/process.h | 40 ++ - src/lzma/suffix.c | 52 +- - src/lzma/suffix.h | 17 +- - src/lzma/util.c | 100 +-- - src/lzma/util.h | 43 +- - src/lzmadec/lzmadec.c | 36 +- - tests/files/README | 12 +- - tests/files/bad-1-block_header-1.xz | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-2.xz | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-3.xz | Bin 68 -> 68 bytes - tests/files/bad-1-block_header-4.xz | Bin 72 -> 76 bytes - tests/files/bad-1-block_header-5.xz | Bin 0 -> 72 bytes - tests/files/bad-1-check-crc32.xz | Bin 68 -> 68 bytes - tests/files/bad-1-check-crc64.xz | Bin 72 -> 72 bytes - tests/files/bad-1-check-sha256.xz | Bin 96 -> 96 bytes - tests/files/bad-1-lzma2-1.xz | Bin 64 -> 64 bytes - tests/files/bad-1-lzma2-2.xz | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-3.xz | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-4.xz | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-5.xz | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-6.xz | Bin 68 -> 68 bytes - tests/files/bad-1-lzma2-7.xz | Bin 408 -> 408 bytes - tests/files/bad-1-stream_flags-1.xz | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-2.xz | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-3.xz | Bin 68 -> 68 bytes - tests/files/bad-1-vli-1.xz | Bin 72 -> 72 bytes - tests/files/bad-1-vli-2.xz | Bin 72 -> 76 bytes - tests/files/bad-2-compressed_data_padding.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-1.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-2.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-3.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-4.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-5.xz | Bin 0 -> 92 bytes - tests/files/good-1-3delta-lzma2.xz | Bin 528 -> 528 bytes - tests/files/good-1-block_header-1.xz | Bin 72 -> 72 bytes - tests/files/good-1-block_header-2.xz | Bin 68 -> 68 bytes - tests/files/good-1-block_header-3.xz | Bin 68 -> 68 bytes - tests/files/good-1-check-crc32.xz | Bin 68 -> 68 bytes - tests/files/good-1-check-crc64.xz | Bin 72 -> 72 bytes - tests/files/good-1-check-none.xz | Bin 64 -> 64 bytes - tests/files/good-1-check-sha256.xz | Bin 96 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.xz | Bin 51312 -> 51316 bytes - tests/files/good-1-lzma2-1.xz | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-2.xz | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-3.xz | Bin 408 -> 408 bytes - tests/files/good-1-sparc-lzma2.xz | Bin 2292 -> 2296 bytes - tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 1936 bytes - tests/files/good-2-lzma2.xz | Bin 92 -> 92 bytes - tests/files/unsupported-block_header.xz | Bin 68 -> 68 bytes - tests/files/unsupported-check.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-1.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-2.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-3.xz | Bin 68 -> 68 bytes - tests/test_block_header.c | 16 +- - tests/test_index.c | 42 +- - 112 files changed, 3240 insertions(+), 2724 deletions(-) - -commit 3c3905b53462ae235c9438d86a4dc51086410932 -Author: Lasse Collin -Date: 2008-10-09 11:12:29 +0300 - - Fixed the test that should have been fixed as part - of 1e8e4fd1f3e50129b4541406ad765d2aa1233943. - - tests/test_block_header.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 0f295bf7a3ece01f667caae318cc3e3424085886 -Author: Lasse Collin -Date: 2008-10-07 16:42:18 +0300 - - Fixed some help messages. - - src/lzma/help.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 1e8e4fd1f3e50129b4541406ad765d2aa1233943 -Author: Lasse Collin -Date: 2008-10-07 09:40:31 +0300 - - Made the preset numbering more logical in liblzma API. - - src/liblzma/api/lzma/container.h | 20 ++++++++++---------- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 3 ++- - src/lzma/args.c | 8 ++++---- - src/lzma/args.h | 2 +- - 5 files changed, 18 insertions(+), 17 deletions(-) - -commit 5e4df4c3c09c82bbbb1a916784e3dc717ca4ff81 -Author: Lasse Collin -Date: 2008-10-03 19:36:09 +0300 - - Removed fi from po/LINGUAS. - - po/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -commit fcfb86c7770328cfffa2e83b176af9a1ba2d9128 -Author: Lasse Collin -Date: 2008-10-03 07:06:48 +0300 - - Fixed suffix handling with --format=raw. - - src/lzma/suffix.c | 28 +++++++++++++++++++--------- - 1 file changed, 19 insertions(+), 9 deletions(-) - -commit bd137524f2f50e30ba054f42f1f6536cd3cee920 -Author: Lasse Collin -Date: 2008-10-02 22:51:46 +0300 - - Initial changes to change the suffix of the new format to .xz. - This also fixes a bug related to --suffix option. Some issues - with suffixes with --format=raw were not fixed. - - src/lzma/args.c | 67 +++++++++++++++++++++++++++++++-------------- - src/lzma/args.h | 13 +++++---- - src/lzma/help.c | 4 +-- - src/lzma/process.c | 24 +++++++++------- - src/lzma/suffix.c | 74 +++++++++++++++++++++++++++++++++++++++++--------- - tests/test_compress.sh | 3 +- - 6 files changed, 133 insertions(+), 52 deletions(-) - -commit 4c321a41c482821aa3c4d64cdf886a6ed904d844 -Author: Lasse Collin -Date: 2008-09-30 17:43:55 +0300 - - Renamed the test files from .lzma suffix to .xz suffix. - - tests/files/README | 128 ++++++++++----------- - ...0-backward_size.lzma => bad-0-backward_size.xz} | Bin - ...pty-truncated.lzma => bad-0-empty-truncated.xz} | Bin - ...d-0-footer_magic.lzma => bad-0-footer_magic.xz} | Bin - ...d-0-header_magic.lzma => bad-0-header_magic.xz} | Bin - ...nonempty_index.lzma => bad-0-nonempty_index.xz} | Bin - .../{bad-0cat-alone.lzma => bad-0cat-alone.xz} | Bin - ...-header_magic.lzma => bad-0cat-header_magic.xz} | Bin - ...bad-0catpad-empty.lzma => bad-0catpad-empty.xz} | Bin - .../{bad-0pad-empty.lzma => bad-0pad-empty.xz} | Bin - ...block_header-1.lzma => bad-1-block_header-1.xz} | Bin - ...block_header-2.lzma => bad-1-block_header-2.xz} | Bin - ...block_header-3.lzma => bad-1-block_header-3.xz} | Bin - ...block_header-4.lzma => bad-1-block_header-4.xz} | Bin - ...bad-1-check-crc32.lzma => bad-1-check-crc32.xz} | Bin - ...bad-1-check-crc64.lzma => bad-1-check-crc64.xz} | Bin - ...d-1-check-sha256.lzma => bad-1-check-sha256.xz} | Bin - .../files/{bad-1-lzma2-1.lzma => bad-1-lzma2-1.xz} | Bin - .../files/{bad-1-lzma2-2.lzma => bad-1-lzma2-2.xz} | Bin - .../files/{bad-1-lzma2-3.lzma => bad-1-lzma2-3.xz} | Bin - .../files/{bad-1-lzma2-4.lzma => bad-1-lzma2-4.xz} | Bin - .../files/{bad-1-lzma2-5.lzma => bad-1-lzma2-5.xz} | Bin - .../files/{bad-1-lzma2-6.lzma => bad-1-lzma2-6.xz} | Bin - .../files/{bad-1-lzma2-7.lzma => bad-1-lzma2-7.xz} | Bin - ...stream_flags-1.lzma => bad-1-stream_flags-1.xz} | Bin - ...stream_flags-2.lzma => bad-1-stream_flags-2.xz} | Bin - ...stream_flags-3.lzma => bad-1-stream_flags-3.xz} | Bin - tests/files/{bad-1-vli-1.lzma => bad-1-vli-1.xz} | Bin - tests/files/{bad-1-vli-2.lzma => bad-1-vli-2.xz} | Bin - ...dding.lzma => bad-2-compressed_data_padding.xz} | Bin - .../files/{bad-2-index-1.lzma => bad-2-index-1.xz} | Bin - .../files/{bad-2-index-2.lzma => bad-2-index-2.xz} | Bin - .../files/{bad-2-index-3.lzma => bad-2-index-3.xz} | Bin - .../files/{bad-2-index-4.lzma => bad-2-index-4.xz} | Bin - tests/files/{good-0-empty.lzma => good-0-empty.xz} | Bin - .../{good-0cat-empty.lzma => good-0cat-empty.xz} | Bin - ...od-0catpad-empty.lzma => good-0catpad-empty.xz} | Bin - .../{good-0pad-empty.lzma => good-0pad-empty.xz} | Bin - ...-1-3delta-lzma2.lzma => good-1-3delta-lzma2.xz} | Bin - ...lock_header-1.lzma => good-1-block_header-1.xz} | Bin - ...lock_header-2.lzma => good-1-block_header-2.xz} | Bin - ...lock_header-3.lzma => good-1-block_header-3.xz} | Bin - ...od-1-check-crc32.lzma => good-1-check-crc32.xz} | Bin - ...od-1-check-crc64.lzma => good-1-check-crc64.xz} | Bin - ...good-1-check-none.lzma => good-1-check-none.xz} | Bin - ...-1-check-sha256.lzma => good-1-check-sha256.xz} | Bin - ...-lzma2.tiff.lzma => good-1-delta-lzma2.tiff.xz} | Bin - .../{good-1-lzma2-1.lzma => good-1-lzma2-1.xz} | Bin - .../{good-1-lzma2-2.lzma => good-1-lzma2-2.xz} | Bin - .../{good-1-lzma2-3.lzma => good-1-lzma2-3.xz} | Bin - ...od-1-sparc-lzma2.lzma => good-1-sparc-lzma2.xz} | Bin - .../{good-1-x86-lzma2.lzma => good-1-x86-lzma2.xz} | Bin - tests/files/{good-2-lzma2.lzma => good-2-lzma2.xz} | Bin - ...ock_header.lzma => unsupported-block_header.xz} | Bin - ...unsupported-check.lzma => unsupported-check.xz} | Bin - ..._flags-1.lzma => unsupported-filter_flags-1.xz} | Bin - ..._flags-2.lzma => unsupported-filter_flags-2.xz} | Bin - ..._flags-3.lzma => unsupported-filter_flags-3.xz} | Bin - tests/test_files.sh | 6 +- - 59 files changed, 66 insertions(+), 68 deletions(-) - -commit 8e60c889a2816a63013a35c99ce26bf28f5b78eb -Author: Lasse Collin -Date: 2008-09-30 13:57:44 +0300 - - Fixed Stream decoder to actually use the first_stream variable. - - src/liblzma/common/stream_decoder.c | 5 +++++ - 1 file changed, 5 insertions(+) - -commit 3bdbc12c054d1961133ee19802af7dd3c3494543 -Author: Lasse Collin -Date: 2008-09-30 13:56:57 +0300 - - Added one more test file. - - tests/files/README | 15 +++++++++++---- - tests/files/bad-0cat-header_magic.lzma | Bin 0 -> 64 bytes - 2 files changed, 11 insertions(+), 4 deletions(-) - -commit a6639022fdc536e5659b070a465221b4cf7c51fa -Author: Lasse Collin -Date: 2008-09-30 13:34:07 +0300 - - Fixed uninitialized variable in Stream decoder. - - src/liblzma/common/stream_decoder.c | 1 + - 1 file changed, 1 insertion(+) - -commit ed3709000a3f17ecefab29b2235d7e2221b00003 -Author: Lasse Collin -Date: 2008-09-30 13:27:28 +0300 - - Added two test files. - - tests/files/README | 6 ++++++ - tests/files/bad-0-footer_magic.lzma | Bin 0 -> 32 bytes - tests/files/bad-0-header_magic.lzma | Bin 0 -> 32 bytes - 3 files changed, 6 insertions(+) - -commit ea560b0ea80525752bdcd0074d24f8dc170bbe29 -Author: Lasse Collin -Date: 2008-09-27 23:49:24 +0300 - - Fix conflicting Subblock helper filter's ID. - - src/liblzma/common/common.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ad97483b6e55142fd8d5c041db057017a891cd95 -Author: Lasse Collin -Date: 2008-09-27 23:37:13 +0300 - - Changed magic bytes to match the updated spec. Filename - suffix wasn't changed yet. - - src/liblzma/common/auto_decoder.c | 4 ++-- - src/liblzma/common/stream_flags_common.c | 2 +- - tests/files/bad-0-backward_size.lzma | Bin 32 -> 32 bytes - tests/files/bad-0-empty-truncated.lzma | Bin 31 -> 31 bytes - tests/files/bad-0-nonempty_index.lzma | Bin 32 -> 32 bytes - tests/files/bad-0cat-alone.lzma | Bin 55 -> 55 bytes - tests/files/bad-0catpad-empty.lzma | Bin 69 -> 69 bytes - tests/files/bad-0pad-empty.lzma | Bin 37 -> 37 bytes - tests/files/bad-1-block_header-1.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-2.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-3.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-block_header-4.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-check-crc32.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-check-crc64.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-check-sha256.lzma | Bin 96 -> 96 bytes - tests/files/bad-1-lzma2-1.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-lzma2-2.lzma | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-3.lzma | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-4.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-5.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-6.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-lzma2-7.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-stream_flags-1.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-2.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-3.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-vli-1.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-vli-2.lzma | Bin 72 -> 72 bytes - tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-1.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-2.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-3.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-4.lzma | Bin 92 -> 92 bytes - tests/files/good-0-empty.lzma | Bin 32 -> 32 bytes - tests/files/good-0cat-empty.lzma | Bin 64 -> 64 bytes - tests/files/good-0catpad-empty.lzma | Bin 68 -> 68 bytes - tests/files/good-0pad-empty.lzma | Bin 36 -> 36 bytes - tests/files/good-1-3delta-lzma2.lzma | Bin 528 -> 528 bytes - tests/files/good-1-block_header-1.lzma | Bin 72 -> 72 bytes - tests/files/good-1-block_header-2.lzma | Bin 68 -> 68 bytes - tests/files/good-1-block_header-3.lzma | Bin 68 -> 68 bytes - tests/files/good-1-check-crc32.lzma | Bin 68 -> 68 bytes - tests/files/good-1-check-crc64.lzma | Bin 72 -> 72 bytes - tests/files/good-1-check-none.lzma | Bin 64 -> 64 bytes - tests/files/good-1-check-sha256.lzma | Bin 96 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.lzma | Bin 51312 -> 51312 bytes - tests/files/good-1-lzma2-1.lzma | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-2.lzma | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-3.lzma | Bin 408 -> 408 bytes - tests/files/good-1-sparc-lzma2.lzma | Bin 2292 -> 2292 bytes - tests/files/good-1-x86-lzma2.lzma | Bin 1936 -> 1936 bytes - tests/files/good-2-lzma2.lzma | Bin 92 -> 92 bytes - tests/files/unsupported-block_header.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-check.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-1.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-2.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-3.lzma | Bin 68 -> 68 bytes - 56 files changed, 3 insertions(+), 3 deletions(-) - -commit 7a57069167e9e63394e2b095ee3a63253fcb51c7 -Author: Lasse Collin -Date: 2008-09-27 23:16:09 +0300 - - Remove po/fi.po since I'm not keeping it updated for now. - - po/fi.po | 446 --------------------------------------------------------------- - 1 file changed, 446 deletions(-) - -commit 018ae09df8f2fee5a7374f307df4cb42fad0b81e -Author: Lasse Collin -Date: 2008-09-27 23:13:54 +0300 - - Fix also test_compress.sh. - - tests/test_compress.sh | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 3a62a5fb85d2eebd8666e64ed5d364d095062858 -Author: Lasse Collin -Date: 2008-09-27 23:01:15 +0300 - - Fixed compilation of test_filter_flags.c, which was broken by - 1dcecfb09b55157b8653d747963069c8bed74f04. - - tests/test_filter_flags.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -commit c6ca26eef7cd07eba449035514e2b8f9ac3111c0 -Author: Lasse Collin -Date: 2008-09-27 19:11:02 +0300 - - Updated file format specification. It changes the suffix - of the new format to .xz and removes the recently added - LZMA filter. - - doc/file-format.txt | 125 ++++++++++++++-------------------------------------- - 1 file changed, 32 insertions(+), 93 deletions(-) - -commit 1dcecfb09b55157b8653d747963069c8bed74f04 -Author: Lasse Collin -Date: 2008-09-27 19:09:21 +0300 - - Some API changes, bug fixes, cleanups etc. - - configure.ac | 18 +- - debug/full_flush.c | 7 +- - debug/known_sizes.c | 6 +- - debug/memusage.c | 22 +-- - debug/sync_flush.c | 18 +- - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/delta.h | 8 +- - src/liblzma/api/lzma/lzma.h | 230 ++++++++++++++++--------- - src/liblzma/common/alignment.c | 7 +- - src/liblzma/common/alone_decoder.c | 11 +- - src/liblzma/common/alone_encoder.c | 9 +- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/easy.c | 20 ++- - src/liblzma/common/filter_common.c | 4 +- - src/liblzma/common/filter_decoder.c | 4 +- - src/liblzma/common/filter_encoder.c | 4 +- - src/liblzma/common/init_encoder.c | 2 +- - src/liblzma/delta/delta_common.c | 12 +- - src/liblzma/delta/delta_common.h | 2 +- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 6 +- - src/liblzma/lz/lz_encoder.c | 30 ++-- - src/liblzma/lz/lz_encoder.h | 26 +-- - src/liblzma/lz/lz_encoder_mf.c | 30 ++-- - src/liblzma/lzma/Makefile.am | 4 +- - src/liblzma/lzma/lzma2_decoder.c | 10 +- - src/liblzma/lzma/lzma2_encoder.c | 27 ++- - src/liblzma/lzma/lzma_common.h | 26 ++- - src/liblzma/lzma/lzma_decoder.c | 37 ++-- - src/liblzma/lzma/lzma_encoder.c | 51 +++--- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 10 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +-- - src/liblzma/lzma/lzma_encoder_presets.c | 50 ++++-- - src/liblzma/rangecoder/Makefile.am | 4 +- - src/liblzma/subblock/subblock_decoder.c | 2 +- - src/lzma/args.c | 33 ++-- - src/lzma/help.c | 17 +- - src/lzma/options.c | 92 +++++----- - tests/test_block_header.c | 9 +- - tests/test_compress.sh | 4 +- - tests/test_filter_flags.c | 2 +- - 41 files changed, 482 insertions(+), 398 deletions(-) - -commit 5cc5064cae603b649c64c40125c7dd365de54c9d -Author: Lasse Collin -Date: 2008-09-27 11:28:49 +0300 - - Added 7z2lzma.bash. - - extra/7z2lzma/7z2lzma.bash | 114 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 114 insertions(+) - -commit f147666a5cd15542d4e427da58629f4a71cc38e1 -Author: Lasse Collin -Date: 2008-09-17 22:11:39 +0300 - - Miscellaneous LZ and LZMA encoder cleanups - - src/liblzma/api/lzma/lzma.h | 14 ------- - src/liblzma/lz/lz_encoder.c | 8 +++- - src/liblzma/lzma/Makefile.am | 1 - - src/liblzma/lzma/lzma_encoder.c | 64 ++++++++++++-------------------- - src/liblzma/lzma/lzma_encoder_features.c | 59 ----------------------------- - 5 files changed, 29 insertions(+), 117 deletions(-) - -commit 13d68b069849e19c33822cd8996cd6447890abb1 -Author: Lasse Collin -Date: 2008-09-13 13:54:00 +0300 - - LZ decoder cleanup - - src/liblzma/lz/lz_decoder.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -commit 13a74b78e37f16c9096ba5fe1859cc04eaa2f9f7 -Author: Lasse Collin -Date: 2008-09-13 12:10:43 +0300 - - Renamed constants: - - LZMA_VLI_VALUE_MAX -> LZMA_VLI_MAX - - LZMA_VLI_VALUE_UNKNOWN -> LZMA_VLI_UNKNOWN - - LZMA_HEADER_ERRRO -> LZMA_OPTIONS_ERROR - - debug/full_flush.c | 2 +- - debug/known_sizes.c | 2 +- - debug/sync_flush.c | 2 +- - src/liblzma/api/lzma/alignment.h | 2 +- - src/liblzma/api/lzma/base.h | 4 ++-- - src/liblzma/api/lzma/block.h | 28 ++++++++++++++-------------- - src/liblzma/api/lzma/container.h | 12 ++++++------ - src/liblzma/api/lzma/filter.h | 28 ++++++++++++++-------------- - src/liblzma/api/lzma/index.h | 2 +- - src/liblzma/api/lzma/lzma.h | 4 ++-- - src/liblzma/api/lzma/simple.h | 2 +- - src/liblzma/api/lzma/stream_flags.h | 20 ++++++++++---------- - src/liblzma/api/lzma/vli.h | 16 ++++++++-------- - src/liblzma/common/alignment.c | 6 +++--- - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 12 ++++++------ - src/liblzma/common/block_encoder.c | 6 +++--- - src/liblzma/common/block_header_decoder.c | 16 ++++++++-------- - src/liblzma/common/block_header_encoder.c | 24 ++++++++++++------------ - src/liblzma/common/block_util.c | 8 ++++---- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/easy.c | 4 ++-- - src/liblzma/common/filter_common.c | 22 +++++++++++----------- - src/liblzma/common/filter_decoder.c | 6 +++--- - src/liblzma/common/filter_encoder.c | 14 +++++++------- - src/liblzma/common/index.c | 24 +++++++++++------------- - src/liblzma/common/index.h | 2 +- - src/liblzma/common/index_hash.c | 13 ++++++------- - src/liblzma/common/stream_decoder.c | 4 ++-- - src/liblzma/common/stream_encoder.c | 4 ++-- - src/liblzma/common/stream_flags_common.c | 6 +++--- - src/liblzma/common/stream_flags_decoder.c | 6 +++--- - src/liblzma/common/stream_flags_encoder.c | 4 ++-- - src/liblzma/common/vli_encoder.c | 2 +- - src/liblzma/common/vli_size.c | 2 +- - src/liblzma/delta/delta_common.c | 2 +- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 2 +- - src/liblzma/lz/lz_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lzma/lzma2_decoder.c | 6 +++--- - src/liblzma/lzma/lzma_decoder.c | 14 +++++++------- - src/liblzma/lzma/lzma_encoder.c | 8 ++++---- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/simple/simple_decoder.c | 2 +- - src/liblzma/subblock/subblock_decoder.c | 6 +++--- - src/liblzma/subblock/subblock_encoder.c | 17 ++++++++--------- - src/lzma/args.c | 2 +- - src/lzma/error.c | 2 +- - src/lzma/list.c | 6 +++--- - src/lzmadec/lzmadec.c | 2 +- - tests/test_block.c | 8 ++++---- - tests/test_block_header.c | 30 +++++++++++++++--------------- - tests/test_filter_flags.c | 2 +- - tests/test_index.c | 2 +- - tests/test_stream_flags.c | 8 ++++---- - tests/tests.h | 2 +- - 58 files changed, 220 insertions(+), 224 deletions(-) - -commit 320601b2c7b08fc7da9da18d5bf7c3c1a189b080 -Author: Lasse Collin -Date: 2008-09-12 22:41:40 +0300 - - Improved the Stream Flags handling API. - - src/liblzma/api/lzma/stream_flags.h | 84 +++++++++++++++++++++++++++++-- - src/liblzma/common/stream_decoder.c | 5 +- - src/liblzma/common/stream_encoder.c | 2 + - src/liblzma/common/stream_flags_common.c | 28 ++++++++--- - src/liblzma/common/stream_flags_common.h | 9 ++++ - src/liblzma/common/stream_flags_decoder.c | 3 +- - src/liblzma/common/stream_flags_encoder.c | 10 ++-- - tests/test_stream_flags.c | 8 ++- - 8 files changed, 129 insertions(+), 20 deletions(-) - -commit ec490da5228263b25bf786bb23d1008468f55b30 -Author: Lasse Collin -Date: 2008-09-11 23:10:44 +0300 - - Simplified debug/known_sizes.c to match the relaxed - requirements of Block encoder. - - debug/known_sizes.c | 14 +++++--------- - 1 file changed, 5 insertions(+), 9 deletions(-) - -commit 16e8b98f2659347edfa74afdbbb9e73311153cb9 -Author: Lasse Collin -Date: 2008-09-11 23:09:24 +0300 - - Remove a check from Block encoder that should have already - been removed in 2ba01bfa755e47ff6af84a978e3c8d63d7d2775e. - - src/liblzma/common/block_encoder.c | 5 ----- - 1 file changed, 5 deletions(-) - -commit 5a710c3805bdf6d7e3c92e954e4e4565b27bcb13 -Author: Lasse Collin -Date: 2008-09-11 20:02:38 +0300 - - Remove bogus #includes. - - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/stream_decoder.c | 3 --- - src/liblzma/common/stream_encoder.c | 1 - - src/liblzma/common/stream_flags_decoder.h | 31 ------------------------------- - 4 files changed, 36 deletions(-) - -commit 01892b2ca5f69bed0ea746e04b604030d57806bb -Author: Lasse Collin -Date: 2008-09-11 10:49:14 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 962f2231d49409fe6852e44ffe8c5dbabb04bc7d -Author: Lasse Collin -Date: 2008-09-11 10:48:12 +0300 - - Fix a compiler error on big endian systems that don't - support unaligned memory access. - - src/common/integer.h | 32 ++++++++++++++++++-------------- - 1 file changed, 18 insertions(+), 14 deletions(-) - -commit fa3ab0df8ae7a8a1ad55b52266dc0fd387458671 -Author: Lasse Collin -Date: 2008-09-11 10:46:14 +0300 - - Silence a compiler warning. - - src/lzma/process.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9373e81e18822db4972819442ea4c2cb9955470b -Author: Lasse Collin -Date: 2008-09-10 19:16:32 +0300 - - Bumped version to 4.999.6alpha. - - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit cb072b7c8442ba68bb0c62c0abbbe939794887a3 -Author: Lasse Collin -Date: 2008-09-10 17:02:00 +0300 - - Check for LZMA_FILTER_RESERVED_START in filter_flags_encoder.c. - Use LZMA_PROG_ERROR instead of LZMA_HEADER_ERROR if the Filter ID - is in the reserved range. This allows Block Header encoder to - detect unallowed Filter IDs, which is good for Stream encoder. - - src/liblzma/common/filter_flags_encoder.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 123ab0acec435c9e9866a99e30482116cfbd9ba5 -Author: Lasse Collin -Date: 2008-09-10 16:44:32 +0300 - - Filter handling cleanups - - src/liblzma/api/lzma/filter.h | 133 +++++++++++++++++++++++++++--------- - src/liblzma/common/filter_common.h | 3 + - src/liblzma/common/filter_decoder.c | 80 +++++++--------------- - src/liblzma/common/filter_decoder.h | 5 -- - src/liblzma/common/filter_encoder.c | 82 +++++++--------------- - src/liblzma/common/filter_encoder.h | 4 -- - 6 files changed, 156 insertions(+), 151 deletions(-) - -commit 9cfcd0c4f2f865d8fbbb46ea28344a9be0dd8ad1 -Author: Lasse Collin -Date: 2008-09-10 00:33:00 +0300 - - Comments - - src/liblzma/common/stream_encoder.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 2ba01bfa755e47ff6af84a978e3c8d63d7d2775e -Author: Lasse Collin -Date: 2008-09-10 00:27:02 +0300 - - Cleaned up Block encoder and moved the no longer shared - code from block_private.h to block_decoder.c. Now the Block - encoder doesn't need compressed_size and uncompressed_size - from lzma_block structure to be initialized. - - src/liblzma/api/lzma/block.h | 3 -- - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/block_decoder.c | 23 +++++++++- - src/liblzma/common/block_encoder.c | 92 ++++++++++++++++++-------------------- - src/liblzma/common/block_private.h | 47 ------------------- - 5 files changed, 66 insertions(+), 100 deletions(-) - -commit 07efcb5a6bc5d7018798ebd728586f84183e7d64 -Author: Lasse Collin -Date: 2008-09-07 10:23:13 +0300 - - Changed Filter ID of LZMA to 0x20. - - doc/file-format.txt | 4 ++-- - src/liblzma/api/lzma/lzma.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 32fe5fa541e82c08e054086279079ae5016bd8d8 -Author: Lasse Collin -Date: 2008-09-06 23:42:50 +0300 - - Comments - - src/liblzma/api/lzma/base.h | 81 ++++++++++++++++++++++++++-------------- - src/liblzma/api/lzma/container.h | 6 ++- - src/liblzma/lz/lz_encoder.c | 3 +- - src/liblzma/lz/lz_encoder.h | 12 +++--- - src/liblzma/lz/lz_encoder_mf.c | 2 +- - 5 files changed, 65 insertions(+), 39 deletions(-) - -commit 0a31ed9d5e3cde4feb094b66f3a8b2c074605d84 -Author: Lasse Collin -Date: 2008-09-06 15:14:30 +0300 - - Some API cleanups - - src/liblzma/api/lzma/base.h | 314 +++++++++++++++++++++++------------- - src/liblzma/api/lzma/check.h | 10 ++ - src/liblzma/api/lzma/container.h | 40 +++-- - src/liblzma/common/auto_decoder.c | 18 +-- - src/liblzma/common/common.c | 7 + - src/liblzma/common/common.h | 18 ++- - src/liblzma/common/easy.c | 2 +- - src/liblzma/common/stream_decoder.c | 31 ++-- - src/lzma/process.c | 2 +- - src/lzmadec/lzmadec.c | 6 +- - tests/tests.h | 72 +++------ - 11 files changed, 301 insertions(+), 219 deletions(-) - -commit da98df54400998be2a6c3876f9655a3c51b93c10 -Author: Lasse Collin -Date: 2008-09-04 11:53:06 +0300 - - Added support for raw encoding and decoding to the command - line tool, and made various cleanups. --lzma was renamed to - --lzma1 to prevent people from accidentally using LZMA when - they want LZMA2. - - src/lzma/args.c | 17 +++++++++-------- - src/lzma/args.h | 1 + - src/lzma/help.c | 24 ++++++------------------ - src/lzma/process.c | 42 ++++++++++++++++++++++++++++++++++-------- - 4 files changed, 50 insertions(+), 34 deletions(-) - -commit 2496aee8a7741a8a0d42987db41ff2cf1a4bdabd -Author: Lasse Collin -Date: 2008-09-04 10:39:15 +0300 - - Don't allow LZMA_SYNC_FLUSH with decoders anymore. There's - simply nothing that would use it. Allow LZMA_FINISH to the - decoders, which will usually ignore it (auto decoder and - Stream decoder being exceptions). - - src/liblzma/common/alone_decoder.c | 1 - - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/filter_decoder.c | 2 +- - 3 files changed, 2 insertions(+), 3 deletions(-) - -commit bea301c26d5d52675e11e0236faec0492af98f60 -Author: Lasse Collin -Date: 2008-09-03 17:06:25 +0300 - - Minor updates to the file format specification. - - doc/file-format.txt | 105 ++++++++++++++++++++++++++++++++++++++++++---------- - 1 file changed, 85 insertions(+), 20 deletions(-) - -commit 9c75b089b4a9e0edcf4cf7970a4383768707d6c8 -Author: Lasse Collin -Date: 2008-09-02 19:33:32 +0300 - - Command line tool fixes - - src/lzma/process.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -commit bab0590504b5aeff460ab4ca8c964dd7c1bad9e4 -Author: Lasse Collin -Date: 2008-09-02 19:31:42 +0300 - - Auto decoder cleanup - - src/liblzma/common/auto_decoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 689602336d126a46b60d791a67decab65e1e81f5 -Author: Lasse Collin -Date: 2008-09-02 19:12:12 +0300 - - Updated auto decoder to handle LZMA_CONCATENATED when decoding - LZMA_Alone files. Decoding of concatenated LZMA_Alone files is - intentionally not supported, so it is better to put this in - auto decoder than LZMA_Alone decoder. - - src/liblzma/common/auto_decoder.c | 87 ++++++++++++++++++++++++++++++++------- - 1 file changed, 71 insertions(+), 16 deletions(-) - -commit 80c4158f19904026433eb6f5d5ca98a0ecd4f66c -Author: Lasse Collin -Date: 2008-09-02 14:56:52 +0300 - - Stream decoder cleanups - - src/liblzma/common/stream_decoder.c | 57 +++++++++++++++++++++---------------- - 1 file changed, 32 insertions(+), 25 deletions(-) - -commit fc681657450ce57be1fe08f7a15d31dcc705e514 -Author: Lasse Collin -Date: 2008-09-02 11:45:39 +0300 - - Some fixes to LZ encoder. - - src/liblzma/lz/lz_encoder.c | 56 ++++++++++++++++++++----- - src/liblzma/lz/lz_encoder.h | 18 ++++---- - src/liblzma/lz/lz_encoder_mf.c | 95 +++++++++++++++++------------------------- - 3 files changed, 94 insertions(+), 75 deletions(-) - -commit ede675f9ac1ca82a7d7c290324adba672118bc8d -Author: Lasse Collin -Date: 2008-08-31 11:47:01 +0300 - - Fix wrong pointer calculation in LZMA encoder. - - src/liblzma/lzma/lzma_encoder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 3b34851de1eaf358cf9268922fa0eeed8278d680 -Author: Lasse Collin -Date: 2008-08-28 22:53:15 +0300 - - Sort of garbage collection commit. :-| Many things are still - broken. API has changed a lot and it will still change a - little more here and there. The command line tool doesn't - have all the required changes to reflect the API changes, so - it's easy to get "internal error" or trigger assertions. - - configure.ac | 356 +++--- - debug/Makefile.am | 5 +- - .../lz/lz_encoder_private.h => debug/crc32.c | 41 +- - debug/full_flush.c | 14 +- - debug/hex2bin.c | 54 + - debug/known_sizes.c | 135 ++ - debug/memusage.c | 8 +- - debug/sync_flush.c | 20 +- - src/common/integer.h | 26 +- - src/common/sysdefs.h | 42 +- - src/liblzma/Makefile.am | 17 +- - src/liblzma/api/Makefile.am | 6 +- - src/liblzma/api/lzma.h | 161 ++- - src/liblzma/api/lzma/alignment.h | 6 +- - src/liblzma/api/lzma/alone.h | 52 - - src/liblzma/api/lzma/auto.h | 36 - - src/liblzma/api/lzma/base.h | 61 +- - src/liblzma/api/lzma/block.h | 38 +- - src/liblzma/api/lzma/check.h | 41 +- - src/liblzma/api/lzma/container.h | 252 ++++ - src/liblzma/api/lzma/delta.h | 36 +- - src/liblzma/api/lzma/easy.h | 121 -- - src/liblzma/api/lzma/filter.h | 74 +- - src/liblzma/api/lzma/index.h | 40 +- - src/liblzma/api/lzma/index_hash.h | 12 +- - src/liblzma/api/lzma/lzma.h | 222 ++-- - src/liblzma/api/lzma/memlimit.h | 15 +- - src/liblzma/api/lzma/raw.h | 60 - - src/liblzma/api/lzma/simple.h | 2 +- - src/liblzma/api/lzma/stream.h | 53 - - src/liblzma/api/lzma/stream_flags.h | 17 +- - src/liblzma/api/lzma/subblock.h | 4 +- - src/liblzma/api/lzma/version.h | 10 +- - src/liblzma/api/lzma/vli.h | 131 +- - src/liblzma/check/check.c | 128 +- - src/liblzma/check/check.h | 67 +- - src/liblzma/check/sha256.c | 29 +- - src/liblzma/common/Makefile.am | 51 +- - src/liblzma/common/alignment.c | 4 +- - src/liblzma/common/allocator.c | 58 - - src/liblzma/common/alone_decoder.c | 49 +- - src/liblzma/common/alone_decoder.h | 9 +- - src/liblzma/common/alone_encoder.c | 13 +- - src/liblzma/common/auto_decoder.c | 38 +- - src/liblzma/common/block_decoder.c | 67 +- - src/liblzma/common/block_decoder.h | 2 +- - src/liblzma/common/block_encoder.c | 42 +- - src/liblzma/common/block_encoder.h | 2 +- - src/liblzma/common/block_header_decoder.c | 6 +- - src/liblzma/common/block_header_encoder.c | 9 +- - src/liblzma/common/block_util.c | 10 +- - src/liblzma/common/{code.c => common.c} | 129 +- - src/liblzma/common/common.h | 237 ++-- - src/liblzma/common/easy.c | 18 +- - src/liblzma/common/features.c | 66 - - src/liblzma/common/filter_common.c | 262 ++++ - src/liblzma/common/filter_common.h | 52 + - src/liblzma/common/filter_decoder.c | 236 ++++ - src/liblzma/common/filter_decoder.h | 35 + - src/liblzma/common/filter_encoder.c | 308 +++++ - src/liblzma/common/filter_encoder.h | 38 + - src/liblzma/common/filter_flags_decoder.c | 185 +-- - src/liblzma/common/filter_flags_encoder.c | 261 +--- - src/liblzma/common/index_decoder.c | 14 +- - src/liblzma/common/index_encoder.c | 16 +- - src/liblzma/common/index_hash.c | 8 +- - src/liblzma/common/init_encoder.c | 2 +- - src/liblzma/common/memory_usage.c | 112 -- - src/liblzma/common/next_coder.c | 65 - - src/liblzma/common/raw_common.c | 127 -- - src/liblzma/common/raw_decoder.c | 116 -- - src/liblzma/common/raw_encoder.c | 111 -- - src/liblzma/common/stream_common.c | 23 - - src/liblzma/common/stream_decoder.c | 238 +++- - src/liblzma/common/stream_decoder.h | 4 +- - src/liblzma/common/stream_encoder.c | 35 +- - src/liblzma/common/stream_encoder.h | 2 +- - ...{stream_flags_equal.c => stream_flags_common.c} | 14 +- - .../{stream_common.h => stream_flags_common.h} | 8 +- - src/liblzma/common/stream_flags_decoder.c | 2 +- - src/liblzma/common/stream_flags_encoder.c | 2 +- - src/liblzma/common/vli_decoder.c | 29 +- - src/liblzma/common/vli_encoder.c | 23 +- - src/liblzma/common/{version.c => vli_size.c} | 22 +- - src/liblzma/delta/Makefile.am | 34 + - src/liblzma/{common => delta}/delta_common.c | 2 +- - src/liblzma/{common => delta}/delta_common.h | 0 - src/liblzma/{common => delta}/delta_decoder.c | 21 + - src/liblzma/{common => delta}/delta_decoder.h | 4 + - src/liblzma/{common => delta}/delta_encoder.c | 21 + - src/liblzma/{common => delta}/delta_encoder.h | 2 + - src/liblzma/lz/Makefile.am | 35 +- - src/liblzma/lz/bt2.c | 27 - - src/liblzma/lz/bt2.h | 31 - - src/liblzma/lz/bt3.c | 29 - - src/liblzma/lz/bt3.h | 31 - - src/liblzma/lz/bt4.c | 30 - - src/liblzma/lz/bt4.h | 31 - - src/liblzma/lz/hc3.c | 30 - - src/liblzma/lz/hc3.h | 31 - - src/liblzma/lz/hc4.c | 31 - - src/liblzma/lz/hc4.h | 31 - - src/liblzma/lz/lz_decoder.c | 547 +++----- - src/liblzma/lz/lz_decoder.h | 308 ++--- - src/liblzma/lz/lz_encoder.c | 780 ++++++------ - src/liblzma/lz/lz_encoder.h | 334 +++-- - src/liblzma/lz/lz_encoder_hash.h | 104 ++ - src/liblzma/lz/lz_encoder_mf.c | 780 ++++++++++++ - src/liblzma/lz/match_c.h | 412 ------ - src/liblzma/lz/match_h.h | 69 -- - src/liblzma/lzma/Makefile.am | 37 +- - src/liblzma/lzma/fastpos.h | 8 +- - src/liblzma/lzma/lzma2_decoder.c | 318 +++++ - src/liblzma/lzma/lzma2_decoder.h | 35 + - src/liblzma/lzma/lzma2_encoder.c | 406 ++++++ - .../{common/raw_common.h => lzma/lzma2_encoder.h} | 22 +- - src/liblzma/lzma/lzma_common.h | 208 +++- - src/liblzma/lzma/lzma_decoder.c | 1306 ++++++++++++-------- - src/liblzma/lzma/lzma_decoder.h | 21 +- - src/liblzma/lzma/lzma_encoder.c | 576 +++++++-- - src/liblzma/lzma/lzma_encoder.h | 38 +- - src/liblzma/lzma/lzma_encoder_features.c | 2 +- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 925 -------------- - src/liblzma/lzma/lzma_encoder_getoptimumfast.c | 201 --- - src/liblzma/lzma/lzma_encoder_init.c | 228 ---- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 193 +++ - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 875 +++++++++++++ - src/liblzma/lzma/lzma_encoder_presets.c | 52 +- - src/liblzma/lzma/lzma_encoder_private.h | 174 +-- - src/liblzma/lzma/lzma_literal.c | 51 - - src/liblzma/lzma/lzma_literal.h | 71 -- - src/liblzma/rangecoder/Makefile.am | 10 +- - src/liblzma/rangecoder/price.h | 111 ++ - src/liblzma/rangecoder/price_table.c | 84 +- - src/liblzma/rangecoder/price_table_init.c | 33 +- - .../{price_table_gen.c => price_tablegen.c} | 19 +- - src/liblzma/rangecoder/range_common.h | 17 +- - src/liblzma/rangecoder/range_decoder.h | 209 ++-- - src/liblzma/rangecoder/range_encoder.h | 92 +- - src/liblzma/simple/Makefile.am | 12 + - src/liblzma/simple/simple_coder.c | 8 +- - src/liblzma/simple/simple_decoder.c | 47 + - .../raw_decoder.h => simple/simple_decoder.h} | 18 +- - src/liblzma/simple/simple_encoder.c | 45 + - .../raw_encoder.h => simple/simple_encoder.h} | 17 +- - src/liblzma/subblock/Makefile.am | 4 +- - src/liblzma/subblock/subblock_decoder.c | 20 +- - src/liblzma/subblock/subblock_decoder_helper.c | 2 +- - src/liblzma/subblock/subblock_encoder.c | 28 +- - src/lzma/args.c | 35 +- - src/lzma/args.h | 4 +- - src/lzma/options.c | 14 +- - src/lzma/process.c | 88 +- - src/lzmadec/lzmadec.c | 157 +-- - tests/Makefile.am | 1 + - tests/files/README | 303 ++--- - tests/files/bad-0-backward_size.lzma | Bin 0 -> 32 bytes - tests/files/bad-0-empty-truncated.lzma | Bin 0 -> 31 bytes - tests/files/bad-0-nonempty_index.lzma | Bin 0 -> 32 bytes - tests/files/bad-0cat-alone.lzma | Bin 0 -> 55 bytes - tests/files/bad-0catpad-empty.lzma | Bin 0 -> 69 bytes - tests/files/bad-0pad-empty.lzma | Bin 0 -> 37 bytes - tests/files/bad-1-block_header-1.lzma | Bin 0 -> 64 bytes - tests/files/bad-1-block_header-2.lzma | Bin 0 -> 64 bytes - tests/files/bad-1-block_header-3.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-block_header-4.lzma | Bin 0 -> 72 bytes - tests/files/bad-1-check-crc32.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-check-crc64.lzma | Bin 0 -> 72 bytes - tests/files/bad-1-check-sha256.lzma | Bin 0 -> 96 bytes - tests/files/bad-1-lzma2-1.lzma | Bin 0 -> 64 bytes - tests/files/bad-1-lzma2-2.lzma | Bin 0 -> 424 bytes - tests/files/bad-1-lzma2-3.lzma | Bin 0 -> 424 bytes - tests/files/bad-1-lzma2-4.lzma | Bin 0 -> 408 bytes - tests/files/bad-1-lzma2-5.lzma | Bin 0 -> 408 bytes - tests/files/bad-1-lzma2-6.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-lzma2-7.lzma | Bin 0 -> 408 bytes - tests/files/bad-1-stream_flags-1.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-stream_flags-2.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-stream_flags-3.lzma | Bin 0 -> 68 bytes - tests/files/bad-1-vli-1.lzma | Bin 0 -> 72 bytes - tests/files/bad-1-vli-2.lzma | Bin 0 -> 72 bytes - tests/files/bad-2-compressed_data_padding.lzma | Bin 0 -> 92 bytes - tests/files/bad-2-index-1.lzma | Bin 0 -> 92 bytes - tests/files/bad-2-index-2.lzma | Bin 0 -> 92 bytes - tests/files/bad-2-index-3.lzma | Bin 0 -> 92 bytes - tests/files/bad-2-index-4.lzma | Bin 0 -> 92 bytes - tests/files/bad-cat-single-none-pad_garbage_1.lzma | Bin 65 -> 0 bytes - tests/files/bad-cat-single-none-pad_garbage_2.lzma | Bin 65 -> 0 bytes - tests/files/bad-cat-single-none-pad_garbage_3.lzma | Bin 65 -> 0 bytes - tests/files/bad-multi-none-1.lzma | Bin 54 -> 0 bytes - tests/files/bad-multi-none-2.lzma | Bin 53 -> 0 bytes - tests/files/bad-multi-none-3.lzma | Bin 53 -> 0 bytes - tests/files/bad-multi-none-block_1.lzma | Bin 66 -> 0 bytes - tests/files/bad-multi-none-block_2.lzma | Bin 66 -> 0 bytes - tests/files/bad-multi-none-block_3.lzma | Bin 58 -> 0 bytes - tests/files/bad-multi-none-extra_1.lzma | Bin 54 -> 0 bytes - tests/files/bad-multi-none-extra_2.lzma | Bin 54 -> 0 bytes - tests/files/bad-multi-none-extra_3.lzma | Bin 55 -> 0 bytes - tests/files/bad-multi-none-header_1.lzma | Bin 57 -> 0 bytes - tests/files/bad-multi-none-header_2.lzma | Bin 61 -> 0 bytes - tests/files/bad-multi-none-header_3.lzma | Bin 59 -> 0 bytes - tests/files/bad-multi-none-header_4.lzma | Bin 59 -> 0 bytes - tests/files/bad-multi-none-header_5.lzma | Bin 58 -> 0 bytes - tests/files/bad-multi-none-header_6.lzma | Bin 59 -> 0 bytes - tests/files/bad-multi-none-header_7.lzma | Bin 59 -> 0 bytes - tests/files/bad-multi-none-index_1.lzma | Bin 51 -> 0 bytes - tests/files/bad-multi-none-index_2.lzma | Bin 49 -> 0 bytes - tests/files/bad-multi-none-index_3.lzma | Bin 51 -> 0 bytes - tests/files/bad-multi-none-index_4.lzma | Bin 51 -> 0 bytes - tests/files/bad-single-data_after_eopm_1.lzma | Bin 55 -> 0 bytes - tests/files/bad-single-data_after_eopm_2.lzma | Bin 56 -> 0 bytes - tests/files/bad-single-lzma-flush_beginning.lzma | Bin 53 -> 0 bytes - tests/files/bad-single-lzma-flush_twice.lzma | Bin 63 -> 0 bytes - tests/files/bad-single-none-empty.lzma | Bin 19 -> 0 bytes - .../files/bad-single-none-footer_filter_flags.lzma | Bin 30 -> 0 bytes - tests/files/bad-single-none-too_long_vli.lzma | Bin 39 -> 0 bytes - tests/files/bad-single-none-truncated.lzma | Bin 29 -> 0 bytes - tests/files/bad-single-subblock-padding_loop.lzma | Bin 43 -> 0 bytes - tests/files/bad-single-subblock1023-slow.lzma | Bin 7886 -> 0 bytes - tests/files/bad-single-subblock_subblock.lzma | Bin 26 -> 0 bytes - tests/files/good-0-empty.lzma | Bin 0 -> 32 bytes - tests/files/good-0cat-empty.lzma | Bin 0 -> 64 bytes - tests/files/good-0catpad-empty.lzma | Bin 0 -> 68 bytes - tests/files/good-0pad-empty.lzma | Bin 0 -> 36 bytes - tests/files/good-1-3delta-lzma2.lzma | Bin 0 -> 528 bytes - tests/files/good-1-block_header-1.lzma | Bin 0 -> 72 bytes - tests/files/good-1-block_header-2.lzma | Bin 0 -> 68 bytes - tests/files/good-1-block_header-3.lzma | Bin 0 -> 68 bytes - tests/files/good-1-check-crc32.lzma | Bin 0 -> 68 bytes - tests/files/good-1-check-crc64.lzma | Bin 0 -> 72 bytes - tests/files/good-1-check-none.lzma | Bin 0 -> 64 bytes - tests/files/good-1-check-sha256.lzma | Bin 0 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.lzma | Bin 0 -> 51312 bytes - tests/files/good-1-lzma2-1.lzma | Bin 0 -> 424 bytes - tests/files/good-1-lzma2-2.lzma | Bin 0 -> 424 bytes - tests/files/good-1-lzma2-3.lzma | Bin 0 -> 408 bytes - ...gle-sparc-lzma.lzma => good-1-sparc-lzma2.lzma} | Bin 2263 -> 2292 bytes - ...-single-x86-lzma.lzma => good-1-x86-lzma2.lzma} | Bin 1909 -> 1936 bytes - tests/files/good-2-lzma2.lzma | Bin 0 -> 92 bytes - tests/files/good-cat-single-none-pad.lzma | Bin 64 -> 0 bytes - tests/files/good-multi-none-1.lzma | Bin 75 -> 0 bytes - tests/files/good-multi-none-2.lzma | Bin 53 -> 0 bytes - tests/files/good-multi-none-block_1.lzma | Bin 66 -> 0 bytes - tests/files/good-multi-none-block_2.lzma | Bin 58 -> 0 bytes - tests/files/good-multi-none-extra_1.lzma | Bin 51 -> 0 bytes - tests/files/good-multi-none-extra_2.lzma | Bin 79 -> 0 bytes - tests/files/good-multi-none-extra_3.lzma | Bin 55 -> 0 bytes - tests/files/good-multi-none-header_1.lzma | Bin 58 -> 0 bytes - tests/files/good-multi-none-header_2.lzma | Bin 66 -> 0 bytes - tests/files/good-multi-none-header_3.lzma | Bin 59 -> 0 bytes - tests/files/good-single-delta-lzma.tiff.lzma | Bin 51409 -> 0 bytes - tests/files/good-single-lzma-empty.lzma | Bin 21 -> 0 bytes - tests/files/good-single-lzma-flush_1.lzma | Bin 48 -> 0 bytes - tests/files/good-single-lzma-flush_2.lzma | Bin 63 -> 0 bytes - tests/files/good-single-lzma.lzma | Bin 44 -> 0 bytes - tests/files/good-single-none-empty_1.lzma | Bin 18 -> 0 bytes - tests/files/good-single-none-empty_2.lzma | Bin 26 -> 0 bytes - tests/files/good-single-none-empty_3.lzma | Bin 19 -> 0 bytes - tests/files/good-single-none-pad.lzma | Bin 32 -> 0 bytes - tests/files/good-single-none.lzma | Bin 30 -> 0 bytes - tests/files/good-single-subblock-lzma.lzma | Bin 50 -> 0 bytes - tests/files/good-single-subblock_implicit.lzma | Bin 35 -> 0 bytes - tests/files/good-single-subblock_rle.lzma | Bin 118 -> 0 bytes - tests/files/malicious-multi-metadata-64PiB.lzma | Bin 51 -> 0 bytes - tests/files/malicious-single-subblock-256MiB.lzma | Bin 30 -> 0 bytes - tests/files/malicious-single-subblock-64PiB.lzma | Bin 45 -> 0 bytes - tests/files/malicious-single-subblock31-slow.lzma | Bin 1233 -> 0 bytes - tests/files/unsupported-block_header.lzma | Bin 0 -> 68 bytes - tests/files/unsupported-check.lzma | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-1.lzma | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-2.lzma | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-3.lzma | Bin 0 -> 68 bytes - tests/test_block_header.c | 28 +- - tests/test_compress.sh | 4 +- - tests/test_filter_flags.c | 51 +- - tests/test_stream_flags.c | 4 +- - tests/tests.h | 8 + - 277 files changed, 9050 insertions(+), 7477 deletions(-) - -commit 57b9a145a527f0716822615e5ed536d33aebd3fc -Author: Lasse Collin -Date: 2008-06-20 17:16:32 +0300 - - Fix test_filter_flags to match the new restriction of lc+lp. - - tests/test_filter_flags.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit eaafc4367c77ec1d910e16d11b4da293969d97a3 -Author: Lasse Collin -Date: 2008-06-20 16:19:54 +0300 - - Remove some redundant code from LZMA encoder. - - src/liblzma/lzma/lzma_encoder.c | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -commit 0809c46534fa5664fe35d9e98d95e87312ed130e -Author: Lasse Collin -Date: 2008-06-19 16:35:08 +0300 - - Add limit of lc + lp <= 4. Now we can allocate the - literal coder as part of the main LZMA encoder or - decoder structure. - - Make the LZMA decoder to rely on the current internal API - to free the allocated memory in case an error occurs. - - src/liblzma/api/lzma/lzma.h | 10 +++++- - src/liblzma/lzma/lzma_decoder.c | 57 ++++++++------------------------- - src/liblzma/lzma/lzma_encoder_init.c | 13 ++++---- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/lzma/lzma_literal.c | 39 +++++----------------- - src/liblzma/lzma/lzma_literal.h | 13 +++----- - 6 files changed, 43 insertions(+), 91 deletions(-) - -commit d25ab1b96178f06a0e724f58e3cd68300b2b1275 -Author: Lasse Collin -Date: 2008-06-18 21:45:19 +0300 - - Comments - - src/liblzma/lzma/lzma_encoder.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -commit 6368a2fa5901c75864be5171dd57a50af7adbb41 -Author: Lasse Collin -Date: 2008-06-18 19:19:02 +0300 - - Delete old code that was supposed to be already deleted - from test_block_header.c. - - tests/test_block_header.c | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -commit 7d17818cec8597f847b0a2537fde991bbc3d9e96 -Author: Lasse Collin -Date: 2008-06-18 18:02:10 +0300 - - Update the code to mostly match the new simpler file format - specification. Simplify things by removing most of the - support for known uncompressed size in most places. - There are some miscellaneous changes here and there too. - - The API of liblzma has got many changes and still some - more will be done soon. While most of the code has been - updated, some things are not fixed (the command line tool - will choke with invalid filter chain, if nothing else). - - Subblock filter is somewhat broken for now. It will be - updated once the encoded format of the Subblock filter - has been decided. - - configure.ac | 41 +- - debug/full_flush.c | 16 +- - debug/sync_flush.c | 15 +- - .../check/check_byteswap.h => common/bswap.h} | 15 +- - src/common/integer.h | 167 +++++ - src/liblzma/api/Makefile.am | 5 +- - src/liblzma/api/lzma.h | 9 +- - src/liblzma/api/lzma/alone.h | 32 +- - src/liblzma/api/lzma/auto.h | 7 +- - src/liblzma/api/lzma/base.h | 15 + - src/liblzma/api/lzma/block.h | 306 +++----- - src/liblzma/api/lzma/check.h | 18 +- - src/liblzma/api/lzma/copy.h | 29 - - src/liblzma/api/lzma/easy.h | 61 +- - src/liblzma/api/lzma/extra.h | 114 --- - src/liblzma/api/lzma/filter.h | 5 +- - src/liblzma/api/lzma/index.h | 204 +++++- - src/liblzma/api/lzma/index_hash.h | 94 +++ - src/liblzma/api/lzma/info.h | 315 -------- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/api/lzma/metadata.h | 100 --- - src/liblzma/api/lzma/raw.h | 20 +- - src/liblzma/api/lzma/stream.h | 157 +--- - src/liblzma/api/lzma/stream_flags.h | 146 ++-- - src/liblzma/api/lzma/version.h | 2 +- - src/liblzma/api/lzma/vli.h | 83 +-- - src/liblzma/check/Makefile.am | 1 - - src/liblzma/check/check.c | 55 +- - src/liblzma/check/check.h | 47 +- - src/liblzma/check/crc32_init.c | 2 +- - src/liblzma/check/crc64_init.c | 2 +- - src/liblzma/check/crc_macros.h | 2 +- - src/liblzma/check/sha256.c | 53 +- - src/liblzma/common/Makefile.am | 31 +- - src/liblzma/common/alignment.c | 5 +- - src/liblzma/common/alone_decoder.c | 77 +- - src/liblzma/common/alone_encoder.c | 99 ++- - src/liblzma/common/auto_decoder.c | 18 +- - src/liblzma/common/block_decoder.c | 298 ++------ - src/liblzma/common/block_encoder.c | 228 ++---- - src/liblzma/common/block_header_decoder.c | 400 ++-------- - src/liblzma/common/block_header_encoder.c | 207 ++---- - src/liblzma/common/block_private.h | 51 +- - src/liblzma/common/block_util.c | 73 ++ - src/liblzma/common/common.h | 44 +- - src/liblzma/common/copy_coder.c | 144 ---- - src/liblzma/common/copy_coder.h | 31 - - src/liblzma/common/delta_common.c | 4 - - src/liblzma/common/delta_common.h | 4 - - src/liblzma/common/delta_decoder.c | 55 +- - src/liblzma/common/delta_encoder.c | 7 +- - src/liblzma/common/{easy_multi.c => easy.c} | 87 ++- - src/liblzma/common/easy_common.c | 54 -- - src/liblzma/common/extra.c | 34 - - src/liblzma/common/features.c | 4 - - src/liblzma/common/filter_flags_decoder.c | 384 +++------- - src/liblzma/common/filter_flags_encoder.c | 120 +-- - src/liblzma/common/index.c | 773 ++++++++++++++++--- - src/liblzma/common/index.h | 67 ++ - src/liblzma/common/index_decoder.c | 252 +++++++ - src/liblzma/common/index_encoder.c | 222 ++++++ - .../{stream_encoder_multi.h => index_encoder.h} | 18 +- - src/liblzma/common/index_hash.c | 340 +++++++++ - src/liblzma/common/info.c | 814 --------------------- - src/liblzma/common/memory_usage.c | 1 - - src/liblzma/common/metadata_decoder.c | 578 --------------- - src/liblzma/common/metadata_decoder.h | 31 - - src/liblzma/common/metadata_encoder.c | 435 ----------- - src/liblzma/common/raw_common.c | 178 ++--- - src/liblzma/common/raw_common.h | 5 +- - src/liblzma/common/raw_decoder.c | 19 +- - src/liblzma/common/raw_decoder.h | 3 +- - src/liblzma/common/raw_encoder.c | 101 +-- - src/liblzma/common/raw_encoder.h | 3 +- - src/liblzma/common/stream_common.h | 3 + - src/liblzma/common/stream_decoder.c | 458 ++++-------- - .../common/{easy_common.h => stream_decoder.h} | 14 +- - src/liblzma/common/stream_encoder.c | 282 +++++++ - .../{metadata_encoder.h => stream_encoder.h} | 14 +- - src/liblzma/common/stream_encoder_multi.c | 445 ----------- - src/liblzma/common/stream_encoder_single.c | 219 ------ - src/liblzma/common/stream_flags_decoder.c | 260 ++----- - src/liblzma/common/stream_flags_encoder.c | 56 +- - .../common/{easy_single.c => stream_flags_equal.c} | 27 +- - src/liblzma/common/vli_decoder.c | 68 +- - src/liblzma/common/vli_encoder.c | 59 +- - src/liblzma/common/vli_reverse_decoder.c | 55 -- - src/liblzma/lz/lz_decoder.c | 6 +- - src/liblzma/lz/lz_decoder.h | 10 +- - src/liblzma/lzma/lzma_decoder.c | 13 +- - src/liblzma/lzma/lzma_decoder.h | 10 +- - src/liblzma/simple/simple_coder.c | 29 +- - src/liblzma/simple/simple_private.h | 4 - - src/liblzma/subblock/subblock_decoder.c | 106 +-- - src/liblzma/subblock/subblock_decoder_helper.c | 5 +- - src/liblzma/subblock/subblock_encoder.c | 8 +- - src/lzma/args.c | 22 +- - src/lzma/args.h | 2 - - src/lzma/error.c | 6 + - src/lzma/process.c | 26 +- - src/lzmadec/lzmadec.c | 8 +- - tests/Makefile.am | 5 +- - tests/test_block_header.c | 411 ++++------- - tests/test_compress.sh | 65 +- - tests/test_filter_flags.c | 116 ++- - tests/test_index.c | 504 ++++++++++++- - tests/test_info.c | 717 ------------------ - tests/test_stream_flags.c | 134 ++-- - tests/tests.h | 14 +- - 109 files changed, 4655 insertions(+), 7965 deletions(-) - -commit bf6348d1a3ff09fdc06940468f318f75ffa6af11 -Author: Lasse Collin -Date: 2008-06-17 15:03:46 +0300 - - Update the file format specification draft. The new one is - a lot simpler than the previous versions, but it also means - that the existing code will change a lot. - - doc/file-format.txt | 1794 +++++++++++++++------------------------------------ - 1 file changed, 508 insertions(+), 1286 deletions(-) - -commit 803194ddd26f01ff60ba4e9924c6087a56b29827 -Author: Lasse Collin -Date: 2008-06-11 21:42:47 +0300 - - Fix uninitialized variable in LZMA encoder. This was - introduced in 369f72fd656f537a9a8e06f13e6d0d4c242be22f. - - src/liblzma/lzma/lzma_encoder_init.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 0ea98e52ba87453497b1355c51f13bad55c8924a -Author: Lasse Collin -Date: 2008-06-11 15:08:44 +0300 - - Improve command line integer parsing a little in lzma and - lzmadec to make them accept also KiB in addition Ki etc. - Fix also memory usage information in lzmadec --help. - - src/lzma/util.c | 23 ++++++++++++++--------- - src/lzmadec/lzmadec.c | 31 ++++++++++++++++++------------- - 2 files changed, 32 insertions(+), 22 deletions(-) - -commit 436fa5fae96d4e35759aed33066060f09ee8c6ef -Author: Lasse Collin -Date: 2008-06-10 20:36:12 +0300 - - s/decompressed/compressed/ in the command line tool's - error message. - - src/lzma/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 369f72fd656f537a9a8e06f13e6d0d4c242be22f -Author: Lasse Collin -Date: 2008-06-01 12:48:17 +0300 - - Fix a buffer overflow in the LZMA encoder. It was due to my - misunderstanding of the code. There's no tiny fix for this - problem, so I also cleaned up the code in general. - - This reduces the speed of the encoder 2-5 % in the fastest - compression mode ("lzma -1"). High compression modes should - have no noticeable performance difference. - - This commit breaks things (especially LZMA_SYNC_FLUSH) but I - will fix them once the new format and LZMA2 has been roughly - implemented. Plain LZMA won't support LZMA_SYNC_FLUSH at all - and won't be supported in the new .lzma format. This may - change still but this is what it looks like now. - - Support for known uncompressed size (that is, LZMA or LZMA2 - without EOPM) is likely to go away. This means there will - be API changes. - - src/liblzma/lz/lz_encoder.c | 113 +---- - src/liblzma/lz/lz_encoder.h | 18 +- - src/liblzma/lzma/lzma_encoder.c | 551 ++++++++++++------------- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 59 ++- - src/liblzma/lzma/lzma_encoder_getoptimumfast.c | 4 +- - src/liblzma/lzma/lzma_encoder_init.c | 9 +- - src/liblzma/lzma/lzma_encoder_private.h | 15 +- - src/liblzma/rangecoder/range_encoder.h | 383 +++++++++-------- - 8 files changed, 532 insertions(+), 620 deletions(-) - -commit e55e0e873ce2511325749d415ae547d62ab5f00d -Author: Lasse Collin -Date: 2008-05-30 11:53:41 +0300 - - Typo fixes from meyering. - - doc/faq.txt | 4 ++-- - doc/liblzma-advanced.txt | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit ed6664146fcbe9cc4a3b23b31632182ed812ea93 -Author: Lasse Collin -Date: 2008-05-11 14:24:42 +0300 - - Remove support for pre-C89 libc versions that lack memcpy, - memmove, and memset. - - configure.ac | 2 +- - src/common/sysdefs.h | 15 ++------------- - src/liblzma/common/allocator.c | 2 +- - 3 files changed, 4 insertions(+), 15 deletions(-) - -commit b09464bf9ae694afc2d1dc26188ac4e2e8af0a63 -Author: Lasse Collin -Date: 2008-05-11 14:17:21 +0300 - - Improved C99 compiler detection in configure.ac. It will - pass -std=gnu99 instead of -std=c99 to GCC now, but -pedantic - should still give warnings about GNU extensions like before - except with some special keywords like asm(). - - configure.ac | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -commit 11de5d5267f7a0a7f0a4d34eec147e65eaf9f9cf -Author: Lasse Collin -Date: 2008-05-06 15:15:07 +0300 - - Bunch of grammar fixes from meyering. - - doc/liblzma-security.txt | 8 ++++---- - src/liblzma/api/lzma/memlimit.h | 6 +++--- - src/lzma/help.c | 2 +- - tests/files/README | 2 +- - 4 files changed, 9 insertions(+), 9 deletions(-) - -commit dc192b6343ae36276c85fcf7ef6006147816eadc -Author: Lasse Collin -Date: 2008-05-06 13:41:05 +0300 - - Typo fix - - src/liblzma/api/lzma/init.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 944b62b93239b27b338d117f2668c0e95849659b -Author: Lasse Collin -Date: 2008-05-04 22:29:27 +0300 - - Don't print an error message on broken pipe unless --verbose - is used. - - src/lzma/io.c | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -commit 8e074349e47ea6832b8fdf9244e581d453733433 -Author: Lasse Collin -Date: 2008-04-30 22:16:17 +0300 - - Fix a crash with --format=alone if other filters than LZMA - are specified on the command line. - - src/lzma/args.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit 2f361ac19b7fd3abcd362de4d470e6a9eb495b73 -Author: Lasse Collin -Date: 2008-04-28 17:08:27 +0300 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 3be21fb12f4cec2cf07799e8960382f4cb375369 -Author: Lasse Collin -Date: 2008-04-28 17:06:34 +0300 - - Fixed wrong spelling "limitter" to "limiter". This affects - liblzma's API. - - doc/liblzma-security.txt | 14 +++++++------- - src/liblzma/api/lzma/base.h | 4 ++-- - src/liblzma/api/lzma/memlimit.h | 10 +++++----- - src/liblzma/api/lzma/stream.h | 4 ++-- - src/liblzma/common/Makefile.am | 2 +- - src/liblzma/common/{memory_limitter.c => memory_limiter.c} | 2 +- - src/lzma/list.c | 6 +++--- - src/lzmadec/lzmadec.c | 12 ++++++------ - tests/test_memlimit.c | 4 ++-- - 9 files changed, 29 insertions(+), 29 deletions(-) - -commit beeb81060821dfec4e7898e0d44b7900dcb2215e -Author: Lasse Collin -Date: 2008-04-25 15:39:50 +0300 - - Prevent LZ encoder from hanging with known uncompressed - size. The "fix" breaks LZMA_SYNC_FLUSH at end of stream - with known uncompressed size, but since it currently seems - likely that support for encoding with known uncompressed - size will go away anyway, I'm not fixing this problem now. - - src/liblzma/lz/lz_encoder.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -commit c324325f9f13cdeb92153c5d00962341ba070ca2 -Author: Lasse Collin -Date: 2008-04-25 13:58:56 +0300 - - Removed src/liblzma/common/sysdefs.h symlink, which was - annoying, because "make dist" put two copies of sysdefs.h - into the tarball instead of the symlink. - - src/liblzma/check/crc32_table.c | 2 +- - src/liblzma/check/crc64_table.c | 2 +- - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/common.h | 2 +- - src/liblzma/common/sysdefs.h | 1 - - 5 files changed, 3 insertions(+), 5 deletions(-) - -commit d3ba30243c75c13d094de1793f9c58acdbacc692 -Author: Lasse Collin -Date: 2008-04-25 13:41:29 +0300 - - Added memusage.c to debug directory. - - debug/Makefile.am | 3 ++- - debug/memusage.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 1 deletion(-) - -commit 8f804c29aa8471ccd6438ddca254092b8869ca52 -Author: Lasse Collin -Date: 2008-04-25 13:32:35 +0300 - - Bumped version number to 4.999.3alpha. It will become 5.0.0 - once we have a stable release (won't be very soon). The - version number is no longer related to version of LZMA SDK. - - Made some small Automake-related changes to toplevel - Makefile.am and configure.ac. - - Makefile.am | 7 +++++-- - README | 29 +++++++++++++++++++++++++++++ - configure.ac | 4 ++-- - src/liblzma/api/lzma/version.h | 22 ++++++++++------------ - 4 files changed, 46 insertions(+), 16 deletions(-) - -commit c99037ea10f121cbacf60c37a36c29768ae53447 -Author: Lasse Collin -Date: 2008-04-24 20:25:39 +0300 - - Fix a memory leak by calling free(extra->data) in - lzma_extra_free(). - - src/liblzma/common/extra.c | 1 + - 1 file changed, 1 insertion(+) - -commit 22ba3b0b5043fa481903482ce85015fe775939e5 -Author: Lasse Collin -Date: 2008-04-24 20:23:05 +0300 - - Make unlzma and lzcat symlinks. - - src/lzma/Makefile.am | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -commit 17c36422d4cbc2c70d5c83ec389406f92cd9e85e -Author: Lasse Collin -Date: 2008-04-24 20:20:27 +0300 - - Fixed a bug in command line option parsing. - - src/lzma/options.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 283f939974c32c47f05d495e8dea455ec646ed64 -Author: Lasse Collin -Date: 2008-04-24 20:19:20 +0300 - - Added two assert()s. - - src/liblzma/lzma/lzma_encoder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit eb348a60b6e19a7c093f892434f23c4756973ffd -Author: Lasse Collin -Date: 2008-04-24 19:22:53 +0300 - - Switch to uint16_t as the type of range coder probabilities. - - src/liblzma/rangecoder/range_common.h | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -commit 6c5306e312bcfd254cf654f88c04e34ba786df3d -Author: Lasse Collin -Date: 2008-04-24 18:39:57 +0300 - - Fix wrong return type (uint32_t -> bool). - - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 712cfe3ebfd24df24d8896b1315c53c3bc4369c8 -Author: Lasse Collin -Date: 2008-04-24 18:38:00 +0300 - - Fix data corruption in LZ encoder with LZMA_SYNC_FLUSH. - - src/liblzma/lz/lz_encoder.c | 16 ++++++++++++++++ - src/liblzma/lz/lz_encoder.h | 4 ++++ - src/liblzma/lz/match_c.h | 23 ++++++++++++++++++----- - 3 files changed, 38 insertions(+), 5 deletions(-) - -commit bc04486e368d20b3027cde625267762aae063965 -Author: Lasse Collin -Date: 2008-04-24 17:33:01 +0300 - - Fix fastpos problem in Makefile.am when built with --enable-small. - - src/liblzma/lzma/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 7ab493924e0ed590a5121a15ee54038d238880d3 -Author: Lasse Collin -Date: 2008-04-24 17:30:51 +0300 - - Use 64-bit integer as range encoder's cache size. This fixes a - theoretical data corruption, which should be very hard to trigger - even intentionally. - - src/liblzma/rangecoder/range_encoder.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 641998c3e1ecc8b598fe0eb051fab8b9535c291b -Author: Lasse Collin -Date: 2008-03-24 16:38:40 +0200 - - Replaced the range decoder optimization that used arithmetic - right shift with as fast version that doesn't need - arithmetic right shift. Removed the related check from - configure.ac. - - configure.ac | 1 - - m4/ax_c_arithmetic_rshift.m4 | 36 ----------------------- - src/liblzma/rangecoder/range_decoder.h | 53 ++++++++++------------------------ - 3 files changed, 16 insertions(+), 74 deletions(-) - -commit ad999efd279d95f1e7ac555b14170e8e9020488c -Author: Lasse Collin -Date: 2008-03-22 14:39:34 +0200 - - Take advantage of arithmetic right shift in range decoder. - - src/liblzma/rangecoder/range_decoder.h | 52 ++++++++++++++++++++++++---------- - 1 file changed, 37 insertions(+), 15 deletions(-) - -commit 03e0e8a0d7228b6ff1f0af39e2c040a4e425973d -Author: Lasse Collin -Date: 2008-03-22 14:18:29 +0200 - - Added autoconf check to detect if we can use arithmetic - right shift for optimizations. - - configure.ac | 1 + - m4/ax_c_arithmetic_rshift.m4 | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+) - -commit 7521bbdc83acab834594a22bec50c8e1bd836298 -Author: Lasse Collin -Date: 2008-03-22 01:26:36 +0200 - - Update a comment to use the variable name rep_len_decoder. - - (And BTW, the previous commit actually did change the - program logic slightly.) - - src/liblzma/lzma/lzma_decoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 63b74d000eedaebb8485f623e56864ff5ab71064 -Author: Lasse Collin -Date: 2008-03-22 00:57:33 +0200 - - Demystified the "state" variable in LZMA code. Use the - word literal instead of char for better consistency. - There are still some names with _char instead of _literal - in lzma_optimum, these may be changed later. - - Renamed length coder variables. - - This commit doesn't change the program logic. - - src/liblzma/lzma/lzma_common.h | 69 ++++++++++++++++++++++-------- - src/liblzma/lzma/lzma_decoder.c | 47 ++++++++++---------- - src/liblzma/lzma/lzma_encoder.c | 14 +++--- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 34 +++++++-------- - src/liblzma/lzma/lzma_encoder_init.c | 5 ++- - src/liblzma/lzma/lzma_encoder_private.h | 8 ++-- - 6 files changed, 107 insertions(+), 70 deletions(-) - -commit e6eb0a26757e851cef62b9440319a8e73b015cb9 -Author: Lasse Collin -Date: 2008-03-14 23:16:11 +0200 - - Fix data corruption in LZMA encoder. Note that this bug was - specific to liblzma and was *not* present in LZMA SDK. - - src/liblzma/lzma/lzma_encoder.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 7d516f5129e4373a6d57249d7f608c634c66bf12 -Author: Lasse Collin -Date: 2008-03-14 21:32:37 +0200 - - Fix a comment API header. - - src/liblzma/api/lzma/lzma.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 748d6e4274921a350bd0a317380309717441ef9c -Author: Lasse Collin -Date: 2008-03-12 23:14:50 +0200 - - Make lzma_stream.next_in const. Let's see if anyone complains. - - src/liblzma/api/lzma/base.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit bfde3b24a5ae25ce53c854762b6148952386b025 -Author: Lasse Collin -Date: 2008-03-11 15:35:34 +0200 - - Apply a minor speed optimization to LZMA decoder. - - src/liblzma/lzma/lzma_decoder.c | 85 +++++++++++++++++++++-------------------- - 1 file changed, 43 insertions(+), 42 deletions(-) - -commit f310c50286d9e4e9c6170bb65348c9bb430a65b4 -Author: Lasse Collin -Date: 2008-03-11 15:17:16 +0200 - - Initialize the last byte of the dictionary to zero so that - lz_get_byte(lz, 0) returns zero. This was broken by - 1a3b21859818e4d8e89a1da99699233c1bfd197d. - - src/liblzma/lz/lz_decoder.c | 1 + - 1 file changed, 1 insertion(+) - -commit 5ead36cf7f823093672a4e43c3180b38c9abbaff -Author: Lasse Collin -Date: 2008-03-10 15:57:55 +0200 - - Really fix the price count initialization. - - src/liblzma/lzma/lzma_encoder_init.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit d4d7feb83d1a1ded8f662a82e21e053841ca726c -Author: Lasse Collin -Date: 2008-03-10 13:47:17 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 0541c5ea63ef3c0ff85eeddb0a420e56b0c65258 -Author: Lasse Collin -Date: 2008-03-10 13:46:48 +0200 - - Initialize align_price_count and match_price_count in - lzma_encoder_init.c. While we don't call - fill_distances_prices() and fill_align_prices() in - lzma_lzma_encoder_init(), we still need to initialize - these two variables so that the fill functions get - called in lzma_encoder_getoptimum.c in the beginning - of a stream. - - src/liblzma/lzma/lzma_encoder_init.c | 2 ++ - 1 file changed, 2 insertions(+) - -commit 596fa1fac72823e4ef5bc26bb53f9090445bf748 -Author: Lasse Collin -Date: 2008-03-10 13:44:29 +0200 - - Always initialize lz->temp_size in lz_decoder.c. temp_size did - get initialized as a side-effect after allocating a new decoder, - but not when the decoder was reused. - - src/liblzma/lz/lz_decoder.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -commit 45e43e169527e7a98a8c8a821d37bf25822b764d -Author: Lasse Collin -Date: 2008-03-10 13:41:25 +0200 - - Don't fill allocated memory with 0xFD when debugging is - enabled. It hides errors from Valgrind. - - src/liblzma/common/allocator.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit c0e19e0662205f81a86da8903cdc325d50635870 -Author: Lasse Collin -Date: 2008-02-28 10:24:31 +0200 - - Remove two redundant validity checks from the LZMA decoder. - These are already checked elsewhere, so omitting these - gives (very) tiny speed up. - - src/liblzma/lzma/lzma_decoder.c | 23 ++++------------------- - 1 file changed, 4 insertions(+), 19 deletions(-) - -commit de7485806284d1614095ae8cb2ebbb5d74c9ac45 -Author: Lasse Collin -Date: 2008-02-06 13:25:32 +0200 - - Tiny clean up to file-format.txt. - - doc/file-format.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 1a3b21859818e4d8e89a1da99699233c1bfd197d -Author: Lasse Collin -Date: 2008-02-02 14:51:06 +0200 - - Don't memzero() the history buffer when initializing LZ - decoder. There's no danger of information leak here, so - it isn't required. Doing memzero() takes a lot of time - with large dictionaries, which could make it easier to - construct DoS attack to consume too much CPU time. - - src/liblzma/lz/lz_decoder.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -commit 7e796e312bf644ea95aea0ff85480f47cfa30fc0 -Author: Lasse Collin -Date: 2008-02-01 08:39:26 +0200 - - Do uncompressed size validation in raw encoder. This way - it gets done for not only raw encoder, but also Block - and LZMA_Alone encoders. - - src/liblzma/common/raw_encoder.c | 90 ++++++++++++++++++++++++++++++++-------- - 1 file changed, 73 insertions(+), 17 deletions(-) - -commit 7dd48578a3853e0cfab9f1830bc30927173ec4bc -Author: Lasse Collin -Date: 2008-02-01 08:32:05 +0200 - - Avoid unneeded function call in raw_common.c. - - src/liblzma/common/raw_common.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -commit b596fac963c3ff96f615d4d9b427a213ec341211 -Author: Lasse Collin -Date: 2008-01-26 21:42:38 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit e9f6e9c075ad93141a568d94f7d4eb0f2edbd6c2 -Author: Lasse Collin -Date: 2008-01-26 21:40:23 +0200 - - Added note.GNU-stack to x86 assembler files. It is needed - when using non-executable stack. - - src/liblzma/check/crc32_x86.S | 9 +++++++++ - src/liblzma/check/crc64_x86.S | 9 +++++++++ - 2 files changed, 18 insertions(+) - -commit 4c7ad179c78f97f68ad548cb40a9dfa6871655ae -Author: Lasse Collin -Date: 2008-01-26 19:12:50 +0200 - - Added api/lzma/easy.h. I had forgot to add this to the - git repo. Thanks to Stephan Kulow. - - src/liblzma/api/lzma/easy.h | 174 ++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 174 insertions(+) - -commit 288b232f54c3692cd36f471d4042f51daf3ea79f -Author: Lasse Collin -Date: 2008-01-26 11:09:17 +0200 - - Added more test files. - - tests/files/README | 11 +++++++++++ - tests/files/bad-multi-none-header_7.lzma | Bin 0 -> 59 bytes - tests/files/good-single-sparc-lzma.lzma | Bin 0 -> 2263 bytes - tests/files/good-single-x86-lzma.lzma | Bin 0 -> 1909 bytes - 4 files changed, 11 insertions(+) - -commit c467b0defccf233d0c79234407bc38d7d09574d3 -Author: Lasse Collin -Date: 2008-01-26 10:47:55 +0200 - - Added more test files. - - tests/files/README | 6 ++++++ - tests/files/bad-multi-none-block_3.lzma | Bin 0 -> 58 bytes - tests/files/good-multi-none-block_2.lzma | Bin 0 -> 58 bytes - 3 files changed, 6 insertions(+) - -commit f9842f712732c482f2def9f24437851e57dd83f8 -Author: Lasse Collin -Date: 2008-01-26 00:25:34 +0200 - - Return LZMA_HEADER_ERROR if LZMA_SYNC_FLUSH is used with any - of the so called simple filters. If there is demand, limited - support for LZMA_SYNC_FLUSH may be added in future. - - After this commit, using LZMA_SYNC_FLUSH shouldn't cause - undefined behavior in any situation. - - src/liblzma/api/lzma/simple.h | 9 +++++++++ - src/liblzma/simple/simple_coder.c | 8 ++++++++ - 2 files changed, 17 insertions(+) - -commit e988ea1d1a286dd0f27af0657f9665d5cd8573aa -Author: Lasse Collin -Date: 2008-01-25 23:50:35 +0200 - - Added more Multi-Block test files. Improved some - descriptions in the test files' README. - - tests/files/README | 34 +++++++++++++++++++++++++------ - tests/files/bad-multi-none-block_1.lzma | Bin 0 -> 66 bytes - tests/files/bad-multi-none-block_2.lzma | Bin 0 -> 66 bytes - tests/files/good-multi-none-block_1.lzma | Bin 0 -> 66 bytes - 4 files changed, 28 insertions(+), 6 deletions(-) - -commit 4441e004185cd4c61bda184010eca5924c9dec87 -Author: Lasse Collin -Date: 2008-01-25 23:12:36 +0200 - - Combine lzma_options_block validation needed by both Block - encoder and decoder, and put the shared things to - block_private.h. Improved the checks a little so that - they may detect too big Compressed Size at initialization - time if lzma_options_block.total_size or .total_limit is - known. - - Allow encoding and decoding Blocks with combinations of - fields that are not allowed by the file format specification. - Doing this requires that the application passes such a - combination in lzma_options_lzma; liblzma doesn't do that, - but it's not impossible that someone could find them useful - in some custom file format. - - src/liblzma/common/block_decoder.c | 37 ++++++++++++---------------- - src/liblzma/common/block_encoder.c | 32 +++++------------------- - src/liblzma/common/block_private.h | 50 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 71 insertions(+), 48 deletions(-) - -commit bf4200c818fcf9102e56328d39cde91bfa13cfb6 -Author: Lasse Collin -Date: 2008-01-25 19:21:22 +0200 - - Added test_memlimit.c. - - tests/Makefile.am | 2 + - tests/test_memlimit.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 116 insertions(+) - -commit 7b8fc7e6b501a32a36636dac79ecb57099269005 -Author: Lasse Collin -Date: 2008-01-25 19:20:28 +0200 - - Improved the memory limitter: - - Added lzma_memlimit_max() and lzma_memlimit_reached() - API functions. - - Added simple estimation of malloc()'s memory usage - overhead. - - Fixed integer overflow detection in lzma_memlimit_alloc(). - - Made some white space cleanups and added more comments. - - The description of lzma_memlimit_max() in memlimit.h is bad - and should be improved. - - src/liblzma/api/lzma/memlimit.h | 35 +++++++++++++ - src/liblzma/common/memory_limitter.c | 97 ++++++++++++++++++++++++++++++------ - 2 files changed, 118 insertions(+), 14 deletions(-) - -commit e0c3d0043da2f670cfdb1abbb3223d5a594ad8db -Author: Lasse Collin -Date: 2008-01-25 13:55:52 +0200 - - Use more parenthesis in succeed() macro in tests/tests.h. - - tests/tests.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 1fd76d488179580d37f31ee11948f4932aed31fd -Author: Lasse Collin -Date: 2008-01-24 14:49:34 +0200 - - Added more Multi-Block Stream test files. - - tests/files/README | 23 +++++++++++++++++++++++ - tests/files/bad-multi-none-header_2.lzma | Bin 0 -> 61 bytes - tests/files/bad-multi-none-header_3.lzma | Bin 0 -> 59 bytes - tests/files/bad-multi-none-header_4.lzma | Bin 0 -> 59 bytes - tests/files/bad-multi-none-header_5.lzma | Bin 0 -> 58 bytes - tests/files/bad-multi-none-header_6.lzma | Bin 0 -> 59 bytes - tests/files/good-multi-none-header_3.lzma | Bin 0 -> 59 bytes - 7 files changed, 23 insertions(+) - -commit 6e27b1098a28f4ce09bfa6df68ad94182dfc2936 -Author: Lasse Collin -Date: 2008-01-24 00:46:05 +0200 - - Added bunch of test files containing Multi-Block Streams. - - tests/files/README | 53 ++++++++++++++++++++++++++++++ - tests/files/bad-multi-none-1.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-2.lzma | Bin 0 -> 53 bytes - tests/files/bad-multi-none-3.lzma | Bin 0 -> 53 bytes - tests/files/bad-multi-none-extra_1.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-extra_2.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-extra_3.lzma | Bin 0 -> 55 bytes - tests/files/bad-multi-none-header_1.lzma | Bin 0 -> 57 bytes - tests/files/bad-multi-none-index_1.lzma | Bin 0 -> 51 bytes - tests/files/bad-multi-none-index_2.lzma | Bin 0 -> 49 bytes - tests/files/bad-multi-none-index_3.lzma | Bin 0 -> 51 bytes - tests/files/bad-multi-none-index_4.lzma | Bin 0 -> 51 bytes - tests/files/good-multi-none-1.lzma | Bin 0 -> 75 bytes - tests/files/good-multi-none-2.lzma | Bin 0 -> 53 bytes - tests/files/good-multi-none-extra_1.lzma | Bin 0 -> 51 bytes - tests/files/good-multi-none-extra_2.lzma | Bin 0 -> 79 bytes - tests/files/good-multi-none-extra_3.lzma | Bin 0 -> 55 bytes - tests/files/good-multi-none-header_1.lzma | Bin 0 -> 58 bytes - tests/files/good-multi-none-header_2.lzma | Bin 0 -> 66 bytes - 19 files changed, 53 insertions(+) - -commit db9df0a9609c01a00a227329fb96e983971040f5 -Author: Lasse Collin -Date: 2008-01-23 23:43:00 +0200 - - Fix decoding of empty Metadata Blocks, that don't have - even the Metadata Flags field. Earlier the code allowed - such files; now they are prohibited as the file format - specification requires. - - src/liblzma/common/metadata_decoder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit 765f0b05f6e95ed9194fb90819cee189ebbac36b -Author: Lasse Collin -Date: 2008-01-23 23:38:18 +0200 - - Fix a bug related to 99e12af4e2b866c011fe0106cd1e0bfdcc8fe9c6. - lzma_metadata.header_metadata_size was not properly set to - zero if the Metadata had only the Metadata Flags field. - - src/liblzma/common/metadata_decoder.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -commit 3a7cc5c3dec7b078941f961b0393b86c418883b6 -Author: Lasse Collin -Date: 2008-01-23 23:35:49 +0200 - - Fix decoding of Extra Records that have empty Data. - - src/liblzma/common/metadata_decoder.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -commit e5fdec93e273855c1bcc2579b83cfb481a9a1492 -Author: Lasse Collin -Date: 2008-01-23 22:02:38 +0200 - - Add the trailing '\0' to lzma_extra.data as the API header - already documents. - - src/liblzma/common/metadata_decoder.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit ed40dc5a2c28a8dfccab8c165b3780738eeef93e -Author: Lasse Collin -Date: 2008-01-23 21:21:21 +0200 - - Added debug/full_flush.c. - - debug/Makefile.am | 3 +- - debug/full_flush.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 107 insertions(+), 1 deletion(-) - -commit ae0cd09a666a1682da8fc09487322227679e218d -Author: Lasse Collin -Date: 2008-01-23 21:05:33 +0200 - - Return LZMA_STREAM_END instead of LZMA_OK if - LZMA_SYNC_FLUSH or LZMA_FULL_FLUSH is used when - there's no unfinished Block open. - - src/liblzma/common/stream_encoder_multi.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -commit 0e80ded13dfceb98f9494cbb5381a95eb44d03db -Author: Lasse Collin -Date: 2008-01-23 20:05:01 +0200 - - Added bad-single-none-footer_filter_flags.lzma and - bad-single-none-too_long_vli.lzma. - - tests/files/README | 5 +++++ - tests/files/bad-single-none-footer_filter_flags.lzma | Bin 0 -> 30 bytes - tests/files/bad-single-none-too_long_vli.lzma | Bin 0 -> 39 bytes - 3 files changed, 5 insertions(+) - -commit 8c8eb14055d8dd536b1b1c58fb284d34bb8ed1dd -Author: Lasse Collin -Date: 2008-01-23 13:42:35 +0200 - - Fixed a typo. - - src/liblzma/subblock/subblock_decoder_helper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 980f65a9a10160c4d105767871e3002b9aaba3e0 -Author: Lasse Collin -Date: 2008-01-23 13:40:45 +0200 - - Fix a memory leak in the Subblock encoder. - - src/liblzma/subblock/subblock_encoder.c | 1 + - 1 file changed, 1 insertion(+) - -commit 99e12af4e2b866c011fe0106cd1e0bfdcc8fe9c6 -Author: Lasse Collin -Date: 2008-01-23 13:36:07 +0200 - - Fix Size of Header Metadata Block handling. Now - lzma_metadata.header_metadata_size == LZMA_VLI_VALUE_UNKNOWN - is not allowed at all. To indicate missing Header Metadata - Block, header_metadata_size must be set to zero. This is - what Metadata decoder does after this patch too. - - Note that other missing fields in lzma_metadata are still - indicated with LZMA_VLI_VALUE_UNKNOWN. This isn't as - illogical as it sounds at first, because missing Size of - Header Metadata Block means that Header Metadata Block is - not present in the Stream. With other Metadata fields, - a missing field means only that the value is unknown. - - src/liblzma/common/info.c | 13 ++++--------- - src/liblzma/common/metadata_decoder.c | 6 ++++++ - src/liblzma/common/metadata_encoder.c | 11 +++++------ - tests/test_info.c | 4 ++-- - 4 files changed, 17 insertions(+), 17 deletions(-) - -commit 58b78ab20c1bcced45cf71ae6684868fc90b4b81 -Author: Lasse Collin -Date: 2008-01-23 13:15:55 +0200 - - Fix a memory leak in metadata_decoder.c. - - src/liblzma/common/metadata_decoder.c | 1 + - 1 file changed, 1 insertion(+) - -commit 4d8cdbdab44400fd98f0f18a0f701e27cd1acdae -Author: Lasse Collin -Date: 2008-01-23 13:13:58 +0200 - - Fix the fix 863028cb7ad6d8d0455fa69348f56b376d7b908f which - just moved to problem. Now it's really fixed. - - src/liblzma/common/info.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 67321de963ccf69410b3868b8e31534fe18a90de -Author: Lasse Collin -Date: 2008-01-23 00:21:04 +0200 - - Take advantage of return_if_error() macro in - lzma_info_metadata_set() in info.c. - - src/liblzma/common/info.c | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -commit 863028cb7ad6d8d0455fa69348f56b376d7b908f -Author: Lasse Collin -Date: 2008-01-23 00:18:32 +0200 - - Fixed a dangling pointer that caused invalid free(). - - src/liblzma/common/info.c | 1 + - 1 file changed, 1 insertion(+) - -commit cf49f42a6bd40143f54a6b10d6e605599e958c0b -Author: Lasse Collin -Date: 2008-01-22 22:49:24 +0200 - - Added lzma_easy_* functions. These should make using - liblzma as easy as using zlib, because the easy API - don't require developers to know any fancy LZMA options. - - Note that Multi-Block Stream encoding is currently broken. - The easy API should be OK, the bug(s) are elsewhere. - - src/liblzma/api/Makefile.am | 1 + - src/liblzma/api/lzma.h | 1 + - src/liblzma/common/Makefile.am | 5 ++ - src/liblzma/common/easy_common.c | 54 ++++++++++++++++ - src/liblzma/common/easy_common.h | 28 ++++++++ - src/liblzma/common/easy_multi.c | 103 ++++++++++++++++++++++++++++++ - src/liblzma/common/easy_single.c | 37 +++++++++++ - src/liblzma/common/stream_encoder_multi.c | 3 +- - src/liblzma/common/stream_encoder_multi.h | 26 ++++++++ - 9 files changed, 256 insertions(+), 2 deletions(-) - -commit 1747b85a43abc1c3f152dbd349be2ef4089ecf6a -Author: Lasse Collin -Date: 2008-01-22 21:16:22 +0200 - - Fix Multi-Block Stream encoder's EOPM usage. - - src/liblzma/common/stream_encoder_multi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 0ed6f1adcea540fb9593ca115d36de537f7f0dc6 -Author: Lasse Collin -Date: 2008-01-22 00:15:11 +0200 - - Made lzma_extra pointers const in lzma_options_stream. - - src/liblzma/api/lzma/stream.h | 4 ++-- - src/liblzma/common/stream_encoder_multi.c | 8 ++++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -commit 305afa38f64c75af8e81c4167e2d8fa8d85b53a4 -Author: Lasse Collin -Date: 2008-01-20 20:15:21 +0200 - - Updated debug/sync_flush.c. - - debug/sync_flush.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -commit d53e9b77054cfade6a643e77d085273a348b189c -Author: Lasse Collin -Date: 2008-01-20 20:14:26 +0200 - - Added debug/repeat.c. - - debug/Makefile.am | 1 + - debug/repeat.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - -commit 107259e306bcfc2336a0fb870fb58034c28faa52 -Author: Lasse Collin -Date: 2008-01-20 20:12:58 +0200 - - Fix alignment handling bugs in Subblock encoder. - - This leaves one known alignment bug unfixed: If repeat count - doesn't fit into 28-bit integer, the encoder has to split - this to multiple Subblocks with Subblock Type `Repeating Data'. - The extra Subblocks may have wrong alignment. Correct alignment - is restored after the split Repeating Data has been completely - written out. - - Since the encoder doesn't even try to fix the alignment unless - the size of Data is at least 4 bytes, to trigger this bug you - need at least 4 GiB of repeating data with sequence length of - 4 or more bytes. Since the worst thing done by this bug is - misaligned data (no data corruption), this bug simply isn't - worth fixing, because a proper fix isn't simple. - - src/liblzma/subblock/subblock_encoder.c | 170 ++++++++++++++++++++++---------- - 1 file changed, 119 insertions(+), 51 deletions(-) - -commit e141fe18950400faaa3503ff88ac20eacd73e88c -Author: Lasse Collin -Date: 2008-01-19 21:16:33 +0200 - - Implemented LZMA_SYNC_FLUSH support to the Subblock encoder. - The API for handing Subfilters was changed to make it - consistent with LZMA_SYNC_FLUSH. - - A few sanity checks were added for Subfilter handling. Some - small bugs were fixed. More comments were added. - - src/liblzma/api/lzma/subblock.h | 29 ++-- - src/liblzma/subblock/subblock_encoder.c | 263 ++++++++++++++++++++++++-------- - 2 files changed, 214 insertions(+), 78 deletions(-) - -commit 23c227a864a3b69f38c6a74306161d4e6918d1cc -Author: Lasse Collin -Date: 2008-01-19 15:19:21 +0200 - - Revised the Delta filter implementation. The initialization - function is still shared between encoder and decoder, but the - actual coding is in separate files for encoder and decoder. - - There are now separate functions for the actual delta - calculation depending on if Delta is the last filter in the - chain or not. If it is the last, the new code copies the - data from input to output buffer and does the delta - calculation at the same time. The old code first copied the - data, then did the delta in the target buffer, which required - reading through the data twice. - - Support for LZMA_SYNC_FLUSH was added to the Delta encoder. - This doesn't change anything in the file format. - - src/liblzma/common/Makefile.am | 14 +- - src/liblzma/common/delta_coder.c | 189 --------------------- - src/liblzma/common/delta_common.c | 70 ++++++++ - src/liblzma/common/delta_common.h | 48 ++++++ - src/liblzma/common/delta_decoder.c | 102 +++++++++++ - .../common/{delta_coder.h => delta_decoder.h} | 11 +- - src/liblzma/common/delta_encoder.c | 97 +++++++++++ - src/liblzma/common/delta_encoder.h | 28 +++ - src/liblzma/common/raw_decoder.c | 2 +- - src/liblzma/common/raw_encoder.c | 2 +- - 10 files changed, 363 insertions(+), 200 deletions(-) - -commit 61dc82f3e306b25ce3cd3d529df9ec7a0ec04b73 -Author: Lasse Collin -Date: 2008-01-18 20:18:08 +0200 - - Added the debug directory and the first debug tool - (sync_flush). These tools are not built unless the - user runs "make" in the debug directory. - - Makefile.am | 1 + - configure.ac | 1 + - debug/Makefile.am | 30 ++++++++++++++ - debug/README | 17 ++++++++ - debug/sync_flush.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 165 insertions(+) - -commit 0ae3208db94585eb8294b97ded387de0a3a07646 -Author: Lasse Collin -Date: 2008-01-18 20:13:00 +0200 - - Added test files to test usage of flush marker in LZMA. - - tests/files/README | 12 ++++++++++++ - tests/files/bad-single-lzma-flush_beginning.lzma | Bin 0 -> 53 bytes - tests/files/bad-single-lzma-flush_twice.lzma | Bin 0 -> 63 bytes - tests/files/good-single-lzma-flush_1.lzma | Bin 0 -> 48 bytes - tests/files/good-single-lzma-flush_2.lzma | Bin 0 -> 63 bytes - 5 files changed, 12 insertions(+) - -commit ab5feaf1fcc146ef9fd39360c53c290bec39524e -Author: Lasse Collin -Date: 2008-01-18 20:02:52 +0200 - - Fix LZMA_SYNC_FLUSH handling in LZ and LZMA encoders. - That code is now almost completely in LZ coder, where - it can be shared with other LZ77-based algorithms in - future. - - src/liblzma/lz/lz_encoder.c | 34 ++++++++++++++++++++++++++-------- - src/liblzma/lz/lz_encoder.h | 1 + - src/liblzma/lzma/lzma_encoder.c | 27 ++------------------------- - 3 files changed, 29 insertions(+), 33 deletions(-) - -commit 079c4f7fc26b3d0b33d9ae7536697b45f3b73585 -Author: Lasse Collin -Date: 2008-01-18 17:21:24 +0200 - - Don't add -g to CFLAGS when --enable-debug is specified. - It's the job of the user to put that in CFLAGS. - - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -commit 61d1784d8f1761d979a6da6e223e279ca33815e6 -Author: Lasse Collin -Date: 2008-01-18 14:17:37 +0200 - - Set stdin and stdout to binary mode on Windows. This patch is - a forward port of b7b22fcb979a16d3a47c8001f058c9f7d4416068 - from lzma-utils-legacy.git. I don't know if the new code base - builds on Windows, but this is a start. - - src/lzmadec/lzmadec.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -commit c9cba976913e55ff9aac8a8133cc94416c7c1c9c -Author: Lasse Collin -Date: 2008-01-18 00:50:29 +0200 - - Added test_compress.sh and bunch of files needed by it. - This new set of tests compress and decompress several - test files with many different compression options. - This set of tests will be extended later. - - tests/Makefile.am | 30 ++++--- - tests/bcj_test.c | 66 ++++++++++++++ - tests/compress_prepared_bcj_sparc | Bin 0 -> 6804 bytes - tests/compress_prepared_bcj_x86 | Bin 0 -> 4649 bytes - tests/create_compress_files.c | 164 ++++++++++++++++++++++++++++++++++ - tests/test_compress.sh | 183 ++++++++++++++++++++++++++++++++++++++ - 6 files changed, 433 insertions(+), 10 deletions(-) - -commit 33be3c0e24d8f43376ccf71cc77d53671e792f07 -Author: Lasse Collin -Date: 2008-01-17 18:56:53 +0200 - - Subblock decoder: Don't exit the main loop in decode_buffer() - too early if we hit End of Input while decoding a Subblock of - type Repeating Data. To keep the loop termination condition - elegant, the order of enumerations in coder->sequence were - changed. - - To keep the case-labels in roughly the same order as the - enumerations in coder->sequence, large chunks of code was - moved around. This made the diff big and ugly compared to - the amount of the actual changes made. - - src/liblzma/subblock/subblock_decoder.c | 272 ++++++++++++++++---------------- - 1 file changed, 139 insertions(+), 133 deletions(-) - -commit b254bd97b1cdb68d127523d91ca9e054ed89c4fd -Author: Lasse Collin -Date: 2008-01-17 17:39:42 +0200 - - Fix wrong too small size of argument unfiltered_max - in ia64_coder_init(). It triggered assert() in - simple_coder.c, and could have caused a buffer overflow. - - This error was probably a copypaste mistake, since most - of the simple filters use unfiltered_max = 4. - - src/liblzma/simple/ia64.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 8f5794c8f1a30e8e3b524b415bbe81af2e04c64a -Author: Lasse Collin -Date: 2008-01-17 17:27:45 +0200 - - Added --delta to the output of "lzma --help". - - src/lzma/help.c | 4 ++++ - 1 file changed, 4 insertions(+) - -commit f88590e0014b38d40465937c19f25f05f16c79ae -Author: Lasse Collin -Date: 2008-01-17 13:14:20 +0200 - - Fix Subblock docoder: If Subblock filter was used with known - Uncompressed Size, and the last output byte was from RLE, - the code didn't stop decoding as it should have done. - - src/liblzma/subblock/subblock_decoder.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -commit bc0b945ca376e333077644d2f7fd54c2848aab8a -Author: Lasse Collin -Date: 2008-01-16 16:33:37 +0200 - - Tiny non-technical edits to file-format.txt. - - doc/file-format.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 7599bb7064ccf007f054595dedda7927af868252 -Author: Lasse Collin -Date: 2008-01-16 14:48:04 +0200 - - Plugged a memory leak in stream_decoder.c. - - src/liblzma/common/stream_decoder.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -commit 0b581539311f3712946e81e747839f8fb5f441a7 -Author: Lasse Collin -Date: 2008-01-16 14:47:27 +0200 - - Added memory leak detection to lzmadec.c. - - src/lzmadec/lzmadec.c | 3 +++ - 1 file changed, 3 insertions(+) - -commit 5b5b13c7bb8fde6331064d21f3ebde41072480c4 -Author: Lasse Collin -Date: 2008-01-16 14:46:50 +0200 - - Added lzma_memlimit_count(). - - src/liblzma/api/lzma/memlimit.h | 10 ++++++++++ - src/liblzma/common/memory_limitter.c | 19 +++++++++++++++++++ - 2 files changed, 29 insertions(+) - -commit 19389f2b82ec54fd4c847a18f16482e7be4c9887 -Author: Lasse Collin -Date: 2008-01-16 14:31:44 +0200 - - Added ARRAY_SIZE(array) macro. - - src/common/sysdefs.h | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 9bc33a54cbf83952130adbcb1be32c6882485416 -Author: Lasse Collin -Date: 2008-01-16 13:27:03 +0200 - - Make Uncompresed Size validation more strict - in alone_decoder.c. - - src/liblzma/common/alone_decoder.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 01d71d60b79027e1ce3eb9c79ae5191e1407c883 -Author: Lasse Collin -Date: 2008-01-15 17:46:59 +0200 - - Free the allocated memory in lzmadec if debugging is - enabled. This should make it possible to detect possible - memory leaks with Valgrind. - - src/lzmadec/lzmadec.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -commit 8235e6e5b2878f76633afcda9a334640db503ef5 -Author: Lasse Collin -Date: 2008-01-15 16:25:38 +0200 - - Fix memory leaks from test_block_header.c. - - tests/test_block_header.c | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -commit f10fc6a69d40b6d5c9cfbf8d3746f49869c2e2f6 -Author: Lasse Collin -Date: 2008-01-15 14:23:35 +0200 - - Use fastpos.h when encoding LZMA dictionary size in - Filter Flags encoder. - - src/liblzma/common/filter_flags_encoder.c | 40 +++++++++++++++---------------- - 1 file changed, 19 insertions(+), 21 deletions(-) - -commit e5728142a2048979f5c0c2149ce71ae952a092e1 -Author: Lasse Collin -Date: 2008-01-15 14:02:22 +0200 - - Revised the fastpos code. It now uses the slightly faster - table-based version from LZMA SDK 4.57. This should be - fast on most systems. - - A simpler and smaller alternative version is also provided. - On some CPUs this can be even a little faster than the - default table-based version (see comments in fastpos.h), - but on most systems the table-based code is faster. - - src/liblzma/common/init_encoder.c | 3 - - src/liblzma/lzma/Makefile.am | 4 + - src/liblzma/lzma/fastpos.h | 156 +++++++++ - src/liblzma/lzma/fastpos_table.c | 519 +++++++++++++++++++++++++++++ - src/liblzma/lzma/fastpos_tablegen.c | 63 ++++ - src/liblzma/lzma/lzma_common.h | 3 +- - src/liblzma/lzma/lzma_encoder.c | 1 + - src/liblzma/lzma/lzma_encoder_getoptimum.c | 1 + - src/liblzma/lzma/lzma_encoder_init.c | 22 -- - src/liblzma/lzma/lzma_encoder_private.h | 21 -- - 10 files changed, 746 insertions(+), 47 deletions(-) - -commit 10437b5b567f6a025ff16c45a572e417a0a9cc26 -Author: Lasse Collin -Date: 2008-01-15 13:32:13 +0200 - - Added bsr.h. - - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/bsr.h | 61 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 62 insertions(+) - -commit f3c88e8b8d8dd57f4bba5f0921eebf276437c244 -Author: Lasse Collin -Date: 2008-01-15 13:29:14 +0200 - - Fixed assembler detection in configure.ac, and added - detection for x86_64. - - configure.ac | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - -commit 54ec204f58287f50d3976288295da4188a19192b -Author: Lasse Collin -Date: 2008-01-15 12:20:41 +0200 - - Omit invalid space from printf() format string - in price_table_gen.c. - - src/liblzma/rangecoder/price_table_gen.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 01b4b19f49f00e17a0f9cb8754c672ac0847b6e1 -Author: Lasse Collin -Date: 2008-01-15 09:54:34 +0200 - - Removed a few unused macros from lzma_common.h. - - src/liblzma/lzma/lzma_common.h | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -commit 19bd7f3cf25e4ff8487ef7098ca4a7b58681961d -Author: Lasse Collin -Date: 2008-01-15 08:37:42 +0200 - - Fix a typo in lzma_encoder.c. - - src/liblzma/lzma/lzma_encoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9f9b1983013048f2142e8bc7e240149d2687bedc -Author: Lasse Collin -Date: 2008-01-15 08:36:25 +0200 - - Convert bittree_get_price() and bittree_reverse_get_price() - from macros to inline functions. - - src/liblzma/lzma/lzma_encoder.c | 19 +++----- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 16 +++---- - src/liblzma/rangecoder/range_encoder.h | 76 +++++++++++++++++------------- - 3 files changed, 56 insertions(+), 55 deletions(-) - -commit 78e85cb1a7667c54853670d2eb09d754bcbda87d -Author: Lasse Collin -Date: 2008-01-15 07:44:59 +0200 - - Fix CRC code in case --enable-small is used. - - src/liblzma/check/crc32_init.c | 2 +- - src/liblzma/check/crc64_init.c | 2 +- - src/liblzma/common/init_decoder.c | 2 -- - src/liblzma/common/init_encoder.c | 2 -- - tests/test_check.c | 2 ++ - 5 files changed, 4 insertions(+), 6 deletions(-) - -commit 949d4346e2d75bcd9dcb66c394d8d851d8db3aa0 -Author: Lasse Collin -Date: 2008-01-15 07:41:39 +0200 - - Fix typo in test_index.c. - - tests/test_index.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit d13d693155c176fc9e9ad5c50d48ccba27c2d9c6 -Author: Lasse Collin -Date: 2008-01-15 07:40:21 +0200 - - Added precomputed range coder probability price table. - - src/liblzma/common/init_encoder.c | 5 +- - src/liblzma/rangecoder/Makefile.am | 9 ++- - src/liblzma/rangecoder/price_table.c | 70 ++++++++++++++++++++++ - src/liblzma/rangecoder/price_table_gen.c | 55 +++++++++++++++++ - .../{range_encoder.c => price_table_init.c} | 6 +- - src/liblzma/rangecoder/range_common.h | 4 +- - src/liblzma/rangecoder/range_encoder.h | 21 ++++--- - 7 files changed, 153 insertions(+), 17 deletions(-) - -commit 362dc3843b373c1007a50a4719f378981f18ae03 -Author: Lasse Collin -Date: 2008-01-14 13:42:43 +0200 - - Remove RC_BUFFER_SIZE from lzma_encoder_private.h - and replace it with a sanity check. - - src/liblzma/lzma/lzma_encoder_private.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -commit e22b37968d153683fec61ad37b6b160cb7ca4ddc -Author: Lasse Collin -Date: 2008-01-14 13:39:54 +0200 - - Major changes to LZ encoder, LZMA encoder, and range encoder. - These changes implement support for LZMA_SYNC_FLUSH in LZMA - encoder, and move the temporary buffer needed by range encoder - from lzma_range_encoder structure to lzma_lz_encoder. - - src/liblzma/lz/lz_encoder.c | 138 ++++++++++++++++++++++++++++----- - src/liblzma/lz/lz_encoder.h | 17 ++-- - src/liblzma/lzma/lzma_encoder.c | 74 ++++++++++-------- - src/liblzma/rangecoder/range_encoder.h | 117 ++++++++-------------------- - 4 files changed, 206 insertions(+), 140 deletions(-) - -commit b59ef3973781f892c0a72b5e5934194567100be5 -Author: Lasse Collin -Date: 2008-01-14 13:34:29 +0200 - - Added one assert() to process.c of the command line tool. - - src/lzma/process.c | 1 + - 1 file changed, 1 insertion(+) - -commit 9547e734a00ddb64c851fa3f116e4f9e7d763ea7 -Author: Lasse Collin -Date: 2008-01-14 12:09:52 +0200 - - Don't use coder->lz.stream_end_was_reached in assertions - in match_c.h. - - src/liblzma/lz/match_c.h | 2 -- - 1 file changed, 2 deletions(-) - -commit 3e09e1c05871f3757f759b801890ccccc9286608 -Author: Lasse Collin -Date: 2008-01-14 12:08:02 +0200 - - In lzma_read_match_distances(), don't use - coder->lz.stream_end_was_reached. That variable - will be removed, and the check isn't required anyway. - Rearrange the check so that it doesn't make one to - think that there could be an integer overflow. - - src/liblzma/lzma/lzma_encoder_private.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit a670fec8021e5962429689c194148a04c3418872 -Author: Lasse Collin -Date: 2008-01-14 11:56:41 +0200 - - Small LZMA_SYNC_FLUSH fixes to Block and Single-Stream encoders. - - src/liblzma/common/block_encoder.c | 4 ++-- - src/liblzma/common/stream_encoder_single.c | 1 + - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 3599dba9570a6972a16b6398d6c838e9b420e985 -Author: Lasse Collin -Date: 2008-01-14 11:54:56 +0200 - - More fixes to LZMA decoder's flush marker handling. - - src/liblzma/lzma/lzma_decoder.c | 52 ++++++++++++++++++++++++----------------- - 1 file changed, 30 insertions(+), 22 deletions(-) - -commit f73c2ab6079ed5675a42b39d584a567befbd4624 -Author: Lasse Collin -Date: 2008-01-10 17:13:42 +0200 - - Eliminate lzma_lz_encoder.must_move_pos. It's needed - only in one place which isn't performance criticial. - - src/liblzma/lz/lz_encoder.c | 6 ++---- - src/liblzma/lz/lz_encoder.h | 4 ---- - 2 files changed, 2 insertions(+), 8 deletions(-) - -commit 382808514a42b2f4b4a64515e2dfb3fc1bc48ecd -Author: Lasse Collin -Date: 2008-01-09 20:05:57 +0200 - - Define HAVE_ASM_X86 when x86 assembler optimizations are - used. This #define will be useful for inline assembly. - - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -commit 0e70fbe4032351aab13a1cd8e5deced105c0b276 -Author: Lasse Collin -Date: 2008-01-09 12:06:46 +0200 - - Added good-single-none-empty_3.lzma and - bad-single-none-empty.lzma. - - tests/files/README | 6 ++++++ - tests/files/bad-single-none-empty.lzma | Bin 0 -> 19 bytes - tests/files/good-single-none-empty_3.lzma | Bin 0 -> 19 bytes - 3 files changed, 6 insertions(+) - -commit 379fbbe84d922c7cc00afa65c6f0c095da596b19 -Author: Lasse Collin -Date: 2008-01-08 23:11:59 +0200 - - Take advantage of return_if_error() in block_decoder.c. - - src/liblzma/common/block_decoder.c | 23 +++++++---------------- - 1 file changed, 7 insertions(+), 16 deletions(-) - -commit 97d5fa82077e57815dfad995dc393c2809a78539 -Author: Lasse Collin -Date: 2008-01-08 23:10:57 +0200 - - Updated tests/files/README. - - tests/files/README | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -commit 3bb9bb310936cba6a743b4f06739a397dec7c28f -Author: Lasse Collin -Date: 2008-01-08 23:05:40 +0200 - - Added test files with empty Compressed Data. - - tests/files/README | 6 ++++++ - tests/files/good-single-lzma-empty.lzma | Bin 0 -> 21 bytes - tests/files/good-single-none-empty_1.lzma | Bin 0 -> 18 bytes - tests/files/good-single-none-empty_2.lzma | Bin 0 -> 26 bytes - 4 files changed, 6 insertions(+) - -commit 7054c5f5888ac6a7178cd43dc9583ce6c7e78c9f -Author: Lasse Collin -Date: 2008-01-08 22:58:42 +0200 - - Fix decoding of Blocks that have only Block Header. - - src/liblzma/common/block_decoder.c | 37 ++++++++++++++----------------------- - 1 file changed, 14 insertions(+), 23 deletions(-) - -commit 753e4d95cd1cf29c632dfe1a670af7c67aeffbf4 -Author: Lasse Collin -Date: 2008-01-08 22:27:46 +0200 - - Added good-single-subblock_implicit.lzma. - - tests/files/README | 2 ++ - tests/files/good-single-subblock_implicit.lzma | Bin 0 -> 35 bytes - 2 files changed, 2 insertions(+) - -commit faeac7b7aca75f86afed1e7cc06279d9d497c627 -Author: Lasse Collin -Date: 2008-01-08 18:50:30 +0200 - - Disable CRC32 from Block Headers when --check=none - has been specified. - - src/lzma/process.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit a751126dbb656767ed4666cf0e5d3e17349d93d1 -Author: Lasse Collin -Date: 2008-01-08 13:36:29 +0200 - - Fixed encoding of empty files. Arguments to is_size_valid() - were in wrong order in block_encoder.c. - - src/liblzma/common/block_encoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 9080267603b1006c4867c823307dca9df8be0d20 -Author: Lasse Collin -Date: 2008-01-08 13:35:36 +0200 - - Added a few test files. - - tests/files/README | 21 ++++++++++++++++++--- - tests/files/bad-cat-single-none-pad_garbage_1.lzma | Bin 0 -> 65 bytes - tests/files/bad-cat-single-none-pad_garbage_2.lzma | Bin 0 -> 65 bytes - tests/files/bad-cat-single-none-pad_garbage_3.lzma | Bin 0 -> 65 bytes - ...eopm.lzma => bad-single-data_after_eopm_1.lzma} | Bin - tests/files/bad-single-none-truncated.lzma | Bin 0 -> 29 bytes - 6 files changed, 18 insertions(+), 3 deletions(-) - -commit b4943ccf73b64fc93a90a23474509c316f55eb2b -Author: Lasse Collin -Date: 2008-01-08 12:29:58 +0200 - - Avoid using ! in test_files.sh, because that doesn't work - with some ancient /bin/sh versions. - - tests/test_files.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -commit e2417b2b9134f3f65e14b61e23cd3644d8954353 -Author: Lasse Collin -Date: 2008-01-08 00:48:30 +0200 - - More pre-C99 inttypes.h compatibility fixes. Now the code - should work even if the system has no inttypes.h. - - src/common/physmem.h | 11 ----------- - src/liblzma/check/crc32_init.c | 5 +---- - src/liblzma/check/crc32_tablegen.c | 7 ++----- - src/liblzma/check/crc64_init.c | 5 +---- - src/liblzma/check/crc64_tablegen.c | 7 ++----- - 5 files changed, 6 insertions(+), 29 deletions(-) - -commit 5d227e51c23639423f4ade06aabb54e131f8505e -Author: Lasse Collin -Date: 2008-01-07 23:25:32 +0200 - - Updated fi.po although it's currently pretty much crap. - - po/fi.po | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -commit c7189d981a1b27c63da0c1ee80d9b5cd8ce1733d -Author: Lasse Collin -Date: 2008-01-07 23:14:25 +0200 - - Test for $GCC = yes instead of if it is non-empty. This - way it is possible to use ac_cv_c_compiler_gnu=no to - force configure to think it is using non-GNU C compiler. - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 3dbbea82b74bb841c995ad332a3aeca613015e10 -Author: Lasse Collin -Date: 2008-01-07 21:49:41 +0200 - - Added test_files.sh to tests/Makefile.am so it gets - included in the tarball with "make dist". - - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2fd2d181543feab1b4003f3ac6e85625fbee04f0 -Author: Lasse Collin -Date: 2008-01-07 18:22:24 +0200 - - Cosmetic edit to test_files.sh. - - tests/test_files.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -commit 9a71d573100a990ceb30ce0bec6a9a15d795605f -Author: Lasse Collin -Date: 2008-01-07 18:09:44 +0200 - - Added tests/files/README. - - tests/files/README | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 108 insertions(+) - -commit 47f48fe9936ed72617a60fbd015df7e0e47a1e43 -Author: Lasse Collin -Date: 2008-01-07 14:20:57 +0200 - - Tell in COPYING that everything in tests/files is - public domain. - - COPYING | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -commit 3502b3e1d00251d3c8dda96079440705c28d8225 -Author: Lasse Collin -Date: 2008-01-07 14:19:05 +0200 - - Cleaned up the tests/files directory. - - ...ck-loop.lzma => bad-single-subblock-padding_loop.lzma} | Bin - ...ck1023-slow.lzma => bad-single-subblock1023-slow.lzma} | Bin - tests/files/malicious-single-subblock-lzma.lzma | Bin 505 -> 0 bytes - 3 files changed, 0 insertions(+), 0 deletions(-) - -commit 908b2ac604b9940369d7fe8a45e9eb6da5d2a24c -Author: Lasse Collin -Date: 2008-01-07 13:49:19 +0200 - - Added test_files.sh to test decoding of the files in - the tests/files directory. It doesn't test the malicious - files yet. - - tests/Makefile.am | 4 +++- - tests/test_files.sh | 40 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 1 deletion(-) - -commit ecb2a6548f5978022a8fa931719dc575f5fd3bf6 -Author: Lasse Collin -Date: 2008-01-07 11:23:13 +0200 - - Updated README regarding the assembler optimizations. - - README | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -commit eacb8050438d3e6146c86eb9732d3fb1ef1825cb -Author: Lasse Collin -Date: 2008-01-07 10:58:00 +0200 - - Updated THANKS. - - THANKS | 1 + - 1 file changed, 1 insertion(+) - -commit 1239649f96132b18e3b7e2dd152ecf53a195caa8 -Author: Lasse Collin -Date: 2008-01-06 21:47:17 +0200 - - Cosmetic changes to configure.ac. - - configure.ac | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) - -commit 88ee301ec2e4506a30ec7ac9aaa2288e2dcadd0e -Author: Lasse Collin -Date: 2008-01-06 19:46:38 +0200 - - Automatically disable assembler code on Darwin x86. - Darwin has different ABI than GNU+Linux and Solaris, - thus the assembler code doesn't assemble on Darwin. - - configure.ac | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -commit c15a7abf66e3a70792f7444115e484c7981c8284 -Author: Lasse Collin -Date: 2008-01-06 19:45:27 +0200 - - With printf(), use PRIu64 with a cast to uint64_t instead - of %zu, because some pre-C99 libc versions don't support %zu. - - src/lzma/help.c | 13 +++++++------ - src/lzmadec/lzmadec.c | 6 ++++-- - 2 files changed, 11 insertions(+), 8 deletions(-) - -commit 4e7e54c4c522ab2f6a7abb92cefc4f707e9568fb -Author: Lasse Collin -Date: 2008-01-06 16:27:41 +0200 - - Introduced compatibility with systems that have pre-C99 - or no inttypes.h. This is useful when the compiler has - good enough support for C99, but libc headers don't. - - Changed liblzma API so that sys/types.h and inttypes.h - have to be #included before #including lzma.h. On systems - that don't have C99 inttypes.h, it's the problem of the - applications to provide the required types and macros - before #including lzma.h. - - If lzma.h defined the missing types and macros, it could - conflict with third-party applications whose configure - has detected that the types are missing and defined them - in config.h already. An alternative would have been - introducing lzma_uint32 and similar types, but that would - just be an extra pain on modern systems. - - configure.ac | 13 ++++++++- - doc/liblzma-intro.txt | 10 +++++-- - src/common/sysdefs.h | 59 +++++++++++++++++++++++++++++++++++++- - src/liblzma/api/lzma.h | 40 +++++++++++++++++--------- - src/liblzma/check/crc32_table.c | 4 +-- - src/liblzma/check/crc32_table_be.h | 2 -- - src/liblzma/check/crc32_table_le.h | 2 -- - src/liblzma/check/crc32_tablegen.c | 1 - - src/liblzma/check/crc64_table.c | 4 +-- - src/liblzma/check/crc64_table_be.h | 2 -- - src/liblzma/check/crc64_table_le.h | 2 -- - src/liblzma/check/crc64_tablegen.c | 1 - - src/lzma/private.h | 1 - - 13 files changed, 106 insertions(+), 35 deletions(-) - -commit a71864f77dfb76b5d78a270641539947c312583a -Author: Lasse Collin -Date: 2008-01-05 19:57:00 +0200 - - Fix typo in comment (INT64_MAX -> UINT64_MAX). - - src/liblzma/api/lzma/vli.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 072927905a3b66281c6311b4b351caa501d8b73a -Author: Lasse Collin -Date: 2008-01-05 19:42:04 +0200 - - Rearranged testing of GCC-specific flags. - - configure.ac | 33 +++++++++++++++++++++++---------- - 1 file changed, 23 insertions(+), 10 deletions(-) - -commit d160ee32598c6d1cd9054ef019e8c9331208b188 -Author: Lasse Collin -Date: 2008-01-05 01:20:24 +0200 - - Another bug fix for flush marker detection. - - src/liblzma/lzma/lzma_decoder.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -commit fc67f79f607cbfa78c6f47a69dec098d8659b162 -Author: Lasse Collin -Date: 2008-01-04 21:37:01 +0200 - - Fix stupid bugs in flush marker detection. - - src/liblzma/lzma/lzma_decoder.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -commit 0029cbbabe87d491fc046a55a629a6d556010baa -Author: Lasse Collin -Date: 2008-01-04 21:30:33 +0200 - - Added support for flush marker, which will be in files - that use LZMA_SYNC_FLUSH with encoder (not implemented - yet). This is a new feature in the raw LZMA format, - which isn't supported by old decoders. This shouldn't - be a problem in practice, since lzma_alone_encoder() - will not allow LZMA_SYNC_FLUSH, and thus not allow - creating files on decodable with old decoders. - - Made lzma_decoder.c to require tab width of 4 characters - if one wants to fit the code in 80 columns. This makes - the code easier to read. - - src/liblzma/lzma/lzma_common.h | 4 + - src/liblzma/lzma/lzma_decoder.c | 217 ++++++++++++++++++---------------------- - 2 files changed, 104 insertions(+), 117 deletions(-) - -commit bbfd1f6ab058a7e661545205befcb7f70c5685ab -Author: Lasse Collin -Date: 2008-01-04 20:45:05 +0200 - - Moved range decoder initialization (reading the first - five input bytes) from LZMA decoder to range decoder - header. Did the same for decoding of direct bits. - - src/liblzma/lzma/lzma_decoder.c | 42 +++------------- - src/liblzma/rangecoder/range_decoder.h | 87 +++++++++++++++++++++++----------- - 2 files changed, 66 insertions(+), 63 deletions(-) - -commit 5db745cd2a74f6ed2e52f5c716c08ed0daf17ebc -Author: Lasse Collin -Date: 2007-12-14 11:15:21 +0200 - - Added a note to README that --disable-assembler - must be used on Darwin. - - README | 4 ++++ - 1 file changed, 4 insertions(+) - -commit 44b333d4615b5aabc557a0e1b6bb0096da3fae24 -Author: Lasse Collin -Date: 2007-12-14 10:07:10 +0200 - - Use the filename suffix .S instead of .s for assembler files - so that the preprocessor removes the /* */ style comments, - which are not supported by some non-GNU assemblers (Solaris) - that otherwise work with this code. - - src/liblzma/check/Makefile.am | 4 ++-- - src/liblzma/check/{crc32_x86.s => crc32_x86.S} | 0 - src/liblzma/check/{crc64_x86.s => crc64_x86.S} | 0 - 3 files changed, 2 insertions(+), 2 deletions(-) - -commit ec1c82b2e82f395f6e8e19ac212a639644330cd7 -Author: Lasse Collin -Date: 2007-12-14 09:59:05 +0200 - - Fixed wrong symbol name in crc64_x86.s. - - src/liblzma/check/crc64_x86.s | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 2881570df6803eed2fe550af34574e8e61794804 -Author: Lasse Collin -Date: 2007-12-14 09:53:24 +0200 - - Use .globl instead of .global in x86 assembler code for - better portability. Still needs fixing the commenting. - - src/liblzma/check/crc32_x86.s | 2 +- - src/liblzma/check/crc64_x86.s | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 698470b8f33fc0e5f27dafa93b39b6dd5dde5a66 -Author: Lasse Collin -Date: 2007-12-13 20:14:37 +0200 - - Fixed a few short options that take an argument. - short_opts[] was missing colons to indicate - required argument. Thanks to Fabio Pedretti for - the bug report. - - src/lzma/args.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 918bcb0e0728d2d976621e9f35b56f224f11d989 -Author: Lasse Collin -Date: 2007-12-11 17:08:04 +0200 - - Removed uncompressed size tracking from Delta encoder too. - - src/liblzma/common/delta_coder.c | 21 +++------------------ - 1 file changed, 3 insertions(+), 18 deletions(-) - -commit 3e16d51dd645667b05ff826665b1fc353aa41cd9 -Author: Lasse Collin -Date: 2007-12-11 16:49:19 +0200 - - Remove uncompressed size tracking from the filter encoders. - It's not strictly needed there, and just complicates the - code. LZ encoder never even had this feature. - - The primary reason to have uncompressed size tracking in - filter encoders was validating that the application - doesn't give different amount of input that it had - promised. A side effect was to validate internal workings - of liblzma. - - Uncompressed size tracking is still present in the Block - encoder. Maybe it should be added to LZMA_Alone and raw - encoders too. It's simpler to have one coder just to - validate the uncompressed size instead of having it - in every filter. - - src/liblzma/common/copy_coder.c | 25 ++-------------------- - src/liblzma/simple/simple_coder.c | 29 ++++--------------------- - src/liblzma/subblock/subblock_encoder.c | 38 ++++++--------------------------- - 3 files changed, 12 insertions(+), 80 deletions(-) - -commit 5286723e0d1ac386d5b07f08d78e61becf895a5a -Author: Lasse Collin -Date: 2007-12-11 14:10:53 +0200 - - Get rid of no-NLS gnulib. I don't know how to get it - working with Automake. People who want smaller lzmadec - should use --disable-nls on non-GNU systems. - - lib/Makefile.am | 10 +--------- - src/lzma/Makefile.am | 2 +- - src/lzmadec/Makefile.am | 4 +++- - 3 files changed, 5 insertions(+), 11 deletions(-) - -commit ce8b036a6c7a43b290356b673d953f6d76b2be64 -Author: Lasse Collin -Date: 2007-12-11 14:09:35 +0200 - - Fixed a typo in tests/Makefile.am which prevented - building the tests if gnulib was needed. - - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit 7c1ad41eb611ed89e5bb8792a3beb533b7aa59f4 -Author: Lasse Collin -Date: 2007-12-11 11:18:58 +0200 - - Fixed wrong type of flags_size in Subblock encoder. - - src/liblzma/subblock/subblock_encoder.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -commit ce64df716243fdc40359090d1f6541f3a4f5f21a -Author: Lasse Collin -Date: 2007-12-10 20:44:16 +0200 - - Bumped version number to 4.42.3alpha. - - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit b499a0403ea5c41d6a25b40275eb6c57643052ce -Author: Lasse Collin -Date: 2007-12-10 15:02:50 +0200 - - Disabled some unneeded warnings and made "make dist" work. - - Makefile.am | 9 +++------ - configure.ac | 9 ++++++--- - po/fi.po | 47 ++++++++++++++++++++++++----------------------- - 3 files changed, 33 insertions(+), 32 deletions(-) - -commit 2ab8adb5165a0b77114a7eb21f9ff1e6a266f172 -Author: Lasse Collin -Date: 2007-12-09 21:43:15 +0200 - - Added LZMA_SYNC_FLUSH support to the Copy filter. - - src/liblzma/common/copy_coder.c | 92 +++++++++++++++++++++++++---------------- - 1 file changed, 57 insertions(+), 35 deletions(-) - -commit 329c272d501e88793dda5540358d55c12428d194 -Author: Lasse Collin -Date: 2007-12-09 17:14:07 +0200 - - Added missing LZMA_API to the C versions of the CRC functions. - The x86 assembler versions were already OK. - - src/liblzma/check/crc32.c | 2 +- - src/liblzma/check/crc64.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit c90daf86ce683fa8cf80491d624ffb158dfbd9d7 -Author: Jim Meyering -Date: 2007-12-09 15:34:25 +0100 - - * tests/test_block_header.c (test3): Remove duplicate initializer. - - autogen.sh | 2 +- - tests/test_block_header.c | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -commit 07ac881779a8477f2c1ab112b91a129e24aa743c -Author: Lasse Collin -Date: 2007-12-09 17:06:45 +0200 - - Take advantage of return_if_error() macro in more places. - Cleaned Subblock filter's initialization code too. - - src/liblzma/common/block_decoder.c | 22 +++------- - src/liblzma/common/delta_coder.c | 8 +--- - src/liblzma/common/stream_decoder.c | 17 +++----- - src/liblzma/common/stream_encoder_multi.c | 68 ++++++++++-------------------- - src/liblzma/common/stream_encoder_single.c | 8 ++-- - src/liblzma/subblock/subblock_decoder.c | 33 +++++---------- - src/liblzma/subblock/subblock_encoder.c | 45 ++++++-------------- - 7 files changed, 63 insertions(+), 138 deletions(-) - -commit 41338717964f510ee61d70b25bd4c502ec9f77cf -Author: Lasse Collin -Date: 2007-12-09 12:13:01 +0200 - - Added a bunch of .lzma test files. - - tests/files/bad-single-data_after_eopm.lzma | Bin 0 -> 55 bytes - tests/files/bad-single-data_after_eopm_2.lzma | Bin 0 -> 56 bytes - tests/files/bad-single-subblock_subblock.lzma | Bin 0 -> 26 bytes - tests/files/good-cat-single-none-pad.lzma | Bin 0 -> 64 bytes - tests/files/good-single-delta-lzma.tiff.lzma | Bin 0 -> 51409 bytes - tests/files/good-single-lzma.lzma | Bin 0 -> 44 bytes - tests/files/good-single-none-pad.lzma | Bin 0 -> 32 bytes - tests/files/good-single-none.lzma | Bin 0 -> 30 bytes - tests/files/good-single-subblock-lzma.lzma | Bin 0 -> 50 bytes - tests/files/good-single-subblock_rle.lzma | Bin 0 -> 118 bytes - tests/files/malicious-multi-metadata-64PiB.lzma | Bin 0 -> 51 bytes - tests/files/malicious-single-subblock-256MiB.lzma | Bin 0 -> 30 bytes - tests/files/malicious-single-subblock-64PiB.lzma | Bin 0 -> 45 bytes - tests/files/malicious-single-subblock-loop.lzma | Bin 0 -> 43 bytes - tests/files/malicious-single-subblock-lzma.lzma | Bin 0 -> 505 bytes - tests/files/malicious-single-subblock1023-slow.lzma | Bin 0 -> 7886 bytes - tests/files/malicious-single-subblock31-slow.lzma | Bin 0 -> 1233 bytes - 17 files changed, 0 insertions(+), 0 deletions(-) - -commit ff946ceb7975d4f11950afd33f6315b4d20d1a03 -Author: Lasse Collin -Date: 2007-12-09 11:24:48 +0200 - - Re-enabled the security checks in Subblock decoder - that were disabled for debugging reasons. - - src/liblzma/subblock/subblock_decoder.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -commit 2bf36d22d2c24ac3f488e63b35564fa2f6dab8d1 -Author: Lasse Collin -Date: 2007-12-09 11:03:28 +0200 - - Fixed the tests to build with -Werror. - - tests/test_block_header.c | 2 +- - tests/test_check.c | 2 +- - tests/test_filter_flags.c | 2 +- - tests/test_index.c | 14 +++++++------- - tests/test_info.c | 2 +- - tests/test_stream_flags.c | 2 +- - 6 files changed, 12 insertions(+), 12 deletions(-) - -commit 5d018dc03549c1ee4958364712fb0c94e1bf2741 -Author: Lasse Collin -Date: 2007-12-09 00:42:33 +0200 - - Imported to git. - - AUTHORS | 18 + - COPYING | 24 + - COPYING.GPLv2 | 339 +++++ - COPYING.GPLv3 | 674 +++++++++ - COPYING.LGPLv2.1 | 504 +++++++ - ChangeLog | 2 + - Doxyfile.in | 1229 ++++++++++++++++ - Makefile.am | 38 + - NEWS | 0 - README | 151 ++ - THANKS | 23 + - TODO | 109 ++ - autogen.sh | 38 + - configure.ac | 611 ++++++++ - doc/bugs.txt | 46 + - doc/faq.txt | 247 ++++ - doc/file-format.txt | 1861 ++++++++++++++++++++++++ - doc/history.txt | 140 ++ - doc/liblzma-advanced.txt | 324 +++++ - doc/liblzma-hacking.txt | 112 ++ - doc/liblzma-intro.txt | 188 +++ - doc/liblzma-security.txt | 219 +++ - doc/lzma-intro.txt | 107 ++ - extra/scanlzma/scanlzma.c | 85 ++ - lib/Makefile.am | 40 + - lib/getopt.c | 1191 +++++++++++++++ - lib/getopt1.c | 171 +++ - lib/getopt_.h | 226 +++ - lib/getopt_int.h | 131 ++ - lib/gettext.h | 240 +++ - m4/acx_pthread.m4 | 279 ++++ - m4/getopt.m4 | 83 ++ - po/LINGUAS | 1 + - po/Makevars | 46 + - po/POTFILES.in | 13 + - po/fi.po | 445 ++++++ - src/Makefile.am | 16 + - src/common/open_stdxxx.h | 50 + - src/common/physmem.h | 77 + - src/common/sysdefs.h | 100 ++ - src/liblzma/Makefile.am | 47 + - src/liblzma/api/Makefile.am | 39 + - src/liblzma/api/lzma.h | 122 ++ - src/liblzma/api/lzma/alignment.h | 60 + - src/liblzma/api/lzma/alone.h | 82 ++ - src/liblzma/api/lzma/auto.h | 41 + - src/liblzma/api/lzma/base.h | 410 ++++++ - src/liblzma/api/lzma/block.h | 409 ++++++ - src/liblzma/api/lzma/check.h | 128 ++ - src/liblzma/api/lzma/copy.h | 29 + - src/liblzma/api/lzma/delta.h | 49 + - src/liblzma/api/lzma/extra.h | 114 ++ - src/liblzma/api/lzma/filter.h | 166 +++ - src/liblzma/api/lzma/index.h | 84 ++ - src/liblzma/api/lzma/info.h | 315 ++++ - src/liblzma/api/lzma/init.h | 85 ++ - src/liblzma/api/lzma/lzma.h | 312 ++++ - src/liblzma/api/lzma/memlimit.h | 157 ++ - src/liblzma/api/lzma/metadata.h | 100 ++ - src/liblzma/api/lzma/raw.h | 72 + - src/liblzma/api/lzma/simple.h | 85 ++ - src/liblzma/api/lzma/stream.h | 178 +++ - src/liblzma/api/lzma/stream_flags.h | 142 ++ - src/liblzma/api/lzma/subblock.h | 197 +++ - src/liblzma/api/lzma/version.h | 59 + - src/liblzma/api/lzma/vli.h | 244 ++++ - src/liblzma/check/Makefile.am | 64 + - src/liblzma/check/check.c | 160 ++ - src/liblzma/check/check.h | 102 ++ - src/liblzma/check/check_byteswap.h | 43 + - src/liblzma/check/check_init.c | 37 + - src/liblzma/check/crc32.c | 88 ++ - src/liblzma/check/crc32_init.c | 58 + - src/liblzma/check/crc32_table.c | 22 + - src/liblzma/check/crc32_table_be.h | 527 +++++++ - src/liblzma/check/crc32_table_le.h | 527 +++++++ - src/liblzma/check/crc32_tablegen.c | 55 + - src/liblzma/check/crc32_x86.s | 217 +++ - src/liblzma/check/crc64.c | 75 + - src/liblzma/check/crc64_init.c | 58 + - src/liblzma/check/crc64_table.c | 22 + - src/liblzma/check/crc64_table_be.h | 523 +++++++ - src/liblzma/check/crc64_table_le.h | 523 +++++++ - src/liblzma/check/crc64_tablegen.c | 56 + - src/liblzma/check/crc64_x86.s | 203 +++ - src/liblzma/check/crc_macros.h | 33 + - src/liblzma/check/sha256.c | 203 +++ - src/liblzma/common/Makefile.am | 94 ++ - src/liblzma/common/alignment.c | 118 ++ - src/liblzma/common/allocator.c | 57 + - src/liblzma/common/alone_decoder.c | 197 +++ - src/liblzma/common/alone_decoder.h | 24 + - src/liblzma/common/alone_encoder.c | 167 +++ - src/liblzma/common/auto_decoder.c | 113 ++ - src/liblzma/common/block_decoder.c | 405 ++++++ - src/liblzma/common/block_decoder.h | 29 + - src/liblzma/common/block_encoder.c | 375 +++++ - src/liblzma/common/block_encoder.h | 29 + - src/liblzma/common/block_header_decoder.c | 373 +++++ - src/liblzma/common/block_header_encoder.c | 211 +++ - src/liblzma/common/block_private.h | 46 + - src/liblzma/common/chunk_size.c | 74 + - src/liblzma/common/code.c | 203 +++ - src/liblzma/common/common.h | 271 ++++ - src/liblzma/common/copy_coder.c | 143 ++ - src/liblzma/common/copy_coder.h | 31 + - src/liblzma/common/delta_coder.c | 210 +++ - src/liblzma/common/delta_coder.h | 31 + - src/liblzma/common/extra.c | 33 + - src/liblzma/common/features.c | 70 + - src/liblzma/common/filter_flags_decoder.c | 382 +++++ - src/liblzma/common/filter_flags_encoder.c | 359 +++++ - src/liblzma/common/index.c | 140 ++ - src/liblzma/common/info.c | 823 +++++++++++ - src/liblzma/common/init.c | 39 + - src/liblzma/common/init_decoder.c | 33 + - src/liblzma/common/init_encoder.c | 44 + - src/liblzma/common/memory_limitter.c | 200 +++ - src/liblzma/common/memory_usage.c | 113 ++ - src/liblzma/common/metadata_decoder.c | 555 +++++++ - src/liblzma/common/metadata_decoder.h | 31 + - src/liblzma/common/metadata_encoder.c | 436 ++++++ - src/liblzma/common/metadata_encoder.h | 30 + - src/liblzma/common/next_coder.c | 65 + - src/liblzma/common/raw_common.c | 175 +++ - src/liblzma/common/raw_common.h | 31 + - src/liblzma/common/raw_decoder.c | 127 ++ - src/liblzma/common/raw_decoder.h | 30 + - src/liblzma/common/raw_encoder.c | 124 ++ - src/liblzma/common/raw_encoder.h | 30 + - src/liblzma/common/stream_common.c | 23 + - src/liblzma/common/stream_common.h | 28 + - src/liblzma/common/stream_decoder.c | 454 ++++++ - src/liblzma/common/stream_encoder_multi.c | 460 ++++++ - src/liblzma/common/stream_encoder_single.c | 220 +++ - src/liblzma/common/stream_flags_decoder.c | 258 ++++ - src/liblzma/common/stream_flags_decoder.h | 31 + - src/liblzma/common/stream_flags_encoder.c | 75 + - src/liblzma/common/sysdefs.h | 1 + - src/liblzma/common/version.c | 25 + - src/liblzma/common/vli_decoder.c | 69 + - src/liblzma/common/vli_encoder.c | 81 ++ - src/liblzma/common/vli_reverse_decoder.c | 55 + - src/liblzma/lz/Makefile.am | 63 + - src/liblzma/lz/bt2.c | 27 + - src/liblzma/lz/bt2.h | 31 + - src/liblzma/lz/bt3.c | 29 + - src/liblzma/lz/bt3.h | 31 + - src/liblzma/lz/bt4.c | 30 + - src/liblzma/lz/bt4.h | 31 + - src/liblzma/lz/hc3.c | 30 + - src/liblzma/lz/hc3.h | 31 + - src/liblzma/lz/hc4.c | 31 + - src/liblzma/lz/hc4.h | 31 + - src/liblzma/lz/lz_decoder.c | 462 ++++++ - src/liblzma/lz/lz_decoder.h | 214 +++ - src/liblzma/lz/lz_encoder.c | 481 ++++++ - src/liblzma/lz/lz_encoder.h | 161 ++ - src/liblzma/lz/lz_encoder_private.h | 40 + - src/liblzma/lz/match_c.h | 401 +++++ - src/liblzma/lz/match_h.h | 69 + - src/liblzma/lzma.pc.in | 11 + - src/liblzma/lzma/Makefile.am | 43 + - src/liblzma/lzma/lzma_common.h | 128 ++ - src/liblzma/lzma/lzma_decoder.c | 844 +++++++++++ - src/liblzma/lzma/lzma_decoder.h | 41 + - src/liblzma/lzma/lzma_encoder.c | 413 ++++++ - src/liblzma/lzma/lzma_encoder.h | 35 + - src/liblzma/lzma/lzma_encoder_features.c | 59 + - src/liblzma/lzma/lzma_encoder_getoptimum.c | 893 ++++++++++++ - src/liblzma/lzma/lzma_encoder_getoptimumfast.c | 201 +++ - src/liblzma/lzma/lzma_encoder_init.c | 245 ++++ - src/liblzma/lzma/lzma_encoder_presets.c | 34 + - src/liblzma/lzma/lzma_encoder_private.h | 225 +++ - src/liblzma/lzma/lzma_literal.c | 74 + - src/liblzma/lzma/lzma_literal.h | 74 + - src/liblzma/rangecoder/Makefile.am | 28 + - src/liblzma/rangecoder/range_common.h | 68 + - src/liblzma/rangecoder/range_decoder.h | 189 +++ - src/liblzma/rangecoder/range_encoder.c | 46 + - src/liblzma/rangecoder/range_encoder.h | 317 ++++ - src/liblzma/simple/Makefile.am | 46 + - src/liblzma/simple/arm.c | 76 + - src/liblzma/simple/armthumb.c | 81 ++ - src/liblzma/simple/ia64.c | 117 ++ - src/liblzma/simple/powerpc.c | 80 + - src/liblzma/simple/simple_coder.c | 306 ++++ - src/liblzma/simple/simple_coder.h | 68 + - src/liblzma/simple/simple_private.h | 86 ++ - src/liblzma/simple/sparc.c | 88 ++ - src/liblzma/simple/x86.c | 161 ++ - src/liblzma/subblock/Makefile.am | 33 + - src/liblzma/subblock/subblock_decoder.c | 681 +++++++++ - src/liblzma/subblock/subblock_decoder.h | 29 + - src/liblzma/subblock/subblock_decoder_helper.c | 80 + - src/liblzma/subblock/subblock_decoder_helper.h | 36 + - src/liblzma/subblock/subblock_encoder.c | 841 +++++++++++ - src/liblzma/subblock/subblock_encoder.h | 28 + - src/lzma/Makefile.am | 63 + - src/lzma/alloc.c | 106 ++ - src/lzma/alloc.h | 42 + - src/lzma/args.c | 566 +++++++ - src/lzma/args.h | 64 + - src/lzma/error.c | 156 ++ - src/lzma/error.h | 67 + - src/lzma/hardware.c | 99 ++ - src/lzma/hardware.h | 31 + - src/lzma/help.c | 178 +++ - src/lzma/help.h | 32 + - src/lzma/io.c | 664 +++++++++ - src/lzma/io.h | 60 + - src/lzma/list.c | 477 ++++++ - src/lzma/main.c | 254 ++++ - src/lzma/options.c | 346 +++++ - src/lzma/options.h | 46 + - src/lzma/private.h | 55 + - src/lzma/process.c | 458 ++++++ - src/lzma/process.h | 30 + - src/lzma/suffix.c | 145 ++ - src/lzma/suffix.h | 25 + - src/lzma/util.c | 182 +++ - src/lzma/util.h | 32 + - src/lzmadec/Makefile.am | 27 + - src/lzmadec/lzmadec.c | 515 +++++++ - src/scripts/Makefile.am | 24 + - src/scripts/lzdiff | 67 + - src/scripts/lzdiff.1 | 51 + - src/scripts/lzgrep | 123 ++ - src/scripts/lzgrep.1 | 61 + - src/scripts/lzmore | 74 + - src/scripts/lzmore.1 | 55 + - tests/Makefile.am | 43 + - tests/test_block.c | 59 + - tests/test_block_header.c | 352 +++++ - tests/test_check.c | 90 ++ - tests/test_filter_flags.c | 326 +++++ - tests/test_index.c | 43 + - tests/test_info.c | 717 +++++++++ - tests/test_stream_flags.c | 191 +++ - tests/tests.h | 148 ++ - 240 files changed, 42513 insertions(+) Index: head/contrib/xz/README =================================================================== --- head/contrib/xz/README (revision 333782) +++ head/contrib/xz/README (revision 333783) @@ -1,308 +1,308 @@ XZ Utils ======== 0. Overview 1. Documentation 1.1. Overall documentation 1.2. Documentation for command-line tools 1.3. Documentation for liblzma 2. Version numbering 3. Reporting bugs 4. Translating the xz tool 5. Other implementations of the .xz format 6. Contact information 0. Overview ----------- XZ Utils provide a general-purpose data-compression library plus command-line tools. The native file format is the .xz format, but also the legacy .lzma format is supported. The .xz format supports multiple compression algorithms, which are called "filters" in the context of XZ Utils. The primary filter is currently LZMA2. With typical files, XZ Utils create about 30 % smaller files than gzip. To ease adapting support for the .xz format into existing applications and scripts, the API of liblzma is somewhat similar to the API of the popular zlib library. For the same reason, the command-line tool xz has a command-line syntax similar to that of gzip. When aiming for the highest compression ratio, the LZMA2 encoder uses a lot of CPU time and may use, depending on the settings, even hundreds of megabytes of RAM. However, in fast modes, the LZMA2 encoder competes with bzip2 in compression speed, RAM usage, and compression ratio. LZMA2 is reasonably fast to decompress. It is a little slower than gzip, but a lot faster than bzip2. Being fast to decompress means that the .xz format is especially nice when the same file will be decompressed very many times (usually on different computers), which is the case e.g. when distributing software packages. In such situations, it's not too bad if the compression takes some time, since that needs to be done only once to benefit many people. With some file types, combining (or "chaining") LZMA2 with an additional filter can improve the compression ratio. A filter chain may contain up to four filters, although usually only one or two are used. For example, putting a BCJ (Branch/Call/Jump) filter before LZMA2 in the filter chain can improve compression ratio of executable files. Since the .xz format allows adding new filter IDs, it is possible that some day there will be a filter that is, for example, much faster to compress than LZMA2 (but probably with worse compression ratio). Similarly, it is possible that some day there is a filter that will compress better than LZMA2. XZ Utils doesn't support multithreaded compression or decompression yet. It has been planned though and taken into account when designing the .xz file format. 1. Documentation ---------------- 1.1. Overall documentation README This file INSTALL.generic Generic install instructions for those not familiar with packages using GNU Autotools INSTALL Installation instructions specific to XZ Utils PACKAGERS Information to packagers of XZ Utils COPYING XZ Utils copyright and license information COPYING.GPLv2 GNU General Public License version 2 COPYING.GPLv3 GNU General Public License version 3 COPYING.LGPLv2.1 GNU Lesser General Public License version 2.1 AUTHORS The main authors of XZ Utils THANKS Incomplete list of people who have helped making this software NEWS User-visible changes between XZ Utils releases ChangeLog Detailed list of changes (commit log) TODO Known bugs and some sort of to-do list Note that only some of the above files are included in binary packages. 1.2. Documentation for command-line tools The command-line tools are documented as man pages. In source code releases (and possibly also in some binary packages), the man pages are also provided in plain text (ASCII only) and PDF formats in the directory "doc/man" to make the man pages more accessible to those whose operating system doesn't provide an easy way to view man pages. 1.3. Documentation for liblzma The liblzma API headers include short docs about each function and data type as Doxygen tags. These docs should be quite OK as a quick reference. I have planned to write a bunch of very well documented example programs, which (due to comments) should work as a tutorial to various features of liblzma. No such example programs have been written yet. For now, if you have never used liblzma, libbzip2, or zlib, I recommend learning the *basics* of the zlib API. Once you know that, it should be easier to learn liblzma. http://zlib.net/manual.html http://zlib.net/zlib_how.html 2. Version numbering -------------------- The version number format of XZ Utils is X.Y.ZS: - X is the major version. When this is incremented, the library API and ABI break. - Y is the minor version. It is incremented when new features are added without breaking the existing API or ABI. An even Y indicates a stable release and an odd Y indicates unstable (alpha or beta version). - Z is the revision. This has a different meaning for stable and unstable releases: * Stable: Z is incremented when bugs get fixed without adding any new features. This is intended to be convenient for downstream distributors that want bug fixes but don't want any new features to minimize the risk of introducing new bugs. * Unstable: Z is just a counter. API or ABI of features added in earlier unstable releases having the same X.Y may break. - S indicates stability of the release. It is missing from the stable releases, where Y is an even number. When Y is odd, S is either "alpha" or "beta" to make it very clear that such versions are not stable releases. The same X.Y.Z combination is not used for more than one stability level, i.e. after X.Y.Zalpha, the next version can be X.Y.(Z+1)beta but not X.Y.Zbeta. 3. Reporting bugs ----------------- Naturally it is easiest for me if you already know what causes the unexpected behavior. Even better if you have a patch to propose. However, quite often the reason for unexpected behavior is unknown, so here are a few things to do before sending a bug report: 1. Try to create a small example how to reproduce the issue. 2. Compile XZ Utils with debugging code using configure switches --enable-debug and, if possible, --disable-shared. If you are using GCC, use CFLAGS='-O0 -ggdb3'. Don't strip the resulting binaries. 3. Turn on core dumps. The exact command depends on your shell; for example in GNU bash it is done with "ulimit -c unlimited", and in tcsh with "limit coredumpsize unlimited". 4. Try to reproduce the suspected bug. If you get "assertion failed" message, be sure to include the complete message in your bug report. If the application leaves a coredump, get a backtrace using gdb: $ gdb /path/to/app-binary # Load the app to the debugger. (gdb) core core # Open the coredump. (gdb) bt # Print the backtrace. Copy & paste to bug report. (gdb) quit # Quit gdb. Report your bug via email or IRC (see Contact information below). Don't send core dump files or any executables. If you have a small example file(s) (total size less than 256 KiB), please include it/them as an attachment. If you have bigger test files, put them online somewhere and include a URL to the file(s) in the bug report. Always include the exact version number of XZ Utils in the bug report. If you are using a snapshot from the git repository, use "git describe" to get the exact snapshot version. If you are using XZ Utils shipped in an operating system distribution, mention the distribution name, distribution version, and exact xz package version; if you cannot repeat the bug with the code compiled from unpatched source code, you probably need to report a bug to your distribution's bug tracking system. 4. Translating the xz tool -------------------------- The messages from the xz tool have been translated into a few languages. Before starting to translate into a new language, ask the author whether someone else hasn't already started working on it. Test your translation. Testing includes comparing the translated output to the original English version by running the same commands in both your target locale and with LC_ALL=C. Ask someone to proof-read and test the translation. Testing can be done e.g. by installing xz into a temporary directory: ./configure --disable-shared --prefix=/tmp/xz-test # make -C po update-po make install bash debug/translation.bash | less bash debug/translation.bash | less -S # For --list outputs Repeat the above as needed (no need to re-run configure though). Note especially the following: - The output of --help and --long-help must look nice on an 80-column terminal. It's OK to add extra lines if needed. - In contrast, don't add extra lines to error messages and such. They are often preceded with e.g. a filename on the same line, so you have no way to predict where to put a \n. Let the terminal do the wrapping even if it looks ugly. Adding new lines will be even uglier in the generic case even if it looks nice in a few limited examples. - Be careful with column alignment in tables and table-like output (--list, --list --verbose --verbose, --info-memory, --help, and --long-help): * All descriptions of options in --help should start in the same column (but it doesn't need to be the same column as in the English messages; just be consistent if you change it). Check that both --help and --long-help look OK, since they share several strings. * --list --verbose and --info-memory print lines that have the format "Description: %s". If you need a longer description, you can put extra space between the colon and %s. Then you may need to add extra space to other strings too so that the result as a whole looks good (all values start at the same column). * The columns of the actual tables in --list --verbose --verbose should be aligned properly. Abbreviate if necessary. It might be good to keep at least 2 or 3 spaces between column headings and avoid spaces in the headings so that the columns stand out better, but this is a matter of opinion. Do what you think looks best. - Be careful to put a period at the end of a sentence when the original version has it, and don't put it when the original doesn't have it. Similarly, be careful with \n characters at the beginning and end of the strings. - Read the TRANSLATORS comments that have been extracted from the source code and included in xz.pot. If they suggest testing the translation with some type of command, do it. If testing needs input files, use e.g. tests/files/good-*.xz. - When updating the translation, read the fuzzy (modified) strings carefully, and don't mark them as updated before you actually have updated them. Reading through the unchanged messages can be good too; sometimes you may find a better wording for them. - If you find language problems in the original English strings, feel free to suggest improvements. Ask if something is unclear. - The translated messages should be understandable (sometimes this may be a problem with the original English messages too). Don't make a direct word-by-word translation from English especially if the result doesn't sound good in your language. In short, take your time and pay attention to the details. Making a good translation is not a quick and trivial thing to do. The translated xz should look as polished as the English version. 5. Other implementations of the .xz format ------------------------------------------ 7-Zip and the p7zip port of 7-Zip support the .xz format starting from the version 9.00alpha. http://7-zip.org/ http://p7zip.sourceforge.net/ XZ Embedded is a limited implementation written for use in the Linux kernel, but it is also suitable for other embedded use. - http://tukaani.org/xz/embedded.html + https://tukaani.org/xz/embedded.html 6. Contact information ---------------------- If you have questions, bug reports, patches etc. related to XZ Utils, contact Lasse Collin (in Finnish or English). I'm sometimes slow at replying. If you haven't got a reply within two weeks, assume that your email has got lost and resend it or use IRC. You can find me also from #tukaani on Freenode; my nick is Larhzu. The channel tends to be pretty quiet, so just ask your question and someone may wake up. Index: head/contrib/xz/THANKS =================================================================== --- head/contrib/xz/THANKS (revision 333782) +++ head/contrib/xz/THANKS (revision 333783) @@ -1,120 +1,124 @@ Thanks ====== Some people have helped more, some less, but nevertheless everyone's help has been important. :-) In alphabetical order: - Mark Adler - H. Peter Anvin - Jeff Bastian - Nelson H. F. Beebe - Karl Berry - Anders F. Björklund - Emmanuel Blot + - Melanie Blower - Martin Blumenstingl + - Ben Boeckel - Jakub Bogusz - Maarten Bosmans - Trent W. Buck - James Buren - David Burklund - Daniel Mealha Cabrita - Milo Casagrande - Marek Černocký - Tomer Chachamu - Gabi Davar - Chris Donawa - Andrew Dudman - Markus Duft - İsmail Dönmez - Robert Elz - Gilles Espinasse - Denis Excoffier - Michael Felt - Michael Fox - Mike Frysinger - Daniel Richard G. - Bill Glessner - Jason Gorski - Juan Manuel Guerrero - Diederik de Haas - Joachim Henke - Christian Hesse - Vincenzo Innocente - Peter Ivanov - Jouk Jansen - Jun I Jin - Per Øyvind Karlsen - Thomas Klausner - Richard Koch - Ville Koskinen - Jan Kratochvil - Christian Kujau - Stephan Kulow - Peter Lawler - James M Leddy - Hin-Tak Leung - Andraž 'ruskie' Levstik - Cary Lewis - Wim Lewis + - Eric Lindblad - Lorenzo De Liso - Bela Lubkin - Gregory Margo - Jim Meyering - Arkadiusz Miskiewicz - Conley Moorhous - Rafał Mużyło - Adrien Nader - Evan Nemerson - Hongbo Ni - Jonathan Nieder - Andre Noll - Peter O'Gorman - Peter Pallinger - Rui Paulo - Igor Pavlov - Diego Elio Pettenò - Elbert Pol - Mikko Pouru - Rich Prohaska - Trần Ngọc Quân - Pavel Raiskup - Ole André Vadla Ravnås - Robert Readman - Bernhard Reutner-Fischer - Eric S. Raymond - Cristian Rodríguez - Christian von Roques - Torsten Rupp - Jukka Salmi - Alexandre Sauvé - Benno Schulenberg - Andreas Schwab - Dan Shechter - Stuart Shelton - Sebastian Andrzej Siewior - Brad Smith + - Pippijn van Steenhoven - Jonathan Stott - Dan Stromberg - Vincent Torri - Paul Townsend - Mohammed Adnène Trojette - Alexey Tourbin - Patrick J. Volkerding - Martin Väth - Adam Walling - Christian Weisgerber - Bert Wesarg - Fredrik Wikstrom - Jim Wilcoxson - Ralf Wildenhues - Charles Wilson - Lars Wirzenius - Pilorz Wojciech - Ryan Young - Andreas Zieringer Also thanks to all the people who have participated in the Tukaani project. I have probably forgot to add some names to the above list. Sorry about that and thanks for your help. Index: head/contrib/xz/src/common/tuklib_integer.h =================================================================== --- head/contrib/xz/src/common/tuklib_integer.h (revision 333782) +++ head/contrib/xz/src/common/tuklib_integer.h (revision 333783) @@ -1,523 +1,534 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file tuklib_integer.h /// \brief Various integer and bit operations /// /// This file provides macros or functions to do some basic integer and bit /// operations. /// /// Endianness related integer operations (XX = 16, 32, or 64; Y = b or l): /// - Byte swapping: bswapXX(num) /// - Byte order conversions to/from native: convXXYe(num) /// - Aligned reads: readXXYe(ptr) /// - Aligned writes: writeXXYe(ptr, num) /// - Unaligned reads (16/32-bit only): unaligned_readXXYe(ptr) /// - Unaligned writes (16/32-bit only): unaligned_writeXXYe(ptr, num) /// /// Since they can macros, the arguments should have no side effects since /// they may be evaluated more than once. /// /// \todo PowerPC and possibly some other architectures support /// byte swapping load and store instructions. This file /// doesn't take advantage of those instructions. /// /// Bit scan operations for non-zero 32-bit integers: /// - Bit scan reverse (find highest non-zero bit): bsr32(num) /// - Count leading zeros: clz32(num) /// - Count trailing zeros: ctz32(num) /// - Bit scan forward (simply an alias for ctz32()): bsf32(num) /// /// The above bit scan operations return 0-31. If num is zero, /// the result is undefined. // // Authors: Lasse Collin // Joachim Henke // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #ifndef TUKLIB_INTEGER_H #define TUKLIB_INTEGER_H #include "tuklib_common.h" //////////////////////////////////////// // Operating system specific features // //////////////////////////////////////// #if defined(HAVE_BYTESWAP_H) // glibc, uClibc, dietlibc # include # ifdef HAVE_BSWAP_16 # define bswap16(num) bswap_16(num) # endif # ifdef HAVE_BSWAP_32 # define bswap32(num) bswap_32(num) # endif # ifdef HAVE_BSWAP_64 # define bswap64(num) bswap_64(num) # endif #elif defined(HAVE_SYS_ENDIAN_H) // *BSDs and Darwin # include #elif defined(HAVE_SYS_BYTEORDER_H) // Solaris # include # ifdef BSWAP_16 # define bswap16(num) BSWAP_16(num) # endif # ifdef BSWAP_32 # define bswap32(num) BSWAP_32(num) # endif # ifdef BSWAP_64 # define bswap64(num) BSWAP_64(num) # endif # ifdef BE_16 # define conv16be(num) BE_16(num) # endif # ifdef BE_32 # define conv32be(num) BE_32(num) # endif # ifdef BE_64 # define conv64be(num) BE_64(num) # endif # ifdef LE_16 # define conv16le(num) LE_16(num) # endif # ifdef LE_32 # define conv32le(num) LE_32(num) # endif # ifdef LE_64 # define conv64le(num) LE_64(num) # endif #endif +//////////////////////////////// +// Compiler-specific features // +//////////////////////////////// + +// Newer Intel C compilers require immintrin.h for _bit_scan_reverse() +// and such functions. +#if defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1500) +# include +#endif + + /////////////////// // Byte swapping // /////////////////// #ifndef bswap16 # define bswap16(num) \ (((uint16_t)(num) << 8) | ((uint16_t)(num) >> 8)) #endif #ifndef bswap32 # define bswap32(num) \ ( (((uint32_t)(num) << 24) ) \ | (((uint32_t)(num) << 8) & UINT32_C(0x00FF0000)) \ | (((uint32_t)(num) >> 8) & UINT32_C(0x0000FF00)) \ | (((uint32_t)(num) >> 24) ) ) #endif #ifndef bswap64 # define bswap64(num) \ ( (((uint64_t)(num) << 56) ) \ | (((uint64_t)(num) << 40) & UINT64_C(0x00FF000000000000)) \ | (((uint64_t)(num) << 24) & UINT64_C(0x0000FF0000000000)) \ | (((uint64_t)(num) << 8) & UINT64_C(0x000000FF00000000)) \ | (((uint64_t)(num) >> 8) & UINT64_C(0x00000000FF000000)) \ | (((uint64_t)(num) >> 24) & UINT64_C(0x0000000000FF0000)) \ | (((uint64_t)(num) >> 40) & UINT64_C(0x000000000000FF00)) \ | (((uint64_t)(num) >> 56) ) ) #endif // Define conversion macros using the basic byte swapping macros. #ifdef WORDS_BIGENDIAN # ifndef conv16be # define conv16be(num) ((uint16_t)(num)) # endif # ifndef conv32be # define conv32be(num) ((uint32_t)(num)) # endif # ifndef conv64be # define conv64be(num) ((uint64_t)(num)) # endif # ifndef conv16le # define conv16le(num) bswap16(num) # endif # ifndef conv32le # define conv32le(num) bswap32(num) # endif # ifndef conv64le # define conv64le(num) bswap64(num) # endif #else # ifndef conv16be # define conv16be(num) bswap16(num) # endif # ifndef conv32be # define conv32be(num) bswap32(num) # endif # ifndef conv64be # define conv64be(num) bswap64(num) # endif # ifndef conv16le # define conv16le(num) ((uint16_t)(num)) # endif # ifndef conv32le # define conv32le(num) ((uint32_t)(num)) # endif # ifndef conv64le # define conv64le(num) ((uint64_t)(num)) # endif #endif ////////////////////////////// // Aligned reads and writes // ////////////////////////////// static inline uint16_t read16be(const uint8_t *buf) { uint16_t num = *(const uint16_t *)buf; return conv16be(num); } static inline uint16_t read16le(const uint8_t *buf) { uint16_t num = *(const uint16_t *)buf; return conv16le(num); } static inline uint32_t read32be(const uint8_t *buf) { uint32_t num = *(const uint32_t *)buf; return conv32be(num); } static inline uint32_t read32le(const uint8_t *buf) { uint32_t num = *(const uint32_t *)buf; return conv32le(num); } static inline uint64_t read64be(const uint8_t *buf) { uint64_t num = *(const uint64_t *)buf; return conv64be(num); } static inline uint64_t read64le(const uint8_t *buf) { uint64_t num = *(const uint64_t *)buf; return conv64le(num); } // NOTE: Possible byte swapping must be done in a macro to allow GCC // to optimize byte swapping of constants when using glibc's or *BSD's // byte swapping macros. The actual write is done in an inline function // to make type checking of the buf pointer possible similarly to readXXYe() // functions. #define write16be(buf, num) write16ne((buf), conv16be(num)) #define write16le(buf, num) write16ne((buf), conv16le(num)) #define write32be(buf, num) write32ne((buf), conv32be(num)) #define write32le(buf, num) write32ne((buf), conv32le(num)) #define write64be(buf, num) write64ne((buf), conv64be(num)) #define write64le(buf, num) write64ne((buf), conv64le(num)) static inline void write16ne(uint8_t *buf, uint16_t num) { *(uint16_t *)buf = num; return; } static inline void write32ne(uint8_t *buf, uint32_t num) { *(uint32_t *)buf = num; return; } static inline void write64ne(uint8_t *buf, uint64_t num) { *(uint64_t *)buf = num; return; } //////////////////////////////// // Unaligned reads and writes // //////////////////////////////// // NOTE: TUKLIB_FAST_UNALIGNED_ACCESS indicates only support for 16-bit and // 32-bit unaligned integer loads and stores. It's possible that 64-bit // unaligned access doesn't work or is slower than byte-by-byte access. // Since unaligned 64-bit is probably not needed as often as 16-bit or // 32-bit, we simply don't support 64-bit unaligned access for now. #ifdef TUKLIB_FAST_UNALIGNED_ACCESS # define unaligned_read16be read16be # define unaligned_read16le read16le # define unaligned_read32be read32be # define unaligned_read32le read32le # define unaligned_write16be write16be # define unaligned_write16le write16le # define unaligned_write32be write32be # define unaligned_write32le write32le #else static inline uint16_t unaligned_read16be(const uint8_t *buf) { uint16_t num = ((uint16_t)buf[0] << 8) | (uint16_t)buf[1]; return num; } static inline uint16_t unaligned_read16le(const uint8_t *buf) { uint16_t num = ((uint16_t)buf[0]) | ((uint16_t)buf[1] << 8); return num; } static inline uint32_t unaligned_read32be(const uint8_t *buf) { uint32_t num = (uint32_t)buf[0] << 24; num |= (uint32_t)buf[1] << 16; num |= (uint32_t)buf[2] << 8; num |= (uint32_t)buf[3]; return num; } static inline uint32_t unaligned_read32le(const uint8_t *buf) { uint32_t num = (uint32_t)buf[0]; num |= (uint32_t)buf[1] << 8; num |= (uint32_t)buf[2] << 16; num |= (uint32_t)buf[3] << 24; return num; } static inline void unaligned_write16be(uint8_t *buf, uint16_t num) { buf[0] = (uint8_t)(num >> 8); buf[1] = (uint8_t)num; return; } static inline void unaligned_write16le(uint8_t *buf, uint16_t num) { buf[0] = (uint8_t)num; buf[1] = (uint8_t)(num >> 8); return; } static inline void unaligned_write32be(uint8_t *buf, uint32_t num) { buf[0] = (uint8_t)(num >> 24); buf[1] = (uint8_t)(num >> 16); buf[2] = (uint8_t)(num >> 8); buf[3] = (uint8_t)num; return; } static inline void unaligned_write32le(uint8_t *buf, uint32_t num) { buf[0] = (uint8_t)num; buf[1] = (uint8_t)(num >> 8); buf[2] = (uint8_t)(num >> 16); buf[3] = (uint8_t)(num >> 24); return; } #endif static inline uint32_t bsr32(uint32_t n) { // Check for ICC first, since it tends to define __GNUC__ too. #if defined(__INTEL_COMPILER) return _bit_scan_reverse(n); #elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX == UINT32_MAX // GCC >= 3.4 has __builtin_clz(), which gives good results on // multiple architectures. On x86, __builtin_clz() ^ 31U becomes // either plain BSR (so the XOR gets optimized away) or LZCNT and // XOR (if -march indicates that SSE4a instructions are supported). return __builtin_clz(n) ^ 31U; #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) uint32_t i; __asm__("bsrl %1, %0" : "=r" (i) : "rm" (n)); return i; #elif defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC isn't supported by tuklib, but since this code exists, // it doesn't hurt to have it here anyway. uint32_t i; _BitScanReverse((DWORD *)&i, n); return i; #else uint32_t i = 31; if ((n & UINT32_C(0xFFFF0000)) == 0) { n <<= 16; i = 15; } if ((n & UINT32_C(0xFF000000)) == 0) { n <<= 8; i -= 8; } if ((n & UINT32_C(0xF0000000)) == 0) { n <<= 4; i -= 4; } if ((n & UINT32_C(0xC0000000)) == 0) { n <<= 2; i -= 2; } if ((n & UINT32_C(0x80000000)) == 0) --i; return i; #endif } static inline uint32_t clz32(uint32_t n) { #if defined(__INTEL_COMPILER) return _bit_scan_reverse(n) ^ 31U; #elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX == UINT32_MAX return __builtin_clz(n); #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) uint32_t i; __asm__("bsrl %1, %0\n\t" "xorl $31, %0" : "=r" (i) : "rm" (n)); return i; #elif defined(_MSC_VER) && _MSC_VER >= 1400 uint32_t i; _BitScanReverse((DWORD *)&i, n); return i ^ 31U; #else uint32_t i = 0; if ((n & UINT32_C(0xFFFF0000)) == 0) { n <<= 16; i = 16; } if ((n & UINT32_C(0xFF000000)) == 0) { n <<= 8; i += 8; } if ((n & UINT32_C(0xF0000000)) == 0) { n <<= 4; i += 4; } if ((n & UINT32_C(0xC0000000)) == 0) { n <<= 2; i += 2; } if ((n & UINT32_C(0x80000000)) == 0) ++i; return i; #endif } static inline uint32_t ctz32(uint32_t n) { #if defined(__INTEL_COMPILER) return _bit_scan_forward(n); #elif TUKLIB_GNUC_REQ(3, 4) && UINT_MAX >= UINT32_MAX return __builtin_ctz(n); #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) uint32_t i; __asm__("bsfl %1, %0" : "=r" (i) : "rm" (n)); return i; #elif defined(_MSC_VER) && _MSC_VER >= 1400 uint32_t i; _BitScanForward((DWORD *)&i, n); return i; #else uint32_t i = 0; if ((n & UINT32_C(0x0000FFFF)) == 0) { n >>= 16; i = 16; } if ((n & UINT32_C(0x000000FF)) == 0) { n >>= 8; i += 8; } if ((n & UINT32_C(0x0000000F)) == 0) { n >>= 4; i += 4; } if ((n & UINT32_C(0x00000003)) == 0) { n >>= 2; i += 2; } if ((n & UINT32_C(0x00000001)) == 0) ++i; return i; #endif } #define bsf32 ctz32 #endif Index: head/contrib/xz/src/liblzma/api/lzma/base.h =================================================================== --- head/contrib/xz/src/liblzma/api/lzma/base.h (revision 333782) +++ head/contrib/xz/src/liblzma/api/lzma/base.h (revision 333783) @@ -1,654 +1,659 @@ /** * \file lzma/base.h * \brief Data types and functions used in many places in liblzma API */ /* * Author: Lasse Collin * * This file has been put into the public domain. * You can do whatever you want with this file. * * See ../lzma.h for information about liblzma as a whole. */ #ifndef LZMA_H_INTERNAL # error Never include this file directly. Use instead. #endif /** * \brief Boolean * * This is here because C89 doesn't have stdbool.h. To set a value for * variables having type lzma_bool, you can use * - C99's `true' and `false' from stdbool.h; * - C++'s internal `true' and `false'; or * - integers one (true) and zero (false). */ typedef unsigned char lzma_bool; /** * \brief Type of reserved enumeration variable in structures * * To avoid breaking library ABI when new features are added, several * structures contain extra variables that may be used in future. Since * sizeof(enum) can be different than sizeof(int), and sizeof(enum) may * even vary depending on the range of enumeration constants, we specify * a separate type to be used for reserved enumeration variables. All * enumeration constants in liblzma API will be non-negative and less * than 128, which should guarantee that the ABI won't break even when * new constants are added to existing enumerations. */ typedef enum { LZMA_RESERVED_ENUM = 0 } lzma_reserved_enum; /** * \brief Return values used by several functions in liblzma * * Check the descriptions of specific functions to find out which return * values they can return. With some functions the return values may have * more specific meanings than described here; those differences are * described per-function basis. */ typedef enum { LZMA_OK = 0, /**< * \brief Operation completed successfully */ LZMA_STREAM_END = 1, /**< * \brief End of stream was reached * * In encoder, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, or * LZMA_FINISH was finished. In decoder, this indicates * that all the data was successfully decoded. * * In all cases, when LZMA_STREAM_END is returned, the last * output bytes should be picked from strm->next_out. */ LZMA_NO_CHECK = 2, /**< * \brief Input stream has no integrity check * * This return value can be returned only if the * LZMA_TELL_NO_CHECK flag was used when initializing * the decoder. LZMA_NO_CHECK is just a warning, and * the decoding can be continued normally. * * It is possible to call lzma_get_check() immediately after * lzma_code has returned LZMA_NO_CHECK. The result will * naturally be LZMA_CHECK_NONE, but the possibility to call * lzma_get_check() may be convenient in some applications. */ LZMA_UNSUPPORTED_CHECK = 3, /**< * \brief Cannot calculate the integrity check * * The usage of this return value is different in encoders * and decoders. * * Encoders can return this value only from the initialization * function. If initialization fails with this value, the * encoding cannot be done, because there's no way to produce * output with the correct integrity check. * * Decoders can return this value only from lzma_code() and * only if the LZMA_TELL_UNSUPPORTED_CHECK flag was used when * initializing the decoder. The decoding can still be * continued normally even if the check type is unsupported, * but naturally the check will not be validated, and possible * errors may go undetected. * * With decoder, it is possible to call lzma_get_check() * immediately after lzma_code() has returned * LZMA_UNSUPPORTED_CHECK. This way it is possible to find * out what the unsupported Check ID was. */ LZMA_GET_CHECK = 4, /**< * \brief Integrity check type is now available * * This value can be returned only by the lzma_code() function * and only if the decoder was initialized with the * LZMA_TELL_ANY_CHECK flag. LZMA_GET_CHECK tells the * application that it may now call lzma_get_check() to find * out the Check ID. This can be used, for example, to * implement a decoder that accepts only files that have * strong enough integrity check. */ LZMA_MEM_ERROR = 5, /**< * \brief Cannot allocate memory * * Memory allocation failed, or the size of the allocation * would be greater than SIZE_MAX. * * Due to internal implementation reasons, the coding cannot * be continued even if more memory were made available after * LZMA_MEM_ERROR. */ LZMA_MEMLIMIT_ERROR = 6, /** * \brief Memory usage limit was reached * * Decoder would need more memory than allowed by the * specified memory usage limit. To continue decoding, * the memory usage limit has to be increased with * lzma_memlimit_set(). */ LZMA_FORMAT_ERROR = 7, /**< * \brief File format not recognized * * The decoder did not recognize the input as supported file * format. This error can occur, for example, when trying to * decode .lzma format file with lzma_stream_decoder, * because lzma_stream_decoder accepts only the .xz format. */ LZMA_OPTIONS_ERROR = 8, /**< * \brief Invalid or unsupported options * * Invalid or unsupported options, for example * - unsupported filter(s) or filter options; or * - reserved bits set in headers (decoder only). * * Rebuilding liblzma with more features enabled, or * upgrading to a newer version of liblzma may help. */ LZMA_DATA_ERROR = 9, /**< * \brief Data is corrupt * * The usage of this return value is different in encoders * and decoders. In both encoder and decoder, the coding * cannot continue after this error. * * Encoders return this if size limits of the target file * format would be exceeded. These limits are huge, thus * getting this error from an encoder is mostly theoretical. * For example, the maximum compressed and uncompressed * size of a .xz Stream is roughly 8 EiB (2^63 bytes). * * Decoders return this error if the input data is corrupt. * This can mean, for example, invalid CRC32 in headers * or invalid check of uncompressed data. */ LZMA_BUF_ERROR = 10, /**< * \brief No progress is possible * * This error code is returned when the coder cannot consume * any new input and produce any new output. The most common * reason for this error is that the input stream being * decoded is truncated or corrupt. * * This error is not fatal. Coding can be continued normally * by providing more input and/or more output space, if * possible. * * Typically the first call to lzma_code() that can do no * progress returns LZMA_OK instead of LZMA_BUF_ERROR. Only * the second consecutive call doing no progress will return * LZMA_BUF_ERROR. This is intentional. * * With zlib, Z_BUF_ERROR may be returned even if the * application is doing nothing wrong, so apps will need * to handle Z_BUF_ERROR specially. The above hack * guarantees that liblzma never returns LZMA_BUF_ERROR * to properly written applications unless the input file * is truncated or corrupt. This should simplify the * applications a little. */ LZMA_PROG_ERROR = 11, /**< * \brief Programming error * * This indicates that the arguments given to the function are * invalid or the internal state of the decoder is corrupt. * - Function arguments are invalid or the structures * pointed by the argument pointers are invalid * e.g. if strm->next_out has been set to NULL and * strm->avail_out > 0 when calling lzma_code(). * - lzma_* functions have been called in wrong order * e.g. lzma_code() was called right after lzma_end(). * - If errors occur randomly, the reason might be flaky * hardware. * * If you think that your code is correct, this error code * can be a sign of a bug in liblzma. See the documentation * how to report bugs. */ } lzma_ret; /** * \brief The `action' argument for lzma_code() * * After the first use of LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, LZMA_FULL_BARRIER, * or LZMA_FINISH, the same `action' must is used until lzma_code() returns * LZMA_STREAM_END. Also, the amount of input (that is, strm->avail_in) must * not be modified by the application until lzma_code() returns * LZMA_STREAM_END. Changing the `action' or modifying the amount of input * will make lzma_code() return LZMA_PROG_ERROR. */ typedef enum { LZMA_RUN = 0, /**< * \brief Continue coding * * Encoder: Encode as much input as possible. Some internal * buffering will probably be done (depends on the filter * chain in use), which causes latency: the input used won't * usually be decodeable from the output of the same * lzma_code() call. * * Decoder: Decode as much input as possible and produce as * much output as possible. */ LZMA_SYNC_FLUSH = 1, /**< * \brief Make all the input available at output * * Normally the encoder introduces some latency. * LZMA_SYNC_FLUSH forces all the buffered data to be * available at output without resetting the internal * state of the encoder. This way it is possible to use * compressed stream for example for communication over * network. * * Only some filters support LZMA_SYNC_FLUSH. Trying to use * LZMA_SYNC_FLUSH with filters that don't support it will * make lzma_code() return LZMA_OPTIONS_ERROR. For example, * LZMA1 doesn't support LZMA_SYNC_FLUSH but LZMA2 does. * * Using LZMA_SYNC_FLUSH very often can dramatically reduce * the compression ratio. With some filters (for example, * LZMA2), fine-tuning the compression options may help * mitigate this problem significantly (for example, * match finder with LZMA2). * * Decoders don't support LZMA_SYNC_FLUSH. */ LZMA_FULL_FLUSH = 2, /**< * \brief Finish encoding of the current Block * * All the input data going to the current Block must have * been given to the encoder (the last bytes can still be * pending in *next_in). Call lzma_code() with LZMA_FULL_FLUSH * until it returns LZMA_STREAM_END. Then continue normally * with LZMA_RUN or finish the Stream with LZMA_FINISH. * * This action is currently supported only by Stream encoder * and easy encoder (which uses Stream encoder). If there is * no unfinished Block, no empty Block is created. */ LZMA_FULL_BARRIER = 4, /**< * \brief Finish encoding of the current Block * * This is like LZMA_FULL_FLUSH except that this doesn't * necessarily wait until all the input has been made * available via the output buffer. That is, lzma_code() * might return LZMA_STREAM_END as soon as all the input * has been consumed (avail_in == 0). * * LZMA_FULL_BARRIER is useful with a threaded encoder if * one wants to split the .xz Stream into Blocks at specific * offsets but doesn't care if the output isn't flushed * immediately. Using LZMA_FULL_BARRIER allows keeping * the threads busy while LZMA_FULL_FLUSH would make * lzma_code() wait until all the threads have finished * until more data could be passed to the encoder. * * With a lzma_stream initialized with the single-threaded * lzma_stream_encoder() or lzma_easy_encoder(), * LZMA_FULL_BARRIER is an alias for LZMA_FULL_FLUSH. */ LZMA_FINISH = 3 /**< * \brief Finish the coding operation * * All the input data must have been given to the encoder * (the last bytes can still be pending in next_in). * Call lzma_code() with LZMA_FINISH until it returns * LZMA_STREAM_END. Once LZMA_FINISH has been used, * the amount of input must no longer be changed by * the application. * * When decoding, using LZMA_FINISH is optional unless the * LZMA_CONCATENATED flag was used when the decoder was * initialized. When LZMA_CONCATENATED was not used, the only * effect of LZMA_FINISH is that the amount of input must not * be changed just like in the encoder. */ } lzma_action; /** * \brief Custom functions for memory handling * * A pointer to lzma_allocator may be passed via lzma_stream structure * to liblzma, and some advanced functions take a pointer to lzma_allocator * as a separate function argument. The library will use the functions * specified in lzma_allocator for memory handling instead of the default * malloc() and free(). C++ users should note that the custom memory * handling functions must not throw exceptions. * * Single-threaded mode only: liblzma doesn't make an internal copy of * lzma_allocator. Thus, it is OK to change these function pointers in * the middle of the coding process, but obviously it must be done * carefully to make sure that the replacement `free' can deallocate * memory allocated by the earlier `alloc' function(s). * * Multithreaded mode: liblzma might internally store pointers to the * lzma_allocator given via the lzma_stream structure. The application * must not change the allocator pointer in lzma_stream or the contents * of the pointed lzma_allocator structure until lzma_end() has been used * to free the memory associated with that lzma_stream. The allocation * functions might be called simultaneously from multiple threads, and * thus they must be thread safe. */ typedef struct { /** * \brief Pointer to a custom memory allocation function * * If you don't want a custom allocator, but still want * custom free(), set this to NULL and liblzma will use * the standard malloc(). * * \param opaque lzma_allocator.opaque (see below) * \param nmemb Number of elements like in calloc(). liblzma * will always set nmemb to 1, so it is safe to * ignore nmemb in a custom allocator if you like. * The nmemb argument exists only for * compatibility with zlib and libbzip2. * \param size Size of an element in bytes. * liblzma never sets this to zero. * * \return Pointer to the beginning of a memory block of * `size' bytes, or NULL if allocation fails * for some reason. When allocation fails, functions * of liblzma return LZMA_MEM_ERROR. * * The allocator should not waste time zeroing the allocated buffers. * This is not only about speed, but also memory usage, since the * operating system kernel doesn't necessarily allocate the requested * memory in physical memory until it is actually used. With small * input files, liblzma may actually need only a fraction of the * memory that it requested for allocation. * * \note LZMA_MEM_ERROR is also used when the size of the * allocation would be greater than SIZE_MAX. Thus, * don't assume that the custom allocator must have * returned NULL if some function from liblzma * returns LZMA_MEM_ERROR. */ void *(LZMA_API_CALL *alloc)(void *opaque, size_t nmemb, size_t size); /** * \brief Pointer to a custom memory freeing function * * If you don't want a custom freeing function, but still * want a custom allocator, set this to NULL and liblzma * will use the standard free(). * * \param opaque lzma_allocator.opaque (see below) * \param ptr Pointer returned by lzma_allocator.alloc(), * or when it is set to NULL, a pointer returned * by the standard malloc(). */ void (LZMA_API_CALL *free)(void *opaque, void *ptr); /** * \brief Pointer passed to .alloc() and .free() * * opaque is passed as the first argument to lzma_allocator.alloc() * and lzma_allocator.free(). This intended to ease implementing * custom memory allocation functions for use with liblzma. * * If you don't need this, you should set this to NULL. */ void *opaque; } lzma_allocator; /** * \brief Internal data structure * * The contents of this structure is not visible outside the library. */ typedef struct lzma_internal_s lzma_internal; /** * \brief Passing data to and from liblzma * * The lzma_stream structure is used for * - passing pointers to input and output buffers to liblzma; * - defining custom memory hander functions; and * - holding a pointer to coder-specific internal data structures. * * Typical usage: * * - After allocating lzma_stream (on stack or with malloc()), it must be * initialized to LZMA_STREAM_INIT (see LZMA_STREAM_INIT for details). * * - Initialize a coder to the lzma_stream, for example by using * lzma_easy_encoder() or lzma_auto_decoder(). Some notes: * - In contrast to zlib, strm->next_in and strm->next_out are * ignored by all initialization functions, thus it is safe * to not initialize them yet. * - The initialization functions always set strm->total_in and * strm->total_out to zero. * - If the initialization function fails, no memory is left allocated * that would require freeing with lzma_end() even if some memory was * associated with the lzma_stream structure when the initialization * function was called. * * - Use lzma_code() to do the actual work. * * - Once the coding has been finished, the existing lzma_stream can be * reused. It is OK to reuse lzma_stream with different initialization * function without calling lzma_end() first. Old allocations are * automatically freed. * * - Finally, use lzma_end() to free the allocated memory. lzma_end() never * frees the lzma_stream structure itself. * * Application may modify the values of total_in and total_out as it wants. * They are updated by liblzma to match the amount of data read and * written but aren't used for anything else except as a possible return * values from lzma_get_progress(). */ typedef struct { const uint8_t *next_in; /**< Pointer to the next input byte. */ size_t avail_in; /**< Number of available input bytes in next_in. */ uint64_t total_in; /**< Total number of bytes read by liblzma. */ uint8_t *next_out; /**< Pointer to the next output position. */ size_t avail_out; /**< Amount of free space in next_out. */ uint64_t total_out; /**< Total number of bytes written by liblzma. */ /** * \brief Custom memory allocation functions * * In most cases this is NULL which makes liblzma use * the standard malloc() and free(). * * \note In 5.0.x this is not a const pointer. */ const lzma_allocator *allocator; /** Internal state is not visible to applications. */ lzma_internal *internal; /* * Reserved space to allow possible future extensions without * breaking the ABI. Excluding the initialization of this structure, * you should not touch these, because the names of these variables * may change. */ void *reserved_ptr1; void *reserved_ptr2; void *reserved_ptr3; void *reserved_ptr4; uint64_t reserved_int1; uint64_t reserved_int2; size_t reserved_int3; size_t reserved_int4; lzma_reserved_enum reserved_enum1; lzma_reserved_enum reserved_enum2; } lzma_stream; /** * \brief Initialization for lzma_stream * * When you declare an instance of lzma_stream, you can immediately * initialize it so that initialization functions know that no memory * has been allocated yet: * * lzma_stream strm = LZMA_STREAM_INIT; * * If you need to initialize a dynamically allocated lzma_stream, you can use * memset(strm_pointer, 0, sizeof(lzma_stream)). Strictly speaking, this * violates the C standard since NULL may have different internal * representation than zero, but it should be portable enough in practice. * Anyway, for maximum portability, you can use something like this: * * lzma_stream tmp = LZMA_STREAM_INIT; * *strm = tmp; */ #define LZMA_STREAM_INIT \ { NULL, 0, 0, NULL, 0, 0, NULL, NULL, \ NULL, NULL, NULL, NULL, 0, 0, 0, 0, \ LZMA_RESERVED_ENUM, LZMA_RESERVED_ENUM } /** * \brief Encode or decode data * * Once the lzma_stream has been successfully initialized (e.g. with * lzma_stream_encoder()), the actual encoding or decoding is done * using this function. The application has to update strm->next_in, * strm->avail_in, strm->next_out, and strm->avail_out to pass input * to and get output from liblzma. * * See the description of the coder-specific initialization function to find * out what `action' values are supported by the coder. */ extern LZMA_API(lzma_ret) lzma_code(lzma_stream *strm, lzma_action action) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Free memory allocated for the coder data structures * * \param strm Pointer to lzma_stream that is at least initialized * with LZMA_STREAM_INIT. * * After lzma_end(strm), strm->internal is guaranteed to be NULL. No other * members of the lzma_stream structure are touched. * * \note zlib indicates an error if application end()s unfinished * stream structure. liblzma doesn't do this, and assumes that * application knows what it is doing. */ extern LZMA_API(void) lzma_end(lzma_stream *strm) lzma_nothrow; /** * \brief Get progress information * * In single-threaded mode, applications can get progress information from * strm->total_in and strm->total_out. In multi-threaded mode this is less * useful because a significant amount of both input and output data gets * buffered internally by liblzma. This makes total_in and total_out give * misleading information and also makes the progress indicator updates * non-smooth. * * This function gives realistic progress information also in multi-threaded * mode by taking into account the progress made by each thread. In * single-threaded mode *progress_in and *progress_out are set to * strm->total_in and strm->total_out, respectively. */ extern LZMA_API(void) lzma_get_progress(lzma_stream *strm, uint64_t *progress_in, uint64_t *progress_out) lzma_nothrow; /** * \brief Get the memory usage of decoder filter chain * * This function is currently supported only when *strm has been initialized * with a function that takes a memlimit argument. With other functions, you * should use e.g. lzma_raw_encoder_memusage() or lzma_raw_decoder_memusage() * to estimate the memory requirements. * * This function is useful e.g. after LZMA_MEMLIMIT_ERROR to find out how big * the memory usage limit should have been to decode the input. Note that * this may give misleading information if decoding .xz Streams that have * multiple Blocks, because each Block can have different memory requirements. * * \return How much memory is currently allocated for the filter * decoders. If no filter chain is currently allocated, * some non-zero value is still returned, which is less than * or equal to what any filter chain would indicate as its * memory requirement. * * If this function isn't supported by *strm or some other error * occurs, zero is returned. */ extern LZMA_API(uint64_t) lzma_memusage(const lzma_stream *strm) lzma_nothrow lzma_attr_pure; /** * \brief Get the current memory usage limit * * This function is supported only when *strm has been initialized with * a function that takes a memlimit argument. * * \return On success, the current memory usage limit is returned * (always non-zero). On error, zero is returned. */ extern LZMA_API(uint64_t) lzma_memlimit_get(const lzma_stream *strm) lzma_nothrow lzma_attr_pure; /** * \brief Set the memory usage limit * * This function is supported only when *strm has been initialized with * a function that takes a memlimit argument. * + * liblzma 5.2.3 and earlier has a bug where memlimit value of 0 causes + * this function to do nothing (leaving the limit unchanged) and still + * return LZMA_OK. Later versions treat 0 as if 1 had been specified (so + * lzma_memlimit_get() will return 1 even if you specify 0 here). + * * \return - LZMA_OK: New memory usage limit successfully set. * - LZMA_MEMLIMIT_ERROR: The new limit is too small. * The limit was not changed. * - LZMA_PROG_ERROR: Invalid arguments, e.g. *strm doesn't - * support memory usage limit or memlimit was zero. + * support memory usage limit. */ extern LZMA_API(lzma_ret) lzma_memlimit_set( lzma_stream *strm, uint64_t memlimit) lzma_nothrow; Index: head/contrib/xz/src/liblzma/api/lzma/container.h =================================================================== --- head/contrib/xz/src/liblzma/api/lzma/container.h (revision 333782) +++ head/contrib/xz/src/liblzma/api/lzma/container.h (revision 333783) @@ -1,619 +1,632 @@ /** * \file lzma/container.h * \brief File formats */ /* * Author: Lasse Collin * * This file has been put into the public domain. * You can do whatever you want with this file. * * See ../lzma.h for information about liblzma as a whole. */ #ifndef LZMA_H_INTERNAL # error Never include this file directly. Use instead. #endif /************ * Encoding * ************/ /** * \brief Default compression preset * * It's not straightforward to recommend a default preset, because in some * cases keeping the resource usage relatively low is more important that * getting the maximum compression ratio. */ #define LZMA_PRESET_DEFAULT UINT32_C(6) /** * \brief Mask for preset level * * This is useful only if you need to extract the level from the preset * variable. That should be rare. */ #define LZMA_PRESET_LEVEL_MASK UINT32_C(0x1F) /* * Preset flags * * Currently only one flag is defined. */ /** * \brief Extreme compression preset * * This flag modifies the preset to make the encoding significantly slower * while improving the compression ratio only marginally. This is useful * when you don't mind wasting time to get as small result as possible. * * This flag doesn't affect the memory usage requirements of the decoder (at * least not significantly). The memory usage of the encoder may be increased * a little but only at the lowest preset levels (0-3). */ #define LZMA_PRESET_EXTREME (UINT32_C(1) << 31) /** * \brief Multithreading options */ typedef struct { /** * \brief Flags * * Set this to zero if no flags are wanted. * * No flags are currently supported. */ uint32_t flags; /** * \brief Number of worker threads to use */ uint32_t threads; /** * \brief Maximum uncompressed size of a Block * * The encoder will start a new .xz Block every block_size bytes. * Using LZMA_FULL_FLUSH or LZMA_FULL_BARRIER with lzma_code() * the caller may tell liblzma to start a new Block earlier. * * With LZMA2, a recommended block size is 2-4 times the LZMA2 * dictionary size. With very small dictionaries, it is recommended * to use at least 1 MiB block size for good compression ratio, even * if this is more than four times the dictionary size. Note that * these are only recommendations for typical use cases; feel free * to use other values. Just keep in mind that using a block size * less than the LZMA2 dictionary size is waste of RAM. * * Set this to 0 to let liblzma choose the block size depending * on the compression options. For LZMA2 it will be 3*dict_size * or 1 MiB, whichever is more. * * For each thread, about 3 * block_size bytes of memory will be * allocated. This may change in later liblzma versions. If so, * the memory usage will probably be reduced, not increased. */ uint64_t block_size; /** * \brief Timeout to allow lzma_code() to return early * * Multithreading can make liblzma to consume input and produce * output in a very bursty way: it may first read a lot of input * to fill internal buffers, then no input or output occurs for * a while. * * In single-threaded mode, lzma_code() won't return until it has * either consumed all the input or filled the output buffer. If * this is done in multithreaded mode, it may cause a call * lzma_code() to take even tens of seconds, which isn't acceptable * in all applications. * * To avoid very long blocking times in lzma_code(), a timeout * (in milliseconds) may be set here. If lzma_code() would block * longer than this number of milliseconds, it will return with * LZMA_OK. Reasonable values are 100 ms or more. The xz command * line tool uses 300 ms. * * If long blocking times are fine for you, set timeout to a special * value of 0, which will disable the timeout mechanism and will make * lzma_code() block until all the input is consumed or the output * buffer has been filled. * * \note Even with a timeout, lzma_code() might sometimes take * somewhat long time to return. No timing guarantees * are made. */ uint32_t timeout; /** * \brief Compression preset (level and possible flags) * * The preset is set just like with lzma_easy_encoder(). * The preset is ignored if filters below is non-NULL. */ uint32_t preset; /** * \brief Filter chain (alternative to a preset) * * If this is NULL, the preset above is used. Otherwise the preset * is ignored and the filter chain specified here is used. */ const lzma_filter *filters; /** * \brief Integrity check type * * See check.h for available checks. The xz command line tool * defaults to LZMA_CHECK_CRC64, which is a good choice if you * are unsure. */ lzma_check check; /* * Reserved space to allow possible future extensions without * breaking the ABI. You should not touch these, because the names * of these variables may change. These are and will never be used * with the currently supported options, so it is safe to leave these * uninitialized. */ lzma_reserved_enum reserved_enum1; lzma_reserved_enum reserved_enum2; lzma_reserved_enum reserved_enum3; uint32_t reserved_int1; uint32_t reserved_int2; uint32_t reserved_int3; uint32_t reserved_int4; uint64_t reserved_int5; uint64_t reserved_int6; uint64_t reserved_int7; uint64_t reserved_int8; void *reserved_ptr1; void *reserved_ptr2; void *reserved_ptr3; void *reserved_ptr4; } lzma_mt; /** * \brief Calculate approximate memory usage of easy encoder * * This function is a wrapper for lzma_raw_encoder_memusage(). * * \param preset Compression preset (level and possible flags) * * \return Number of bytes of memory required for the given * preset when encoding. If an error occurs, for example * due to unsupported preset, UINT64_MAX is returned. */ extern LZMA_API(uint64_t) lzma_easy_encoder_memusage(uint32_t preset) lzma_nothrow lzma_attr_pure; /** * \brief Calculate approximate decoder memory usage of a preset * * This function is a wrapper for lzma_raw_decoder_memusage(). * * \param preset Compression preset (level and possible flags) * * \return Number of bytes of memory required to decompress a file * that was compressed using the given preset. If an error * occurs, for example due to unsupported preset, UINT64_MAX * is returned. */ extern LZMA_API(uint64_t) lzma_easy_decoder_memusage(uint32_t preset) lzma_nothrow lzma_attr_pure; /** * \brief Initialize .xz Stream encoder using a preset number * * This function is intended for those who just want to use the basic features * if liblzma (that is, most developers out there). * * \param strm Pointer to lzma_stream that is at least initialized * with LZMA_STREAM_INIT. * \param preset Compression preset to use. A preset consist of level * number and zero or more flags. Usually flags aren't * used, so preset is simply a number [0, 9] which match * the options -0 ... -9 of the xz command line tool. * Additional flags can be be set using bitwise-or with * the preset level number, e.g. 6 | LZMA_PRESET_EXTREME. * \param check Integrity check type to use. See check.h for available * checks. The xz command line tool defaults to * LZMA_CHECK_CRC64, which is a good choice if you are * unsure. LZMA_CHECK_CRC32 is good too as long as the * uncompressed file is not many gigabytes. * * \return - LZMA_OK: Initialization succeeded. Use lzma_code() to * encode your data. * - LZMA_MEM_ERROR: Memory allocation failed. * - LZMA_OPTIONS_ERROR: The given compression preset is not * supported by this build of liblzma. * - LZMA_UNSUPPORTED_CHECK: The given check type is not * supported by this liblzma build. * - LZMA_PROG_ERROR: One or more of the parameters have values * that will never be valid. For example, strm == NULL. * * If initialization fails (return value is not LZMA_OK), all the memory * allocated for *strm by liblzma is always freed. Thus, there is no need * to call lzma_end() after failed initialization. * * If initialization succeeds, use lzma_code() to do the actual encoding. * Valid values for `action' (the second argument of lzma_code()) are * LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future, * there may be compression levels or flags that don't support LZMA_SYNC_FLUSH. */ extern LZMA_API(lzma_ret) lzma_easy_encoder( lzma_stream *strm, uint32_t preset, lzma_check check) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Single-call .xz Stream encoding using a preset number * * The maximum required output buffer size can be calculated with * lzma_stream_buffer_bound(). * * \param preset Compression preset to use. See the description * in lzma_easy_encoder(). * \param check Type of the integrity check to calculate from * uncompressed data. * \param allocator lzma_allocator for custom allocator functions. * Set to NULL to use malloc() and free(). * \param in Beginning of the input buffer * \param in_size Size of the input buffer * \param out Beginning of the output buffer * \param out_pos The next byte will be written to out[*out_pos]. * *out_pos is updated only if encoding succeeds. * \param out_size Size of the out buffer; the first byte into * which no data is written to is out[out_size]. * * \return - LZMA_OK: Encoding was successful. * - LZMA_BUF_ERROR: Not enough output buffer space. * - LZMA_UNSUPPORTED_CHECK * - LZMA_OPTIONS_ERROR * - LZMA_MEM_ERROR * - LZMA_DATA_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_easy_buffer_encode( uint32_t preset, lzma_check check, const lzma_allocator *allocator, const uint8_t *in, size_t in_size, uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow; /** * \brief Initialize .xz Stream encoder using a custom filter chain * * \param strm Pointer to properly prepared lzma_stream * \param filters Array of filters. This must be terminated with * filters[n].id = LZMA_VLI_UNKNOWN. See filter.h for * more information. * \param check Type of the integrity check to calculate from * uncompressed data. * * \return - LZMA_OK: Initialization was successful. * - LZMA_MEM_ERROR * - LZMA_UNSUPPORTED_CHECK * - LZMA_OPTIONS_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_stream_encoder(lzma_stream *strm, const lzma_filter *filters, lzma_check check) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Calculate approximate memory usage of multithreaded .xz encoder * * Since doing the encoding in threaded mode doesn't affect the memory * requirements of single-threaded decompressor, you can use * lzma_easy_decoder_memusage(options->preset) or * lzma_raw_decoder_memusage(options->filters) to calculate * the decompressor memory requirements. * * \param options Compression options * * \return Number of bytes of memory required for encoding with the * given options. If an error occurs, for example due to * unsupported preset or filter chain, UINT64_MAX is returned. */ extern LZMA_API(uint64_t) lzma_stream_encoder_mt_memusage( const lzma_mt *options) lzma_nothrow lzma_attr_pure; /** * \brief Initialize multithreaded .xz Stream encoder * * This provides the functionality of lzma_easy_encoder() and * lzma_stream_encoder() as a single function for multithreaded use. * * The supported actions for lzma_code() are LZMA_RUN, LZMA_FULL_FLUSH, * LZMA_FULL_BARRIER, and LZMA_FINISH. Support for LZMA_SYNC_FLUSH might be * added in the future. * * \param strm Pointer to properly prepared lzma_stream * \param options Pointer to multithreaded compression options * * \return - LZMA_OK * - LZMA_MEM_ERROR * - LZMA_UNSUPPORTED_CHECK * - LZMA_OPTIONS_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_stream_encoder_mt( lzma_stream *strm, const lzma_mt *options) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Initialize .lzma encoder (legacy file format) * * The .lzma format is sometimes called the LZMA_Alone format, which is the * reason for the name of this function. The .lzma format supports only the * LZMA1 filter. There is no support for integrity checks like CRC32. * * Use this function if and only if you need to create files readable by * legacy LZMA tools such as LZMA Utils 4.32.x. Moving to the .xz format * is strongly recommended. * * The valid action values for lzma_code() are LZMA_RUN and LZMA_FINISH. * No kind of flushing is supported, because the file format doesn't make * it possible. * * \return - LZMA_OK * - LZMA_MEM_ERROR * - LZMA_OPTIONS_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_alone_encoder( lzma_stream *strm, const lzma_options_lzma *options) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Calculate output buffer size for single-call Stream encoder * * When trying to compress uncompressible data, the encoded size will be * slightly bigger than the input data. This function calculates how much * output buffer space is required to be sure that lzma_stream_buffer_encode() * doesn't return LZMA_BUF_ERROR. * * The calculated value is not exact, but it is guaranteed to be big enough. * The actual maximum output space required may be slightly smaller (up to * about 100 bytes). This should not be a problem in practice. * * If the calculated maximum size doesn't fit into size_t or would make the * Stream grow past LZMA_VLI_MAX (which should never happen in practice), * zero is returned to indicate the error. * * \note The limit calculated by this function applies only to * single-call encoding. Multi-call encoding may (and probably * will) have larger maximum expansion when encoding * uncompressible data. Currently there is no function to * calculate the maximum expansion of multi-call encoding. */ extern LZMA_API(size_t) lzma_stream_buffer_bound(size_t uncompressed_size) lzma_nothrow; /** * \brief Single-call .xz Stream encoder * * \param filters Array of filters. This must be terminated with * filters[n].id = LZMA_VLI_UNKNOWN. See filter.h * for more information. * \param check Type of the integrity check to calculate from * uncompressed data. * \param allocator lzma_allocator for custom allocator functions. * Set to NULL to use malloc() and free(). * \param in Beginning of the input buffer * \param in_size Size of the input buffer * \param out Beginning of the output buffer * \param out_pos The next byte will be written to out[*out_pos]. * *out_pos is updated only if encoding succeeds. * \param out_size Size of the out buffer; the first byte into * which no data is written to is out[out_size]. * * \return - LZMA_OK: Encoding was successful. * - LZMA_BUF_ERROR: Not enough output buffer space. * - LZMA_UNSUPPORTED_CHECK * - LZMA_OPTIONS_ERROR * - LZMA_MEM_ERROR * - LZMA_DATA_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_stream_buffer_encode( lzma_filter *filters, lzma_check check, const lzma_allocator *allocator, const uint8_t *in, size_t in_size, uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow lzma_attr_warn_unused_result; /************ * Decoding * ************/ /** * This flag makes lzma_code() return LZMA_NO_CHECK if the input stream * being decoded has no integrity check. Note that when used with * lzma_auto_decoder(), all .lzma files will trigger LZMA_NO_CHECK * if LZMA_TELL_NO_CHECK is used. */ #define LZMA_TELL_NO_CHECK UINT32_C(0x01) /** * This flag makes lzma_code() return LZMA_UNSUPPORTED_CHECK if the input * stream has an integrity check, but the type of the integrity check is not * supported by this liblzma version or build. Such files can still be * decoded, but the integrity check cannot be verified. */ #define LZMA_TELL_UNSUPPORTED_CHECK UINT32_C(0x02) /** * This flag makes lzma_code() return LZMA_GET_CHECK as soon as the type * of the integrity check is known. The type can then be got with * lzma_get_check(). */ #define LZMA_TELL_ANY_CHECK UINT32_C(0x04) /** * This flag makes lzma_code() not calculate and verify the integrity check * of the compressed data in .xz files. This means that invalid integrity * check values won't be detected and LZMA_DATA_ERROR won't be returned in * such cases. * * This flag only affects the checks of the compressed data itself; the CRC32 * values in the .xz headers will still be verified normally. * * Don't use this flag unless you know what you are doing. Possible reasons * to use this flag: * * - Trying to recover data from a corrupt .xz file. * * - Speeding up decompression, which matters mostly with SHA-256 * or with files that have compressed extremely well. It's recommended * to not use this flag for this purpose unless the file integrity is * verified externally in some other way. * * Support for this flag was added in liblzma 5.1.4beta. */ #define LZMA_IGNORE_CHECK UINT32_C(0x10) /** * This flag enables decoding of concatenated files with file formats that * allow concatenating compressed files as is. From the formats currently * supported by liblzma, only the .xz format allows concatenated files. * Concatenated files are not allowed with the legacy .lzma format. * * This flag also affects the usage of the `action' argument for lzma_code(). * When LZMA_CONCATENATED is used, lzma_code() won't return LZMA_STREAM_END * unless LZMA_FINISH is used as `action'. Thus, the application has to set * LZMA_FINISH in the same way as it does when encoding. * * If LZMA_CONCATENATED is not used, the decoders still accept LZMA_FINISH * as `action' for lzma_code(), but the usage of LZMA_FINISH isn't required. */ #define LZMA_CONCATENATED UINT32_C(0x08) /** * \brief Initialize .xz Stream decoder * * \param strm Pointer to properly prepared lzma_stream * \param memlimit Memory usage limit as bytes. Use UINT64_MAX - * to effectively disable the limiter. + * to effectively disable the limiter. liblzma + * 5.2.3 and earlier don't allow 0 here and return + * LZMA_PROG_ERROR; later versions treat 0 as if 1 + * had been specified. * \param flags Bitwise-or of zero or more of the decoder flags: * LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK, * LZMA_TELL_ANY_CHECK, LZMA_CONCATENATED * * \return - LZMA_OK: Initialization was successful. * - LZMA_MEM_ERROR: Cannot allocate memory. * - LZMA_OPTIONS_ERROR: Unsupported flags * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_stream_decoder( lzma_stream *strm, uint64_t memlimit, uint32_t flags) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Decode .xz Streams and .lzma files with autodetection * * This decoder autodetects between the .xz and .lzma file formats, and * calls lzma_stream_decoder() or lzma_alone_decoder() once the type * of the input file has been detected. * * \param strm Pointer to properly prepared lzma_stream * \param memlimit Memory usage limit as bytes. Use UINT64_MAX - * to effectively disable the limiter. + * to effectively disable the limiter. liblzma + * 5.2.3 and earlier don't allow 0 here and return + * LZMA_PROG_ERROR; later versions treat 0 as if 1 + * had been specified. * \param flags Bitwise-or of flags, or zero for no flags. * * \return - LZMA_OK: Initialization was successful. * - LZMA_MEM_ERROR: Cannot allocate memory. * - LZMA_OPTIONS_ERROR: Unsupported flags * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_auto_decoder( lzma_stream *strm, uint64_t memlimit, uint32_t flags) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Initialize .lzma decoder (legacy file format) * + * \param strm Pointer to properly prepared lzma_stream + * \param memlimit Memory usage limit as bytes. Use UINT64_MAX + * to effectively disable the limiter. liblzma + * 5.2.3 and earlier don't allow 0 here and return + * LZMA_PROG_ERROR; later versions treat 0 as if 1 + * had been specified. + * * Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. - * There is no need to use LZMA_FINISH, but allowing it may simplify - * certain types of applications. + * There is no need to use LZMA_FINISH, but it's allowed because it may + * simplify certain types of applications. * * \return - LZMA_OK * - LZMA_MEM_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_alone_decoder( lzma_stream *strm, uint64_t memlimit) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Single-call .xz Stream decoder * * \param memlimit Pointer to how much memory the decoder is allowed * to allocate. The value pointed by this pointer is * modified if and only if LZMA_MEMLIMIT_ERROR is * returned. * \param flags Bitwise-or of zero or more of the decoder flags: * LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK, * LZMA_CONCATENATED. Note that LZMA_TELL_ANY_CHECK * is not allowed and will return LZMA_PROG_ERROR. * \param allocator lzma_allocator for custom allocator functions. * Set to NULL to use malloc() and free(). * \param in Beginning of the input buffer * \param in_pos The next byte will be read from in[*in_pos]. * *in_pos is updated only if decoding succeeds. * \param in_size Size of the input buffer; the first byte that * won't be read is in[in_size]. * \param out Beginning of the output buffer * \param out_pos The next byte will be written to out[*out_pos]. * *out_pos is updated only if decoding succeeds. * \param out_size Size of the out buffer; the first byte into * which no data is written to is out[out_size]. * * \return - LZMA_OK: Decoding was successful. * - LZMA_FORMAT_ERROR * - LZMA_OPTIONS_ERROR * - LZMA_DATA_ERROR * - LZMA_NO_CHECK: This can be returned only if using * the LZMA_TELL_NO_CHECK flag. * - LZMA_UNSUPPORTED_CHECK: This can be returned only if using * the LZMA_TELL_UNSUPPORTED_CHECK flag. * - LZMA_MEM_ERROR * - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached. * The minimum required memlimit value was stored to *memlimit. * - LZMA_BUF_ERROR: Output buffer was too small. * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_stream_buffer_decode( uint64_t *memlimit, uint32_t flags, const lzma_allocator *allocator, const uint8_t *in, size_t *in_pos, size_t in_size, uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow lzma_attr_warn_unused_result; Index: head/contrib/xz/src/liblzma/api/lzma/index.h =================================================================== --- head/contrib/xz/src/liblzma/api/lzma/index.h (revision 333782) +++ head/contrib/xz/src/liblzma/api/lzma/index.h (revision 333783) @@ -1,682 +1,686 @@ /** * \file lzma/index.h * \brief Handling of .xz Index and related information */ /* * Author: Lasse Collin * * This file has been put into the public domain. * You can do whatever you want with this file. * * See ../lzma.h for information about liblzma as a whole. */ #ifndef LZMA_H_INTERNAL # error Never include this file directly. Use instead. #endif /** * \brief Opaque data type to hold the Index(es) and other information * * lzma_index often holds just one .xz Index and possibly the Stream Flags * of the same Stream and size of the Stream Padding field. However, * multiple lzma_indexes can be concatenated with lzma_index_cat() and then * there may be information about multiple Streams in the same lzma_index. * * Notes about thread safety: Only one thread may modify lzma_index at * a time. All functions that take non-const pointer to lzma_index * modify it. As long as no thread is modifying the lzma_index, getting * information from the same lzma_index can be done from multiple threads * at the same time with functions that take a const pointer to * lzma_index or use lzma_index_iter. The same iterator must be used * only by one thread at a time, of course, but there can be as many * iterators for the same lzma_index as needed. */ typedef struct lzma_index_s lzma_index; /** * \brief Iterator to get information about Blocks and Streams */ typedef struct { struct { /** * \brief Pointer to Stream Flags * * This is NULL if Stream Flags have not been set for * this Stream with lzma_index_stream_flags(). */ const lzma_stream_flags *flags; const void *reserved_ptr1; const void *reserved_ptr2; const void *reserved_ptr3; /** * \brief Stream number in the lzma_index * * The first Stream is 1. */ lzma_vli number; /** * \brief Number of Blocks in the Stream * * If this is zero, the block structure below has * undefined values. */ lzma_vli block_count; /** * \brief Compressed start offset of this Stream * * The offset is relative to the beginning of the lzma_index * (i.e. usually the beginning of the .xz file). */ lzma_vli compressed_offset; /** * \brief Uncompressed start offset of this Stream * * The offset is relative to the beginning of the lzma_index * (i.e. usually the beginning of the .xz file). */ lzma_vli uncompressed_offset; /** * \brief Compressed size of this Stream * * This includes all headers except the possible * Stream Padding after this Stream. */ lzma_vli compressed_size; /** * \brief Uncompressed size of this Stream */ lzma_vli uncompressed_size; /** * \brief Size of Stream Padding after this Stream * * If it hasn't been set with lzma_index_stream_padding(), * this defaults to zero. Stream Padding is always * a multiple of four bytes. */ lzma_vli padding; lzma_vli reserved_vli1; lzma_vli reserved_vli2; lzma_vli reserved_vli3; lzma_vli reserved_vli4; } stream; struct { /** * \brief Block number in the file * * The first Block is 1. */ lzma_vli number_in_file; /** * \brief Compressed start offset of this Block * * This offset is relative to the beginning of the * lzma_index (i.e. usually the beginning of the .xz file). * Normally this is where you should seek in the .xz file * to start decompressing this Block. */ lzma_vli compressed_file_offset; /** * \brief Uncompressed start offset of this Block * * This offset is relative to the beginning of the lzma_index * (i.e. usually the beginning of the .xz file). * * When doing random-access reading, it is possible that * the target offset is not exactly at Block boundary. One * will need to compare the target offset against * uncompressed_file_offset or uncompressed_stream_offset, * and possibly decode and throw away some amount of data * before reaching the target offset. */ lzma_vli uncompressed_file_offset; /** * \brief Block number in this Stream * * The first Block is 1. */ lzma_vli number_in_stream; /** * \brief Compressed start offset of this Block * * This offset is relative to the beginning of the Stream * containing this Block. */ lzma_vli compressed_stream_offset; /** * \brief Uncompressed start offset of this Block * * This offset is relative to the beginning of the Stream * containing this Block. */ lzma_vli uncompressed_stream_offset; /** * \brief Uncompressed size of this Block * * You should pass this to the Block decoder if you will * decode this Block. It will allow the Block decoder to * validate the uncompressed size. */ lzma_vli uncompressed_size; /** * \brief Unpadded size of this Block * * You should pass this to the Block decoder if you will * decode this Block. It will allow the Block decoder to * validate the unpadded size. */ lzma_vli unpadded_size; /** * \brief Total compressed size * * This includes all headers and padding in this Block. * This is useful if you need to know how many bytes * the Block decoder will actually read. */ lzma_vli total_size; lzma_vli reserved_vli1; lzma_vli reserved_vli2; lzma_vli reserved_vli3; lzma_vli reserved_vli4; const void *reserved_ptr1; const void *reserved_ptr2; const void *reserved_ptr3; const void *reserved_ptr4; } block; /* * Internal data which is used to store the state of the iterator. * The exact format may vary between liblzma versions, so don't * touch these in any way. */ union { const void *p; size_t s; lzma_vli v; } internal[6]; } lzma_index_iter; /** * \brief Operation mode for lzma_index_iter_next() */ typedef enum { LZMA_INDEX_ITER_ANY = 0, /**< * \brief Get the next Block or Stream * * Go to the next Block if the current Stream has at least * one Block left. Otherwise go to the next Stream even if * it has no Blocks. If the Stream has no Blocks * (lzma_index_iter.stream.block_count == 0), * lzma_index_iter.block will have undefined values. */ LZMA_INDEX_ITER_STREAM = 1, /**< * \brief Get the next Stream * * Go to the next Stream even if the current Stream has * unread Blocks left. If the next Stream has at least one * Block, the iterator will point to the first Block. * If there are no Blocks, lzma_index_iter.block will have * undefined values. */ LZMA_INDEX_ITER_BLOCK = 2, /**< * \brief Get the next Block * * Go to the next Block if the current Stream has at least * one Block left. If the current Stream has no Blocks left, * the next Stream with at least one Block is located and * the iterator will be made to point to the first Block of * that Stream. */ LZMA_INDEX_ITER_NONEMPTY_BLOCK = 3 /**< * \brief Get the next non-empty Block * * This is like LZMA_INDEX_ITER_BLOCK except that it will * skip Blocks whose Uncompressed Size is zero. */ } lzma_index_iter_mode; /** * \brief Calculate memory usage of lzma_index * * On disk, the size of the Index field depends on both the number of Records * stored and how big values the Records store (due to variable-length integer * encoding). When the Index is kept in lzma_index structure, the memory usage * depends only on the number of Records/Blocks stored in the Index(es), and * in case of concatenated lzma_indexes, the number of Streams. The size in * RAM is almost always significantly bigger than in the encoded form on disk. * * This function calculates an approximate amount of memory needed hold * the given number of Streams and Blocks in lzma_index structure. This * value may vary between CPU architectures and also between liblzma versions * if the internal implementation is modified. */ extern LZMA_API(uint64_t) lzma_index_memusage( lzma_vli streams, lzma_vli blocks) lzma_nothrow; /** * \brief Calculate the memory usage of an existing lzma_index * * This is a shorthand for lzma_index_memusage(lzma_index_stream_count(i), * lzma_index_block_count(i)). */ extern LZMA_API(uint64_t) lzma_index_memused(const lzma_index *i) lzma_nothrow; /** * \brief Allocate and initialize a new lzma_index structure * * \return On success, a pointer to an empty initialized lzma_index is * returned. If allocation fails, NULL is returned. */ extern LZMA_API(lzma_index *) lzma_index_init(const lzma_allocator *allocator) lzma_nothrow; /** * \brief Deallocate lzma_index * * If i is NULL, this does nothing. */ extern LZMA_API(void) lzma_index_end( lzma_index *i, const lzma_allocator *allocator) lzma_nothrow; /** * \brief Add a new Block to lzma_index * * \param i Pointer to a lzma_index structure * \param allocator Pointer to lzma_allocator, or NULL to * use malloc() * \param unpadded_size Unpadded Size of a Block. This can be * calculated with lzma_block_unpadded_size() * after encoding or decoding the Block. * \param uncompressed_size Uncompressed Size of a Block. This can be * taken directly from lzma_block structure * after encoding or decoding the Block. * * Appending a new Block does not invalidate iterators. For example, * if an iterator was pointing to the end of the lzma_index, after * lzma_index_append() it is possible to read the next Block with * an existing iterator. * * \return - LZMA_OK * - LZMA_MEM_ERROR * - LZMA_DATA_ERROR: Compressed or uncompressed size of the * Stream or size of the Index field would grow too big. * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_append( lzma_index *i, const lzma_allocator *allocator, lzma_vli unpadded_size, lzma_vli uncompressed_size) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Set the Stream Flags * * Set the Stream Flags of the last (and typically the only) Stream * in lzma_index. This can be useful when reading information from the * lzma_index, because to decode Blocks, knowing the integrity check type * is needed. * * The given Stream Flags are copied into internal preallocated structure * in the lzma_index, thus the caller doesn't need to keep the *stream_flags * available after calling this function. * * \return - LZMA_OK * - LZMA_OPTIONS_ERROR: Unsupported stream_flags->version. * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_stream_flags( lzma_index *i, const lzma_stream_flags *stream_flags) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Get the types of integrity Checks * * If lzma_index_stream_flags() is used to set the Stream Flags for * every Stream, lzma_index_checks() can be used to get a bitmask to * indicate which Check types have been used. It can be useful e.g. if * showing the Check types to the user. * * The bitmask is 1 << check_id, e.g. CRC32 is 1 << 1 and SHA-256 is 1 << 10. */ extern LZMA_API(uint32_t) lzma_index_checks(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Set the amount of Stream Padding * * Set the amount of Stream Padding of the last (and typically the only) * Stream in the lzma_index. This is needed when planning to do random-access * reading within multiple concatenated Streams. * * By default, the amount of Stream Padding is assumed to be zero bytes. * * \return - LZMA_OK * - LZMA_DATA_ERROR: The file size would grow too big. * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_stream_padding( lzma_index *i, lzma_vli stream_padding) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Get the number of Streams */ extern LZMA_API(lzma_vli) lzma_index_stream_count(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the number of Blocks * * This returns the total number of Blocks in lzma_index. To get number * of Blocks in individual Streams, use lzma_index_iter. */ extern LZMA_API(lzma_vli) lzma_index_block_count(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the size of the Index field as bytes * * This is needed to verify the Backward Size field in the Stream Footer. */ extern LZMA_API(lzma_vli) lzma_index_size(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the total size of the Stream * * If multiple lzma_indexes have been combined, this works as if the Blocks * were in a single Stream. This is useful if you are going to combine * Blocks from multiple Streams into a single new Stream. */ extern LZMA_API(lzma_vli) lzma_index_stream_size(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the total size of the Blocks * * This doesn't include the Stream Header, Stream Footer, Stream Padding, * or Index fields. */ extern LZMA_API(lzma_vli) lzma_index_total_size(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the total size of the file * * When no lzma_indexes have been combined with lzma_index_cat() and there is * no Stream Padding, this function is identical to lzma_index_stream_size(). * If multiple lzma_indexes have been combined, this includes also the headers * of each separate Stream and the possible Stream Padding fields. */ extern LZMA_API(lzma_vli) lzma_index_file_size(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Get the uncompressed size of the file */ extern LZMA_API(lzma_vli) lzma_index_uncompressed_size(const lzma_index *i) lzma_nothrow lzma_attr_pure; /** * \brief Initialize an iterator * * \param iter Pointer to a lzma_index_iter structure * \param i lzma_index to which the iterator will be associated * * This function associates the iterator with the given lzma_index, and calls * lzma_index_iter_rewind() on the iterator. * * This function doesn't allocate any memory, thus there is no * lzma_index_iter_end(). The iterator is valid as long as the * associated lzma_index is valid, that is, until lzma_index_end() or * using it as source in lzma_index_cat(). Specifically, lzma_index doesn't * become invalid if new Blocks are added to it with lzma_index_append() or * if it is used as the destination in lzma_index_cat(). * * It is safe to make copies of an initialized lzma_index_iter, for example, * to easily restart reading at some particular position. */ extern LZMA_API(void) lzma_index_iter_init( lzma_index_iter *iter, const lzma_index *i) lzma_nothrow; /** * \brief Rewind the iterator * * Rewind the iterator so that next call to lzma_index_iter_next() will * return the first Block or Stream. */ extern LZMA_API(void) lzma_index_iter_rewind(lzma_index_iter *iter) lzma_nothrow; /** * \brief Get the next Block or Stream * * \param iter Iterator initialized with lzma_index_iter_init() * \param mode Specify what kind of information the caller wants * to get. See lzma_index_iter_mode for details. * * \return If next Block or Stream matching the mode was found, *iter * is updated and this function returns false. If no Block or * Stream matching the mode is found, *iter is not modified * and this function returns true. If mode is set to an unknown * value, *iter is not modified and this function returns true. */ extern LZMA_API(lzma_bool) lzma_index_iter_next( lzma_index_iter *iter, lzma_index_iter_mode mode) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Locate a Block * * If it is possible to seek in the .xz file, it is possible to parse * the Index field(s) and use lzma_index_iter_locate() to do random-access * reading with granularity of Block size. * * \param iter Iterator that was earlier initialized with * lzma_index_iter_init(). * \param target Uncompressed target offset which the caller would * like to locate from the Stream * * If the target is smaller than the uncompressed size of the Stream (can be * checked with lzma_index_uncompressed_size()): * - Information about the Stream and Block containing the requested * uncompressed offset is stored into *iter. * - Internal state of the iterator is adjusted so that * lzma_index_iter_next() can be used to read subsequent Blocks or Streams. * - This function returns false. * * If target is greater than the uncompressed size of the Stream, *iter * is not modified, and this function returns true. */ extern LZMA_API(lzma_bool) lzma_index_iter_locate( lzma_index_iter *iter, lzma_vli target) lzma_nothrow; /** * \brief Concatenate lzma_indexes * * Concatenating lzma_indexes is useful when doing random-access reading in * multi-Stream .xz file, or when combining multiple Streams into single * Stream. * * \param dest lzma_index after which src is appended * \param src lzma_index to be appended after dest. If this * function succeeds, the memory allocated for src * is freed or moved to be part of dest, and all * iterators pointing to src will become invalid. * \param allocator Custom memory allocator; can be NULL to use * malloc() and free(). * * \return - LZMA_OK: lzma_indexes were concatenated successfully. * src is now a dangling pointer. * - LZMA_DATA_ERROR: *dest would grow too big. * - LZMA_MEM_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_cat(lzma_index *dest, lzma_index *src, const lzma_allocator *allocator) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Duplicate lzma_index * * \return A copy of the lzma_index, or NULL if memory allocation failed. */ extern LZMA_API(lzma_index *) lzma_index_dup( const lzma_index *i, const lzma_allocator *allocator) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Initialize .xz Index encoder * * \param strm Pointer to properly prepared lzma_stream * \param i Pointer to lzma_index which should be encoded. * * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. - * It is enough to use only one of them (you can choose freely; use LZMA_RUN - * to support liblzma versions older than 5.0.0). + * It is enough to use only one of them (you can choose freely). * * \return - LZMA_OK: Initialization succeeded, continue with lzma_code(). * - LZMA_MEM_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_encoder( lzma_stream *strm, const lzma_index *i) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Initialize .xz Index decoder * * \param strm Pointer to properly prepared lzma_stream * \param i The decoded Index will be made available via * this pointer. Initially this function will * set *i to NULL (the old value is ignored). If * decoding succeeds (lzma_code() returns * LZMA_STREAM_END), *i will be set to point * to a new lzma_index, which the application * has to later free with lzma_index_end(). * \param memlimit How much memory the resulting lzma_index is - * allowed to require. + * allowed to require. liblzma 5.2.3 and earlier + * don't allow 0 here and return LZMA_PROG_ERROR; + * later versions treat 0 as if 1 had been specified. * - * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH. - * It is enough to use only one of them (you can choose freely; use LZMA_RUN - * to support liblzma versions older than 5.0.0). + * Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH. + * There is no need to use LZMA_FINISH, but it's allowed because it may + * simplify certain types of applications. * * \return - LZMA_OK: Initialization succeeded, continue with lzma_code(). * - LZMA_MEM_ERROR - * - LZMA_MEMLIMIT_ERROR * - LZMA_PROG_ERROR + * + * liblzma 5.2.3 and older list also LZMA_MEMLIMIT_ERROR here + * but that error code has never been possible from this + * initialization function. */ extern LZMA_API(lzma_ret) lzma_index_decoder( lzma_stream *strm, lzma_index **i, uint64_t memlimit) lzma_nothrow lzma_attr_warn_unused_result; /** * \brief Single-call .xz Index encoder * * \param i lzma_index to be encoded * \param out Beginning of the output buffer * \param out_pos The next byte will be written to out[*out_pos]. * *out_pos is updated only if encoding succeeds. * \param out_size Size of the out buffer; the first byte into * which no data is written to is out[out_size]. * * \return - LZMA_OK: Encoding was successful. * - LZMA_BUF_ERROR: Output buffer is too small. Use * lzma_index_size() to find out how much output * space is needed. * - LZMA_PROG_ERROR * * \note This function doesn't take allocator argument since all * the internal data is allocated on stack. */ extern LZMA_API(lzma_ret) lzma_index_buffer_encode(const lzma_index *i, uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow; /** * \brief Single-call .xz Index decoder * * \param i If decoding succeeds, *i will point to a new * lzma_index, which the application has to * later free with lzma_index_end(). If an error * occurs, *i will be NULL. The old value of *i * is always ignored and thus doesn't need to be * initialized by the caller. * \param memlimit Pointer to how much memory the resulting * lzma_index is allowed to require. The value * pointed by this pointer is modified if and only * if LZMA_MEMLIMIT_ERROR is returned. * \param allocator Pointer to lzma_allocator, or NULL to use malloc() * \param in Beginning of the input buffer * \param in_pos The next byte will be read from in[*in_pos]. * *in_pos is updated only if decoding succeeds. * \param in_size Size of the input buffer; the first byte that * won't be read is in[in_size]. * * \return - LZMA_OK: Decoding was successful. * - LZMA_MEM_ERROR * - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached. * The minimum required memlimit value was stored to *memlimit. * - LZMA_DATA_ERROR * - LZMA_PROG_ERROR */ extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i, uint64_t *memlimit, const lzma_allocator *allocator, const uint8_t *in, size_t *in_pos, size_t in_size) lzma_nothrow; Index: head/contrib/xz/src/liblzma/api/lzma/version.h =================================================================== --- head/contrib/xz/src/liblzma/api/lzma/version.h (revision 333782) +++ head/contrib/xz/src/liblzma/api/lzma/version.h (revision 333783) @@ -1,121 +1,121 @@ /** * \file lzma/version.h * \brief Version number */ /* * Author: Lasse Collin * * This file has been put into the public domain. * You can do whatever you want with this file. * * See ../lzma.h for information about liblzma as a whole. */ #ifndef LZMA_H_INTERNAL # error Never include this file directly. Use instead. #endif /* * Version number split into components */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 2 -#define LZMA_VERSION_PATCH 3 +#define LZMA_VERSION_PATCH 4 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT # define LZMA_VERSION_COMMIT "" #endif /* * Map symbolic stability levels to integers. */ #define LZMA_VERSION_STABILITY_ALPHA 0 #define LZMA_VERSION_STABILITY_BETA 1 #define LZMA_VERSION_STABILITY_STABLE 2 /** * \brief Compile-time version number * * The version number is of format xyyyzzzs where * - x = major * - yyy = minor * - zzz = revision * - s indicates stability: 0 = alpha, 1 = beta, 2 = stable * * The same xyyyzzz triplet is never reused with different stability levels. * For example, if 5.1.0alpha has been released, there will never be 5.1.0beta * or 5.1.0 stable. * * \note The version number of liblzma has nothing to with * the version number of Igor Pavlov's LZMA SDK. */ #define LZMA_VERSION (LZMA_VERSION_MAJOR * UINT32_C(10000000) \ + LZMA_VERSION_MINOR * UINT32_C(10000) \ + LZMA_VERSION_PATCH * UINT32_C(10) \ + LZMA_VERSION_STABILITY) /* * Macros to construct the compile-time version string */ #if LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_ALPHA # define LZMA_VERSION_STABILITY_STRING "alpha" #elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_BETA # define LZMA_VERSION_STABILITY_STRING "beta" #elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_STABLE # define LZMA_VERSION_STABILITY_STRING "" #else # error Incorrect LZMA_VERSION_STABILITY #endif #define LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit) \ #major "." #minor "." #patch stability commit #define LZMA_VERSION_STRING_C(major, minor, patch, stability, commit) \ LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit) /** * \brief Compile-time version as a string * * This can be for example "4.999.5alpha", "4.999.8beta", or "5.0.0" (stable * versions don't have any "stable" suffix). In future, a snapshot built * from source code repository may include an additional suffix, for example * "4.999.8beta-21-g1d92". The commit ID won't be available in numeric form * in LZMA_VERSION macro. */ #define LZMA_VERSION_STRING LZMA_VERSION_STRING_C( \ LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, \ LZMA_VERSION_PATCH, LZMA_VERSION_STABILITY_STRING, \ LZMA_VERSION_COMMIT) /* #ifndef is needed for use with windres (MinGW or Cygwin). */ #ifndef LZMA_H_INTERNAL_RC /** * \brief Run-time version number as an integer * * Return the value of LZMA_VERSION macro at the compile time of liblzma. * This allows the application to compare if it was built against the same, * older, or newer version of liblzma that is currently running. */ extern LZMA_API(uint32_t) lzma_version_number(void) lzma_nothrow lzma_attr_const; /** * \brief Run-time version as a string * * This function may be useful if you want to display which version of * liblzma your application is currently using. */ extern LZMA_API(const char *) lzma_version_string(void) lzma_nothrow lzma_attr_const; #endif Index: head/contrib/xz/src/liblzma/api/lzma.h =================================================================== --- head/contrib/xz/src/liblzma/api/lzma.h (revision 333782) +++ head/contrib/xz/src/liblzma/api/lzma.h (revision 333783) @@ -1,321 +1,325 @@ /** * \file api/lzma.h * \brief The public API of liblzma data compression library * * liblzma is a public domain general-purpose data compression library with * a zlib-like API. The native file format is .xz, but also the old .lzma * format and raw (no headers) streams are supported. Multiple compression * algorithms (filters) are supported. Currently LZMA2 is the primary filter. * * liblzma is part of XZ Utils . XZ Utils includes * a gzip-like command line tool named xz and some other tools. XZ Utils * is developed and maintained by Lasse Collin. * * Major parts of liblzma are based on Igor Pavlov's public domain LZMA SDK * . * * The SHA-256 implementation is based on the public domain code found from * 7-Zip , which has a modified version of the public * domain SHA-256 code found from Crypto++ . * The SHA-256 code in Crypto++ was written by Kevin Springle and Wei Dai. */ /* * Author: Lasse Collin * * This file has been put into the public domain. * You can do whatever you want with this file. */ #ifndef LZMA_H #define LZMA_H /***************************** * Required standard headers * *****************************/ /* * liblzma API headers need some standard types and macros. To allow * including lzma.h without requiring the application to include other * headers first, lzma.h includes the required standard headers unless * they already seem to be included already or if LZMA_MANUAL_HEADERS * has been defined. * * Here's what types and macros are needed and from which headers: * - stddef.h: size_t, NULL * - stdint.h: uint8_t, uint32_t, uint64_t, UINT32_C(n), uint64_C(n), * UINT32_MAX, UINT64_MAX * * However, inttypes.h is a little more portable than stdint.h, although * inttypes.h declares some unneeded things compared to plain stdint.h. * * The hacks below aren't perfect, specifically they assume that inttypes.h * exists and that it typedefs at least uint8_t, uint32_t, and uint64_t, * and that, in case of incomplete inttypes.h, unsigned int is 32-bit. * If the application already takes care of setting up all the types and * macros properly (for example by using gnulib's stdint.h or inttypes.h), * we try to detect that the macros are already defined and don't include * inttypes.h here again. However, you may define LZMA_MANUAL_HEADERS to * force this file to never include any system headers. * * Some could argue that liblzma API should provide all the required types, * for example lzma_uint64, LZMA_UINT64_C(n), and LZMA_UINT64_MAX. This was * seen as an unnecessary mess, since most systems already provide all the * necessary types and macros in the standard headers. * * Note that liblzma API still has lzma_bool, because using stdbool.h would * break C89 and C++ programs on many systems. sizeof(bool) in C99 isn't * necessarily the same as sizeof(bool) in C++. */ #ifndef LZMA_MANUAL_HEADERS /* * I suppose this works portably also in C++. Note that in C++, * we need to get size_t into the global namespace. */ # include /* * Skip inttypes.h if we already have all the required macros. If we * have the macros, we assume that we have the matching typedefs too. */ # if !defined(UINT32_C) || !defined(UINT64_C) \ || !defined(UINT32_MAX) || !defined(UINT64_MAX) /* * MSVC versions older than 2013 have no C99 support, and * thus they cannot be used to compile liblzma. Using an * existing liblzma.dll with old MSVC can work though(*), * but we need to define the required standard integer * types here in a MSVC-specific way. * * (*) If you do this, the existing liblzma.dll probably uses * a different runtime library than your MSVC-built * application. Mixing runtimes is generally bad, but * in this case it should work as long as you avoid * the few rarely-needed liblzma functions that allocate * memory and expect the caller to free it using free(). */ # if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1800 typedef unsigned __int8 uint8_t; typedef unsigned __int32 uint32_t; typedef unsigned __int64 uint64_t; # else /* Use the standard inttypes.h. */ # ifdef __cplusplus /* * C99 sections 7.18.2 and 7.18.4 specify * that C++ implementations define the limit * and constant macros only if specifically * requested. Note that if you want the * format macros (PRIu64 etc.) too, you need * to define __STDC_FORMAT_MACROS before * including lzma.h, since re-including * inttypes.h with __STDC_FORMAT_MACROS * defined doesn't necessarily work. */ # ifndef __STDC_LIMIT_MACROS # define __STDC_LIMIT_MACROS 1 # endif # ifndef __STDC_CONSTANT_MACROS # define __STDC_CONSTANT_MACROS 1 # endif # endif # include # endif /* * Some old systems have only the typedefs in inttypes.h, and * lack all the macros. For those systems, we need a few more * hacks. We assume that unsigned int is 32-bit and unsigned * long is either 32-bit or 64-bit. If these hacks aren't * enough, the application has to setup the types manually * before including lzma.h. */ # ifndef UINT32_C # if defined(_WIN32) && defined(_MSC_VER) # define UINT32_C(n) n ## UI32 # else # define UINT32_C(n) n ## U # endif # endif # ifndef UINT64_C # if defined(_WIN32) && defined(_MSC_VER) # define UINT64_C(n) n ## UI64 # else /* Get ULONG_MAX. */ # include # if ULONG_MAX == 4294967295UL # define UINT64_C(n) n ## ULL # else # define UINT64_C(n) n ## UL # endif # endif # endif # ifndef UINT32_MAX # define UINT32_MAX (UINT32_C(4294967295)) # endif # ifndef UINT64_MAX # define UINT64_MAX (UINT64_C(18446744073709551615)) # endif # endif #endif /* ifdef LZMA_MANUAL_HEADERS */ /****************** * LZMA_API macro * ******************/ /* * Some systems require that the functions and function pointers are * declared specially in the headers. LZMA_API_IMPORT is for importing * symbols and LZMA_API_CALL is to specify the calling convention. * * By default it is assumed that the application will link dynamically * against liblzma. #define LZMA_API_STATIC in your application if you * want to link against static liblzma. If you don't care about portability * to operating systems like Windows, or at least don't care about linking * against static liblzma on them, don't worry about LZMA_API_STATIC. That * is, most developers will never need to use LZMA_API_STATIC. * * The GCC variants are a special case on Windows (Cygwin and MinGW). * We rely on GCC doing the right thing with its auto-import feature, * and thus don't use __declspec(dllimport). This way developers don't * need to worry about LZMA_API_STATIC. Also the calling convention is * omitted on Cygwin but not on MinGW. */ #ifndef LZMA_API_IMPORT # if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__) # define LZMA_API_IMPORT __declspec(dllimport) # else # define LZMA_API_IMPORT # endif #endif #ifndef LZMA_API_CALL # if defined(_WIN32) && !defined(__CYGWIN__) # define LZMA_API_CALL __cdecl # else # define LZMA_API_CALL # endif #endif #ifndef LZMA_API # define LZMA_API(type) LZMA_API_IMPORT type LZMA_API_CALL #endif /*********** * nothrow * ***********/ /* * None of the functions in liblzma may throw an exception. Even * the functions that use callback functions won't throw exceptions, * because liblzma would break if a callback function threw an exception. */ #ifndef lzma_nothrow # if defined(__cplusplus) -# define lzma_nothrow throw() +# if __cplusplus >= 201103L +# define lzma_nothrow noexcept +# else +# define lzma_nothrow throw() +# endif # elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) # define lzma_nothrow __attribute__((__nothrow__)) # else # define lzma_nothrow # endif #endif /******************** * GNU C extensions * ********************/ /* * GNU C extensions are used conditionally in the public API. It doesn't * break anything if these are sometimes enabled and sometimes not, only * affects warnings and optimizations. */ #if __GNUC__ >= 3 # ifndef lzma_attribute # define lzma_attribute(attr) __attribute__(attr) # endif /* warn_unused_result was added in GCC 3.4. */ # ifndef lzma_attr_warn_unused_result # if __GNUC__ == 3 && __GNUC_MINOR__ < 4 # define lzma_attr_warn_unused_result # endif # endif #else # ifndef lzma_attribute # define lzma_attribute(attr) # endif #endif #ifndef lzma_attr_pure # define lzma_attr_pure lzma_attribute((__pure__)) #endif #ifndef lzma_attr_const # define lzma_attr_const lzma_attribute((__const__)) #endif #ifndef lzma_attr_warn_unused_result # define lzma_attr_warn_unused_result \ lzma_attribute((__warn_unused_result__)) #endif /************** * Subheaders * **************/ #ifdef __cplusplus extern "C" { #endif /* * Subheaders check that this is defined. It is to prevent including * them directly from applications. */ #define LZMA_H_INTERNAL 1 /* Basic features */ #include "lzma/version.h" #include "lzma/base.h" #include "lzma/vli.h" #include "lzma/check.h" /* Filters */ #include "lzma/filter.h" #include "lzma/bcj.h" #include "lzma/delta.h" #include "lzma/lzma12.h" /* Container formats */ #include "lzma/container.h" /* Advanced features */ #include "lzma/stream_flags.h" #include "lzma/block.h" #include "lzma/index.h" #include "lzma/index_hash.h" /* Hardware information */ #include "lzma/hardware.h" /* * All subheaders included. Undefine LZMA_H_INTERNAL to prevent applications * re-including the subheaders. */ #undef LZMA_H_INTERNAL #ifdef __cplusplus } #endif #endif /* ifndef LZMA_H */ Index: head/contrib/xz/src/liblzma/common/alone_decoder.c =================================================================== --- head/contrib/xz/src/liblzma/common/alone_decoder.c (revision 333782) +++ head/contrib/xz/src/liblzma/common/alone_decoder.c (revision 333783) @@ -1,246 +1,243 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file alone_decoder.c /// \brief Decoder for LZMA_Alone files // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "alone_decoder.h" #include "lzma_decoder.h" #include "lz_decoder.h" typedef struct { lzma_next_coder next; enum { SEQ_PROPERTIES, SEQ_DICTIONARY_SIZE, SEQ_UNCOMPRESSED_SIZE, SEQ_CODER_INIT, SEQ_CODE, } sequence; /// If true, reject files that are unlikely to be .lzma files. /// If false, more non-.lzma files get accepted and will give /// LZMA_DATA_ERROR either immediately or after a few output bytes. bool picky; /// Position in the header fields size_t pos; /// Uncompressed size decoded from the header lzma_vli uncompressed_size; /// Memory usage limit uint64_t memlimit; /// Amount of memory actually needed (only an estimate) uint64_t memusage; /// Options decoded from the header needed to initialize /// the LZMA decoder lzma_options_lzma options; } lzma_alone_coder; static lzma_ret alone_decode(void *coder_ptr, const lzma_allocator *allocator lzma_attribute((__unused__)), const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size, lzma_action action) { lzma_alone_coder *coder = coder_ptr; while (*out_pos < out_size && (coder->sequence == SEQ_CODE || *in_pos < in_size)) switch (coder->sequence) { case SEQ_PROPERTIES: if (lzma_lzma_lclppb_decode(&coder->options, in[*in_pos])) return LZMA_FORMAT_ERROR; coder->sequence = SEQ_DICTIONARY_SIZE; ++*in_pos; break; case SEQ_DICTIONARY_SIZE: coder->options.dict_size |= (size_t)(in[*in_pos]) << (coder->pos * 8); if (++coder->pos == 4) { if (coder->picky && coder->options.dict_size != UINT32_MAX) { // A hack to ditch tons of false positives: // We allow only dictionary sizes that are // 2^n or 2^n + 2^(n-1). LZMA_Alone created // only files with 2^n, but accepts any // dictionary size. uint32_t d = coder->options.dict_size - 1; d |= d >> 2; d |= d >> 3; d |= d >> 4; d |= d >> 8; d |= d >> 16; ++d; if (d != coder->options.dict_size) return LZMA_FORMAT_ERROR; } coder->pos = 0; coder->sequence = SEQ_UNCOMPRESSED_SIZE; } ++*in_pos; break; case SEQ_UNCOMPRESSED_SIZE: coder->uncompressed_size |= (lzma_vli)(in[*in_pos]) << (coder->pos * 8); ++*in_pos; if (++coder->pos < 8) break; // Another hack to ditch false positives: Assume that // if the uncompressed size is known, it must be less // than 256 GiB. if (coder->picky && coder->uncompressed_size != LZMA_VLI_UNKNOWN && coder->uncompressed_size >= (LZMA_VLI_C(1) << 38)) return LZMA_FORMAT_ERROR; // Calculate the memory usage so that it is ready // for SEQ_CODER_INIT. coder->memusage = lzma_lzma_decoder_memusage(&coder->options) + LZMA_MEMUSAGE_BASE; coder->pos = 0; coder->sequence = SEQ_CODER_INIT; // Fall through case SEQ_CODER_INIT: { if (coder->memusage > coder->memlimit) return LZMA_MEMLIMIT_ERROR; lzma_filter_info filters[2] = { { .init = &lzma_lzma_decoder_init, .options = &coder->options, }, { .init = NULL, } }; const lzma_ret ret = lzma_next_filter_init(&coder->next, allocator, filters); if (ret != LZMA_OK) return ret; // Use a hack to set the uncompressed size. lzma_lz_decoder_uncompressed(coder->next.coder, coder->uncompressed_size); coder->sequence = SEQ_CODE; break; } case SEQ_CODE: { return coder->next.code(coder->next.coder, allocator, in, in_pos, in_size, out, out_pos, out_size, action); } default: return LZMA_PROG_ERROR; } return LZMA_OK; } static void alone_decoder_end(void *coder_ptr, const lzma_allocator *allocator) { lzma_alone_coder *coder = coder_ptr; lzma_next_end(&coder->next, allocator); lzma_free(coder, allocator); return; } static lzma_ret alone_decoder_memconfig(void *coder_ptr, uint64_t *memusage, uint64_t *old_memlimit, uint64_t new_memlimit) { lzma_alone_coder *coder = coder_ptr; *memusage = coder->memusage; *old_memlimit = coder->memlimit; if (new_memlimit != 0) { if (new_memlimit < coder->memusage) return LZMA_MEMLIMIT_ERROR; coder->memlimit = new_memlimit; } return LZMA_OK; } extern lzma_ret lzma_alone_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator, uint64_t memlimit, bool picky) { lzma_next_coder_init(&lzma_alone_decoder_init, next, allocator); - if (memlimit == 0) - return LZMA_PROG_ERROR; - lzma_alone_coder *coder = next->coder; if (coder == NULL) { coder = lzma_alloc(sizeof(lzma_alone_coder), allocator); if (coder == NULL) return LZMA_MEM_ERROR; next->coder = coder; next->code = &alone_decode; next->end = &alone_decoder_end; next->memconfig = &alone_decoder_memconfig; coder->next = LZMA_NEXT_CODER_INIT; } coder->sequence = SEQ_PROPERTIES; coder->picky = picky; coder->pos = 0; coder->options.dict_size = 0; coder->options.preset_dict = NULL; coder->options.preset_dict_size = 0; coder->uncompressed_size = 0; - coder->memlimit = memlimit; + coder->memlimit = my_max(1, memlimit); coder->memusage = LZMA_MEMUSAGE_BASE; return LZMA_OK; } extern LZMA_API(lzma_ret) lzma_alone_decoder(lzma_stream *strm, uint64_t memlimit) { lzma_next_strm_init(lzma_alone_decoder_init, strm, memlimit, false); strm->internal->supported_actions[LZMA_RUN] = true; strm->internal->supported_actions[LZMA_FINISH] = true; return LZMA_OK; } Index: head/contrib/xz/src/liblzma/common/auto_decoder.c =================================================================== --- head/contrib/xz/src/liblzma/common/auto_decoder.c (revision 333782) +++ head/contrib/xz/src/liblzma/common/auto_decoder.c (revision 333783) @@ -1,195 +1,195 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file auto_decoder.c /// \brief Autodetect between .xz Stream and .lzma (LZMA_Alone) formats // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "stream_decoder.h" #include "alone_decoder.h" typedef struct { /// Stream decoder or LZMA_Alone decoder lzma_next_coder next; uint64_t memlimit; uint32_t flags; enum { SEQ_INIT, SEQ_CODE, SEQ_FINISH, } sequence; } lzma_auto_coder; static lzma_ret auto_decode(void *coder_ptr, const lzma_allocator *allocator, const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size, lzma_action action) { lzma_auto_coder *coder = coder_ptr; switch (coder->sequence) { case SEQ_INIT: if (*in_pos >= in_size) return LZMA_OK; // Update the sequence now, because we want to continue from // SEQ_CODE even if we return some LZMA_*_CHECK. coder->sequence = SEQ_CODE; // Detect the file format. For now this is simple, since if // it doesn't start with 0xFD (the first magic byte of the // new format), it has to be LZMA_Alone, or something that // we don't support at all. if (in[*in_pos] == 0xFD) { return_if_error(lzma_stream_decoder_init( &coder->next, allocator, coder->memlimit, coder->flags)); } else { return_if_error(lzma_alone_decoder_init(&coder->next, allocator, coder->memlimit, true)); // If the application wants to know about missing // integrity check or about the check in general, we // need to handle it here, because LZMA_Alone decoder // doesn't accept any flags. if (coder->flags & LZMA_TELL_NO_CHECK) return LZMA_NO_CHECK; if (coder->flags & LZMA_TELL_ANY_CHECK) return LZMA_GET_CHECK; } // Fall through case SEQ_CODE: { const lzma_ret ret = coder->next.code( coder->next.coder, allocator, in, in_pos, in_size, out, out_pos, out_size, action); if (ret != LZMA_STREAM_END || (coder->flags & LZMA_CONCATENATED) == 0) return ret; coder->sequence = SEQ_FINISH; } // Fall through case SEQ_FINISH: // When LZMA_DECODE_CONCATENATED was used and we were decoding // LZMA_Alone file, we need to check check that there is no // trailing garbage and wait for LZMA_FINISH. if (*in_pos < in_size) return LZMA_DATA_ERROR; return action == LZMA_FINISH ? LZMA_STREAM_END : LZMA_OK; default: assert(0); return LZMA_PROG_ERROR; } } static void auto_decoder_end(void *coder_ptr, const lzma_allocator *allocator) { lzma_auto_coder *coder = coder_ptr; lzma_next_end(&coder->next, allocator); lzma_free(coder, allocator); return; } static lzma_check auto_decoder_get_check(const void *coder_ptr) { const lzma_auto_coder *coder = coder_ptr; // It is LZMA_Alone if get_check is NULL. return coder->next.get_check == NULL ? LZMA_CHECK_NONE : coder->next.get_check(coder->next.coder); } static lzma_ret auto_decoder_memconfig(void *coder_ptr, uint64_t *memusage, uint64_t *old_memlimit, uint64_t new_memlimit) { lzma_auto_coder *coder = coder_ptr; lzma_ret ret; if (coder->next.memconfig != NULL) { ret = coder->next.memconfig(coder->next.coder, memusage, old_memlimit, new_memlimit); assert(*old_memlimit == coder->memlimit); } else { // No coder is configured yet. Use the base value as // the current memory usage. *memusage = LZMA_MEMUSAGE_BASE; *old_memlimit = coder->memlimit; + ret = LZMA_OK; + if (new_memlimit != 0 && new_memlimit < *memusage) + ret = LZMA_MEMLIMIT_ERROR; } if (ret == LZMA_OK && new_memlimit != 0) coder->memlimit = new_memlimit; return ret; } static lzma_ret auto_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator, uint64_t memlimit, uint32_t flags) { lzma_next_coder_init(&auto_decoder_init, next, allocator); - if (memlimit == 0) - return LZMA_PROG_ERROR; - if (flags & ~LZMA_SUPPORTED_FLAGS) return LZMA_OPTIONS_ERROR; lzma_auto_coder *coder = next->coder; if (coder == NULL) { coder = lzma_alloc(sizeof(lzma_auto_coder), allocator); if (coder == NULL) return LZMA_MEM_ERROR; next->coder = coder; next->code = &auto_decode; next->end = &auto_decoder_end; next->get_check = &auto_decoder_get_check; next->memconfig = &auto_decoder_memconfig; coder->next = LZMA_NEXT_CODER_INIT; } - coder->memlimit = memlimit; + coder->memlimit = my_max(1, memlimit); coder->flags = flags; coder->sequence = SEQ_INIT; return LZMA_OK; } extern LZMA_API(lzma_ret) lzma_auto_decoder(lzma_stream *strm, uint64_t memlimit, uint32_t flags) { lzma_next_strm_init(auto_decoder_init, strm, memlimit, flags); strm->internal->supported_actions[LZMA_RUN] = true; strm->internal->supported_actions[LZMA_FINISH] = true; return LZMA_OK; } Index: head/contrib/xz/src/liblzma/common/common.c =================================================================== --- head/contrib/xz/src/liblzma/common/common.c (revision 333782) +++ head/contrib/xz/src/liblzma/common/common.c (revision 333783) @@ -1,443 +1,445 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file common.h /// \brief Common functions needed in many places in liblzma // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "common.h" ///////////// // Version // ///////////// extern LZMA_API(uint32_t) lzma_version_number(void) { return LZMA_VERSION; } extern LZMA_API(const char *) lzma_version_string(void) { return LZMA_VERSION_STRING; } /////////////////////// // Memory allocation // /////////////////////// extern void * lzma_attribute((__malloc__)) lzma_attr_alloc_size(1) lzma_alloc(size_t size, const lzma_allocator *allocator) { // Some malloc() variants return NULL if called with size == 0. if (size == 0) size = 1; void *ptr; if (allocator != NULL && allocator->alloc != NULL) ptr = allocator->alloc(allocator->opaque, 1, size); else ptr = malloc(size); return ptr; } extern void * lzma_attribute((__malloc__)) lzma_attr_alloc_size(1) lzma_alloc_zero(size_t size, const lzma_allocator *allocator) { // Some calloc() variants return NULL if called with size == 0. if (size == 0) size = 1; void *ptr; if (allocator != NULL && allocator->alloc != NULL) { ptr = allocator->alloc(allocator->opaque, 1, size); if (ptr != NULL) memzero(ptr, size); } else { ptr = calloc(1, size); } return ptr; } extern void lzma_free(void *ptr, const lzma_allocator *allocator) { if (allocator != NULL && allocator->free != NULL) allocator->free(allocator->opaque, ptr); else free(ptr); return; } ////////// // Misc // ////////// extern size_t lzma_bufcpy(const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size) { const size_t in_avail = in_size - *in_pos; const size_t out_avail = out_size - *out_pos; const size_t copy_size = my_min(in_avail, out_avail); memcpy(out + *out_pos, in + *in_pos, copy_size); *in_pos += copy_size; *out_pos += copy_size; return copy_size; } extern lzma_ret lzma_next_filter_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters) { lzma_next_coder_init(filters[0].init, next, allocator); next->id = filters[0].id; return filters[0].init == NULL ? LZMA_OK : filters[0].init(next, allocator, filters); } extern lzma_ret lzma_next_filter_update(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter *reversed_filters) { // Check that the application isn't trying to change the Filter ID. // End of filters is indicated with LZMA_VLI_UNKNOWN in both // reversed_filters[0].id and next->id. if (reversed_filters[0].id != next->id) return LZMA_PROG_ERROR; if (reversed_filters[0].id == LZMA_VLI_UNKNOWN) return LZMA_OK; assert(next->update != NULL); return next->update(next->coder, allocator, NULL, reversed_filters); } extern void lzma_next_end(lzma_next_coder *next, const lzma_allocator *allocator) { if (next->init != (uintptr_t)(NULL)) { // To avoid tiny end functions that simply call // lzma_free(coder, allocator), we allow leaving next->end // NULL and call lzma_free() here. if (next->end != NULL) next->end(next->coder, allocator); else lzma_free(next->coder, allocator); // Reset the variables so the we don't accidentally think // that it is an already initialized coder. *next = LZMA_NEXT_CODER_INIT; } return; } ////////////////////////////////////// // External to internal API wrapper // ////////////////////////////////////// extern lzma_ret lzma_strm_init(lzma_stream *strm) { if (strm == NULL) return LZMA_PROG_ERROR; if (strm->internal == NULL) { strm->internal = lzma_alloc(sizeof(lzma_internal), strm->allocator); if (strm->internal == NULL) return LZMA_MEM_ERROR; strm->internal->next = LZMA_NEXT_CODER_INIT; } memzero(strm->internal->supported_actions, sizeof(strm->internal->supported_actions)); strm->internal->sequence = ISEQ_RUN; strm->internal->allow_buf_error = false; strm->total_in = 0; strm->total_out = 0; return LZMA_OK; } extern LZMA_API(lzma_ret) lzma_code(lzma_stream *strm, lzma_action action) { // Sanity checks if ((strm->next_in == NULL && strm->avail_in != 0) || (strm->next_out == NULL && strm->avail_out != 0) || strm->internal == NULL || strm->internal->next.code == NULL || (unsigned int)(action) > LZMA_ACTION_MAX || !strm->internal->supported_actions[action]) return LZMA_PROG_ERROR; // Check if unsupported members have been set to non-zero or non-NULL, // which would indicate that some new feature is wanted. if (strm->reserved_ptr1 != NULL || strm->reserved_ptr2 != NULL || strm->reserved_ptr3 != NULL || strm->reserved_ptr4 != NULL || strm->reserved_int1 != 0 || strm->reserved_int2 != 0 || strm->reserved_int3 != 0 || strm->reserved_int4 != 0 || strm->reserved_enum1 != LZMA_RESERVED_ENUM || strm->reserved_enum2 != LZMA_RESERVED_ENUM) return LZMA_OPTIONS_ERROR; switch (strm->internal->sequence) { case ISEQ_RUN: switch (action) { case LZMA_RUN: break; case LZMA_SYNC_FLUSH: strm->internal->sequence = ISEQ_SYNC_FLUSH; break; case LZMA_FULL_FLUSH: strm->internal->sequence = ISEQ_FULL_FLUSH; break; case LZMA_FINISH: strm->internal->sequence = ISEQ_FINISH; break; case LZMA_FULL_BARRIER: strm->internal->sequence = ISEQ_FULL_BARRIER; break; } break; case ISEQ_SYNC_FLUSH: // The same action must be used until we return // LZMA_STREAM_END, and the amount of input must not change. if (action != LZMA_SYNC_FLUSH || strm->internal->avail_in != strm->avail_in) return LZMA_PROG_ERROR; break; case ISEQ_FULL_FLUSH: if (action != LZMA_FULL_FLUSH || strm->internal->avail_in != strm->avail_in) return LZMA_PROG_ERROR; break; case ISEQ_FINISH: if (action != LZMA_FINISH || strm->internal->avail_in != strm->avail_in) return LZMA_PROG_ERROR; break; case ISEQ_FULL_BARRIER: if (action != LZMA_FULL_BARRIER || strm->internal->avail_in != strm->avail_in) return LZMA_PROG_ERROR; break; case ISEQ_END: return LZMA_STREAM_END; case ISEQ_ERROR: default: return LZMA_PROG_ERROR; } size_t in_pos = 0; size_t out_pos = 0; lzma_ret ret = strm->internal->next.code( strm->internal->next.coder, strm->allocator, strm->next_in, &in_pos, strm->avail_in, strm->next_out, &out_pos, strm->avail_out, action); strm->next_in += in_pos; strm->avail_in -= in_pos; strm->total_in += in_pos; strm->next_out += out_pos; strm->avail_out -= out_pos; strm->total_out += out_pos; strm->internal->avail_in = strm->avail_in; // Cast is needed to silence a warning about LZMA_TIMED_OUT, which // isn't part of lzma_ret enumeration. switch ((unsigned int)(ret)) { case LZMA_OK: // Don't return LZMA_BUF_ERROR when it happens the first time. // This is to avoid returning LZMA_BUF_ERROR when avail_out // was zero but still there was no more data left to written // to next_out. if (out_pos == 0 && in_pos == 0) { if (strm->internal->allow_buf_error) ret = LZMA_BUF_ERROR; else strm->internal->allow_buf_error = true; } else { strm->internal->allow_buf_error = false; } break; case LZMA_TIMED_OUT: strm->internal->allow_buf_error = false; ret = LZMA_OK; break; case LZMA_STREAM_END: if (strm->internal->sequence == ISEQ_SYNC_FLUSH || strm->internal->sequence == ISEQ_FULL_FLUSH || strm->internal->sequence == ISEQ_FULL_BARRIER) strm->internal->sequence = ISEQ_RUN; else strm->internal->sequence = ISEQ_END; // Fall through case LZMA_NO_CHECK: case LZMA_UNSUPPORTED_CHECK: case LZMA_GET_CHECK: case LZMA_MEMLIMIT_ERROR: // Something else than LZMA_OK, but not a fatal error, // that is, coding may be continued (except if ISEQ_END). strm->internal->allow_buf_error = false; break; default: // All the other errors are fatal; coding cannot be continued. assert(ret != LZMA_BUF_ERROR); strm->internal->sequence = ISEQ_ERROR; break; } return ret; } extern LZMA_API(void) lzma_end(lzma_stream *strm) { if (strm != NULL && strm->internal != NULL) { lzma_next_end(&strm->internal->next, strm->allocator); lzma_free(strm->internal, strm->allocator); strm->internal = NULL; } return; } extern LZMA_API(void) lzma_get_progress(lzma_stream *strm, uint64_t *progress_in, uint64_t *progress_out) { if (strm->internal->next.get_progress != NULL) { strm->internal->next.get_progress(strm->internal->next.coder, progress_in, progress_out); } else { *progress_in = strm->total_in; *progress_out = strm->total_out; } return; } extern LZMA_API(lzma_check) lzma_get_check(const lzma_stream *strm) { // Return LZMA_CHECK_NONE if we cannot know the check type. // It's a bug in the application if this happens. if (strm->internal->next.get_check == NULL) return LZMA_CHECK_NONE; return strm->internal->next.get_check(strm->internal->next.coder); } extern LZMA_API(uint64_t) lzma_memusage(const lzma_stream *strm) { uint64_t memusage; uint64_t old_memlimit; if (strm == NULL || strm->internal == NULL || strm->internal->next.memconfig == NULL || strm->internal->next.memconfig( strm->internal->next.coder, &memusage, &old_memlimit, 0) != LZMA_OK) return 0; return memusage; } extern LZMA_API(uint64_t) lzma_memlimit_get(const lzma_stream *strm) { uint64_t old_memlimit; uint64_t memusage; if (strm == NULL || strm->internal == NULL || strm->internal->next.memconfig == NULL || strm->internal->next.memconfig( strm->internal->next.coder, &memusage, &old_memlimit, 0) != LZMA_OK) return 0; return old_memlimit; } extern LZMA_API(lzma_ret) lzma_memlimit_set(lzma_stream *strm, uint64_t new_memlimit) { // Dummy variables to simplify memconfig functions uint64_t old_memlimit; uint64_t memusage; if (strm == NULL || strm->internal == NULL || strm->internal->next.memconfig == NULL) return LZMA_PROG_ERROR; - if (new_memlimit != 0 && new_memlimit < LZMA_MEMUSAGE_BASE) - return LZMA_MEMLIMIT_ERROR; + // Zero is a special value that cannot be used as an actual limit. + // If 0 was specified, use 1 instead. + if (new_memlimit == 0) + new_memlimit = 1; return strm->internal->next.memconfig(strm->internal->next.coder, &memusage, &old_memlimit, new_memlimit); } Index: head/contrib/xz/src/liblzma/common/index_decoder.c =================================================================== --- head/contrib/xz/src/liblzma/common/index_decoder.c (revision 333782) +++ head/contrib/xz/src/liblzma/common/index_decoder.c (revision 333783) @@ -1,352 +1,352 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file index_decoder.c /// \brief Decodes the Index field // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "index.h" #include "check.h" typedef struct { enum { SEQ_INDICATOR, SEQ_COUNT, SEQ_MEMUSAGE, SEQ_UNPADDED, SEQ_UNCOMPRESSED, SEQ_PADDING_INIT, SEQ_PADDING, SEQ_CRC32, } sequence; /// Memory usage limit uint64_t memlimit; /// Target Index lzma_index *index; /// Pointer give by the application, which is set after /// successful decoding. lzma_index **index_ptr; /// Number of Records left to decode. lzma_vli count; /// The most recent Unpadded Size field lzma_vli unpadded_size; /// The most recent Uncompressed Size field lzma_vli uncompressed_size; /// Position in integers size_t pos; /// CRC32 of the List of Records field uint32_t crc32; } lzma_index_coder; static lzma_ret index_decode(void *coder_ptr, const lzma_allocator *allocator, const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out lzma_attribute((__unused__)), size_t *restrict out_pos lzma_attribute((__unused__)), size_t out_size lzma_attribute((__unused__)), lzma_action action lzma_attribute((__unused__))) { lzma_index_coder *coder = coder_ptr; // Similar optimization as in index_encoder.c const size_t in_start = *in_pos; lzma_ret ret = LZMA_OK; while (*in_pos < in_size) switch (coder->sequence) { case SEQ_INDICATOR: // Return LZMA_DATA_ERROR instead of e.g. LZMA_PROG_ERROR or // LZMA_FORMAT_ERROR, because a typical usage case for Index // decoder is when parsing the Stream backwards. If seeking // backward from the Stream Footer gives us something that // doesn't begin with Index Indicator, the file is considered // corrupt, not "programming error" or "unrecognized file // format". One could argue that the application should // verify the Index Indicator before trying to decode the // Index, but well, I suppose it is simpler this way. if (in[(*in_pos)++] != 0x00) return LZMA_DATA_ERROR; coder->sequence = SEQ_COUNT; break; case SEQ_COUNT: ret = lzma_vli_decode(&coder->count, &coder->pos, in, in_pos, in_size); if (ret != LZMA_STREAM_END) goto out; coder->pos = 0; coder->sequence = SEQ_MEMUSAGE; // Fall through case SEQ_MEMUSAGE: if (lzma_index_memusage(1, coder->count) > coder->memlimit) { ret = LZMA_MEMLIMIT_ERROR; goto out; } // Tell the Index handling code how many Records this // Index has to allow it to allocate memory more efficiently. lzma_index_prealloc(coder->index, coder->count); ret = LZMA_OK; coder->sequence = coder->count == 0 ? SEQ_PADDING_INIT : SEQ_UNPADDED; break; case SEQ_UNPADDED: case SEQ_UNCOMPRESSED: { lzma_vli *size = coder->sequence == SEQ_UNPADDED ? &coder->unpadded_size : &coder->uncompressed_size; ret = lzma_vli_decode(size, &coder->pos, in, in_pos, in_size); if (ret != LZMA_STREAM_END) goto out; ret = LZMA_OK; coder->pos = 0; if (coder->sequence == SEQ_UNPADDED) { // Validate that encoded Unpadded Size isn't too small // or too big. if (coder->unpadded_size < UNPADDED_SIZE_MIN || coder->unpadded_size > UNPADDED_SIZE_MAX) return LZMA_DATA_ERROR; coder->sequence = SEQ_UNCOMPRESSED; } else { // Add the decoded Record to the Index. return_if_error(lzma_index_append( coder->index, allocator, coder->unpadded_size, coder->uncompressed_size)); // Check if this was the last Record. coder->sequence = --coder->count == 0 ? SEQ_PADDING_INIT : SEQ_UNPADDED; } break; } case SEQ_PADDING_INIT: coder->pos = lzma_index_padding_size(coder->index); coder->sequence = SEQ_PADDING; // Fall through case SEQ_PADDING: if (coder->pos > 0) { --coder->pos; if (in[(*in_pos)++] != 0x00) return LZMA_DATA_ERROR; break; } // Finish the CRC32 calculation. coder->crc32 = lzma_crc32(in + in_start, *in_pos - in_start, coder->crc32); coder->sequence = SEQ_CRC32; // Fall through case SEQ_CRC32: do { if (*in_pos == in_size) return LZMA_OK; if (((coder->crc32 >> (coder->pos * 8)) & 0xFF) != in[(*in_pos)++]) return LZMA_DATA_ERROR; } while (++coder->pos < 4); // Decoding was successful, now we can let the application // see the decoded Index. *coder->index_ptr = coder->index; // Make index NULL so we don't free it unintentionally. coder->index = NULL; return LZMA_STREAM_END; default: assert(0); return LZMA_PROG_ERROR; } out: // Update the CRC32, coder->crc32 = lzma_crc32(in + in_start, *in_pos - in_start, coder->crc32); return ret; } static void index_decoder_end(void *coder_ptr, const lzma_allocator *allocator) { lzma_index_coder *coder = coder_ptr; lzma_index_end(coder->index, allocator); lzma_free(coder, allocator); return; } static lzma_ret index_decoder_memconfig(void *coder_ptr, uint64_t *memusage, uint64_t *old_memlimit, uint64_t new_memlimit) { lzma_index_coder *coder = coder_ptr; *memusage = lzma_index_memusage(1, coder->count); *old_memlimit = coder->memlimit; if (new_memlimit != 0) { if (new_memlimit < *memusage) return LZMA_MEMLIMIT_ERROR; coder->memlimit = new_memlimit; } return LZMA_OK; } static lzma_ret index_decoder_reset(lzma_index_coder *coder, const lzma_allocator *allocator, lzma_index **i, uint64_t memlimit) { // Remember the pointer given by the application. We will set it // to point to the decoded Index only if decoding is successful. // Before that, keep it NULL so that applications can always safely // pass it to lzma_index_end() no matter did decoding succeed or not. coder->index_ptr = i; *i = NULL; // We always allocate a new lzma_index. coder->index = lzma_index_init(allocator); if (coder->index == NULL) return LZMA_MEM_ERROR; // Initialize the rest. coder->sequence = SEQ_INDICATOR; - coder->memlimit = memlimit; + coder->memlimit = my_max(1, memlimit); coder->count = 0; // Needs to be initialized due to _memconfig(). coder->pos = 0; coder->crc32 = 0; return LZMA_OK; } static lzma_ret index_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator, lzma_index **i, uint64_t memlimit) { lzma_next_coder_init(&index_decoder_init, next, allocator); - if (i == NULL || memlimit == 0) + if (i == NULL) return LZMA_PROG_ERROR; lzma_index_coder *coder = next->coder; if (coder == NULL) { coder = lzma_alloc(sizeof(lzma_index_coder), allocator); if (coder == NULL) return LZMA_MEM_ERROR; next->coder = coder; next->code = &index_decode; next->end = &index_decoder_end; next->memconfig = &index_decoder_memconfig; coder->index = NULL; } else { lzma_index_end(coder->index, allocator); } return index_decoder_reset(coder, allocator, i, memlimit); } extern LZMA_API(lzma_ret) lzma_index_decoder(lzma_stream *strm, lzma_index **i, uint64_t memlimit) { lzma_next_strm_init(index_decoder_init, strm, i, memlimit); strm->internal->supported_actions[LZMA_RUN] = true; strm->internal->supported_actions[LZMA_FINISH] = true; return LZMA_OK; } extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i, uint64_t *memlimit, const lzma_allocator *allocator, const uint8_t *in, size_t *in_pos, size_t in_size) { // Sanity checks if (i == NULL || memlimit == NULL || in == NULL || in_pos == NULL || *in_pos > in_size) return LZMA_PROG_ERROR; // Initialize the decoder. lzma_index_coder coder; return_if_error(index_decoder_reset(&coder, allocator, i, *memlimit)); // Store the input start position so that we can restore it in case // of an error. const size_t in_start = *in_pos; // Do the actual decoding. lzma_ret ret = index_decode(&coder, allocator, in, in_pos, in_size, NULL, NULL, 0, LZMA_RUN); if (ret == LZMA_STREAM_END) { ret = LZMA_OK; } else { // Something went wrong, free the Index structure and restore // the input position. lzma_index_end(coder.index, allocator); *in_pos = in_start; if (ret == LZMA_OK) { // The input is truncated or otherwise corrupt. // Use LZMA_DATA_ERROR instead of LZMA_BUF_ERROR // like lzma_vli_decode() does in single-call mode. ret = LZMA_DATA_ERROR; } else if (ret == LZMA_MEMLIMIT_ERROR) { // Tell the caller how much memory would have // been needed. *memlimit = lzma_index_memusage(1, coder.count); } } return ret; } Index: head/contrib/xz/src/liblzma/common/stream_decoder.c =================================================================== --- head/contrib/xz/src/liblzma/common/stream_decoder.c (revision 333782) +++ head/contrib/xz/src/liblzma/common/stream_decoder.c (revision 333783) @@ -1,470 +1,467 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file stream_decoder.c /// \brief Decodes .xz Streams // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "stream_decoder.h" #include "block_decoder.h" typedef struct { enum { SEQ_STREAM_HEADER, SEQ_BLOCK_HEADER, SEQ_BLOCK, SEQ_INDEX, SEQ_STREAM_FOOTER, SEQ_STREAM_PADDING, } sequence; /// Block or Metadata decoder. This takes little memory and the same /// data structure can be used to decode every Block Header, so it's /// a good idea to have a separate lzma_next_coder structure for it. lzma_next_coder block_decoder; /// Block options decoded by the Block Header decoder and used by /// the Block decoder. lzma_block block_options; /// Stream Flags from Stream Header lzma_stream_flags stream_flags; /// Index is hashed so that it can be compared to the sizes of Blocks /// with O(1) memory usage. lzma_index_hash *index_hash; /// Memory usage limit uint64_t memlimit; /// Amount of memory actually needed (only an estimate) uint64_t memusage; /// If true, LZMA_NO_CHECK is returned if the Stream has /// no integrity check. bool tell_no_check; /// If true, LZMA_UNSUPPORTED_CHECK is returned if the Stream has /// an integrity check that isn't supported by this liblzma build. bool tell_unsupported_check; /// If true, LZMA_GET_CHECK is returned after decoding Stream Header. bool tell_any_check; /// If true, we will tell the Block decoder to skip calculating /// and verifying the integrity check. bool ignore_check; /// If true, we will decode concatenated Streams that possibly have /// Stream Padding between or after them. LZMA_STREAM_END is returned /// once the application isn't giving us any new input, and we aren't /// in the middle of a Stream, and possible Stream Padding is a /// multiple of four bytes. bool concatenated; /// When decoding concatenated Streams, this is true as long as we /// are decoding the first Stream. This is needed to avoid misleading /// LZMA_FORMAT_ERROR in case the later Streams don't have valid magic /// bytes. bool first_stream; /// Write position in buffer[] and position in Stream Padding size_t pos; /// Buffer to hold Stream Header, Block Header, and Stream Footer. /// Block Header has biggest maximum size. uint8_t buffer[LZMA_BLOCK_HEADER_SIZE_MAX]; } lzma_stream_coder; static lzma_ret stream_decoder_reset(lzma_stream_coder *coder, const lzma_allocator *allocator) { // Initialize the Index hash used to verify the Index. coder->index_hash = lzma_index_hash_init(coder->index_hash, allocator); if (coder->index_hash == NULL) return LZMA_MEM_ERROR; // Reset the rest of the variables. coder->sequence = SEQ_STREAM_HEADER; coder->pos = 0; return LZMA_OK; } static lzma_ret stream_decode(void *coder_ptr, const lzma_allocator *allocator, const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size, uint8_t *restrict out, size_t *restrict out_pos, size_t out_size, lzma_action action) { lzma_stream_coder *coder = coder_ptr; // When decoding the actual Block, it may be able to produce more // output even if we don't give it any new input. while (true) switch (coder->sequence) { case SEQ_STREAM_HEADER: { // Copy the Stream Header to the internal buffer. lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos, LZMA_STREAM_HEADER_SIZE); // Return if we didn't get the whole Stream Header yet. if (coder->pos < LZMA_STREAM_HEADER_SIZE) return LZMA_OK; coder->pos = 0; // Decode the Stream Header. const lzma_ret ret = lzma_stream_header_decode( &coder->stream_flags, coder->buffer); if (ret != LZMA_OK) return ret == LZMA_FORMAT_ERROR && !coder->first_stream ? LZMA_DATA_ERROR : ret; // If we are decoding concatenated Streams, and the later // Streams have invalid Header Magic Bytes, we give // LZMA_DATA_ERROR instead of LZMA_FORMAT_ERROR. coder->first_stream = false; // Copy the type of the Check so that Block Header and Block // decoders see it. coder->block_options.check = coder->stream_flags.check; // Even if we return LZMA_*_CHECK below, we want // to continue from Block Header decoding. coder->sequence = SEQ_BLOCK_HEADER; // Detect if there's no integrity check or if it is // unsupported if those were requested by the application. if (coder->tell_no_check && coder->stream_flags.check == LZMA_CHECK_NONE) return LZMA_NO_CHECK; if (coder->tell_unsupported_check && !lzma_check_is_supported( coder->stream_flags.check)) return LZMA_UNSUPPORTED_CHECK; if (coder->tell_any_check) return LZMA_GET_CHECK; } // Fall through case SEQ_BLOCK_HEADER: { if (*in_pos >= in_size) return LZMA_OK; if (coder->pos == 0) { // Detect if it's Index. if (in[*in_pos] == 0x00) { coder->sequence = SEQ_INDEX; break; } // Calculate the size of the Block Header. Note that // Block Header decoder wants to see this byte too // so don't advance *in_pos. coder->block_options.header_size = lzma_block_header_size_decode( in[*in_pos]); } // Copy the Block Header to the internal buffer. lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos, coder->block_options.header_size); // Return if we didn't get the whole Block Header yet. if (coder->pos < coder->block_options.header_size) return LZMA_OK; coder->pos = 0; // Version 1 is needed to support the .ignore_check option. coder->block_options.version = 1; // Set up a buffer to hold the filter chain. Block Header // decoder will initialize all members of this array so // we don't need to do it here. lzma_filter filters[LZMA_FILTERS_MAX + 1]; coder->block_options.filters = filters; // Decode the Block Header. return_if_error(lzma_block_header_decode(&coder->block_options, allocator, coder->buffer)); // If LZMA_IGNORE_CHECK was used, this flag needs to be set. // It has to be set after lzma_block_header_decode() because // it always resets this to false. coder->block_options.ignore_check = coder->ignore_check; // Check the memory usage limit. const uint64_t memusage = lzma_raw_decoder_memusage(filters); lzma_ret ret; if (memusage == UINT64_MAX) { // One or more unknown Filter IDs. ret = LZMA_OPTIONS_ERROR; } else { // Now we can set coder->memusage since we know that // the filter chain is valid. We don't want // lzma_memusage() to return UINT64_MAX in case of // invalid filter chain. coder->memusage = memusage; if (memusage > coder->memlimit) { // The chain would need too much memory. ret = LZMA_MEMLIMIT_ERROR; } else { // Memory usage is OK. // Initialize the Block decoder. ret = lzma_block_decoder_init( &coder->block_decoder, allocator, &coder->block_options); } } // Free the allocated filter options since they are needed // only to initialize the Block decoder. for (size_t i = 0; i < LZMA_FILTERS_MAX; ++i) lzma_free(filters[i].options, allocator); coder->block_options.filters = NULL; // Check if memory usage calculation and Block enocoder // initialization succeeded. if (ret != LZMA_OK) return ret; coder->sequence = SEQ_BLOCK; } // Fall through case SEQ_BLOCK: { const lzma_ret ret = coder->block_decoder.code( coder->block_decoder.coder, allocator, in, in_pos, in_size, out, out_pos, out_size, action); if (ret != LZMA_STREAM_END) return ret; // Block decoded successfully. Add the new size pair to // the Index hash. return_if_error(lzma_index_hash_append(coder->index_hash, lzma_block_unpadded_size( &coder->block_options), coder->block_options.uncompressed_size)); coder->sequence = SEQ_BLOCK_HEADER; break; } case SEQ_INDEX: { // If we don't have any input, don't call // lzma_index_hash_decode() since it would return // LZMA_BUF_ERROR, which we must not do here. if (*in_pos >= in_size) return LZMA_OK; // Decode the Index and compare it to the hash calculated // from the sizes of the Blocks (if any). const lzma_ret ret = lzma_index_hash_decode(coder->index_hash, in, in_pos, in_size); if (ret != LZMA_STREAM_END) return ret; coder->sequence = SEQ_STREAM_FOOTER; } // Fall through case SEQ_STREAM_FOOTER: { // Copy the Stream Footer to the internal buffer. lzma_bufcpy(in, in_pos, in_size, coder->buffer, &coder->pos, LZMA_STREAM_HEADER_SIZE); // Return if we didn't get the whole Stream Footer yet. if (coder->pos < LZMA_STREAM_HEADER_SIZE) return LZMA_OK; coder->pos = 0; // Decode the Stream Footer. The decoder gives // LZMA_FORMAT_ERROR if the magic bytes don't match, // so convert that return code to LZMA_DATA_ERROR. lzma_stream_flags footer_flags; const lzma_ret ret = lzma_stream_footer_decode( &footer_flags, coder->buffer); if (ret != LZMA_OK) return ret == LZMA_FORMAT_ERROR ? LZMA_DATA_ERROR : ret; // Check that Index Size stored in the Stream Footer matches // the real size of the Index field. if (lzma_index_hash_size(coder->index_hash) != footer_flags.backward_size) return LZMA_DATA_ERROR; // Compare that the Stream Flags fields are identical in // both Stream Header and Stream Footer. return_if_error(lzma_stream_flags_compare( &coder->stream_flags, &footer_flags)); if (!coder->concatenated) return LZMA_STREAM_END; coder->sequence = SEQ_STREAM_PADDING; } // Fall through case SEQ_STREAM_PADDING: assert(coder->concatenated); // Skip over possible Stream Padding. while (true) { if (*in_pos >= in_size) { // Unless LZMA_FINISH was used, we cannot // know if there's more input coming later. if (action != LZMA_FINISH) return LZMA_OK; // Stream Padding must be a multiple of // four bytes. return coder->pos == 0 ? LZMA_STREAM_END : LZMA_DATA_ERROR; } // If the byte is not zero, it probably indicates // beginning of a new Stream (or the file is corrupt). if (in[*in_pos] != 0x00) break; ++*in_pos; coder->pos = (coder->pos + 1) & 3; } // Stream Padding must be a multiple of four bytes (empty // Stream Padding is OK). if (coder->pos != 0) { ++*in_pos; return LZMA_DATA_ERROR; } // Prepare to decode the next Stream. return_if_error(stream_decoder_reset(coder, allocator)); break; default: assert(0); return LZMA_PROG_ERROR; } // Never reached } static void stream_decoder_end(void *coder_ptr, const lzma_allocator *allocator) { lzma_stream_coder *coder = coder_ptr; lzma_next_end(&coder->block_decoder, allocator); lzma_index_hash_end(coder->index_hash, allocator); lzma_free(coder, allocator); return; } static lzma_check stream_decoder_get_check(const void *coder_ptr) { const lzma_stream_coder *coder = coder_ptr; return coder->stream_flags.check; } static lzma_ret stream_decoder_memconfig(void *coder_ptr, uint64_t *memusage, uint64_t *old_memlimit, uint64_t new_memlimit) { lzma_stream_coder *coder = coder_ptr; *memusage = coder->memusage; *old_memlimit = coder->memlimit; if (new_memlimit != 0) { if (new_memlimit < coder->memusage) return LZMA_MEMLIMIT_ERROR; coder->memlimit = new_memlimit; } return LZMA_OK; } extern lzma_ret lzma_stream_decoder_init( lzma_next_coder *next, const lzma_allocator *allocator, uint64_t memlimit, uint32_t flags) { lzma_next_coder_init(&lzma_stream_decoder_init, next, allocator); - if (memlimit == 0) - return LZMA_PROG_ERROR; - if (flags & ~LZMA_SUPPORTED_FLAGS) return LZMA_OPTIONS_ERROR; lzma_stream_coder *coder = next->coder; if (coder == NULL) { coder = lzma_alloc(sizeof(lzma_stream_coder), allocator); if (coder == NULL) return LZMA_MEM_ERROR; next->coder = coder; next->code = &stream_decode; next->end = &stream_decoder_end; next->get_check = &stream_decoder_get_check; next->memconfig = &stream_decoder_memconfig; coder->block_decoder = LZMA_NEXT_CODER_INIT; coder->index_hash = NULL; } - coder->memlimit = memlimit; + coder->memlimit = my_max(1, memlimit); coder->memusage = LZMA_MEMUSAGE_BASE; coder->tell_no_check = (flags & LZMA_TELL_NO_CHECK) != 0; coder->tell_unsupported_check = (flags & LZMA_TELL_UNSUPPORTED_CHECK) != 0; coder->tell_any_check = (flags & LZMA_TELL_ANY_CHECK) != 0; coder->ignore_check = (flags & LZMA_IGNORE_CHECK) != 0; coder->concatenated = (flags & LZMA_CONCATENATED) != 0; coder->first_stream = true; return stream_decoder_reset(coder, allocator); } extern LZMA_API(lzma_ret) lzma_stream_decoder(lzma_stream *strm, uint64_t memlimit, uint32_t flags) { lzma_next_strm_init(lzma_stream_decoder_init, strm, memlimit, flags); strm->internal->supported_actions[LZMA_RUN] = true; strm->internal->supported_actions[LZMA_FINISH] = true; return LZMA_OK; } Index: head/contrib/xz/src/liblzma/lzma/lzma_decoder.c =================================================================== --- head/contrib/xz/src/liblzma/lzma/lzma_decoder.c (revision 333782) +++ head/contrib/xz/src/liblzma/lzma/lzma_decoder.c (revision 333783) @@ -1,1058 +1,1064 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file lzma_decoder.c /// \brief LZMA decoder /// // Authors: Igor Pavlov // Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "lz_decoder.h" #include "lzma_common.h" #include "lzma_decoder.h" #include "range_decoder.h" +// The macros unroll loops with switch statements. +// Silence warnings about missing fall-through comments. +#if TUKLIB_GNUC_REQ(7, 0) +# pragma GCC diagnostic ignored "-Wimplicit-fallthrough" +#endif + #ifdef HAVE_SMALL // Macros for (somewhat) size-optimized code. #define seq_4(seq) seq #define seq_6(seq) seq #define seq_8(seq) seq #define seq_len(seq) \ seq ## _CHOICE, \ seq ## _CHOICE2, \ seq ## _BITTREE #define len_decode(target, ld, pos_state, seq) \ do { \ case seq ## _CHOICE: \ rc_if_0(ld.choice, seq ## _CHOICE) { \ rc_update_0(ld.choice); \ probs = ld.low[pos_state];\ limit = LEN_LOW_SYMBOLS; \ target = MATCH_LEN_MIN; \ } else { \ rc_update_1(ld.choice); \ case seq ## _CHOICE2: \ rc_if_0(ld.choice2, seq ## _CHOICE2) { \ rc_update_0(ld.choice2); \ probs = ld.mid[pos_state]; \ limit = LEN_MID_SYMBOLS; \ target = MATCH_LEN_MIN + LEN_LOW_SYMBOLS; \ } else { \ rc_update_1(ld.choice2); \ probs = ld.high; \ limit = LEN_HIGH_SYMBOLS; \ target = MATCH_LEN_MIN + LEN_LOW_SYMBOLS \ + LEN_MID_SYMBOLS; \ } \ } \ symbol = 1; \ case seq ## _BITTREE: \ do { \ rc_bit(probs[symbol], , , seq ## _BITTREE); \ } while (symbol < limit); \ target += symbol - limit; \ } while (0) #else // HAVE_SMALL // Unrolled versions #define seq_4(seq) \ seq ## 0, \ seq ## 1, \ seq ## 2, \ seq ## 3 #define seq_6(seq) \ seq ## 0, \ seq ## 1, \ seq ## 2, \ seq ## 3, \ seq ## 4, \ seq ## 5 #define seq_8(seq) \ seq ## 0, \ seq ## 1, \ seq ## 2, \ seq ## 3, \ seq ## 4, \ seq ## 5, \ seq ## 6, \ seq ## 7 #define seq_len(seq) \ seq ## _CHOICE, \ seq ## _LOW0, \ seq ## _LOW1, \ seq ## _LOW2, \ seq ## _CHOICE2, \ seq ## _MID0, \ seq ## _MID1, \ seq ## _MID2, \ seq ## _HIGH0, \ seq ## _HIGH1, \ seq ## _HIGH2, \ seq ## _HIGH3, \ seq ## _HIGH4, \ seq ## _HIGH5, \ seq ## _HIGH6, \ seq ## _HIGH7 #define len_decode(target, ld, pos_state, seq) \ do { \ symbol = 1; \ case seq ## _CHOICE: \ rc_if_0(ld.choice, seq ## _CHOICE) { \ rc_update_0(ld.choice); \ rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW0); \ rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW1); \ rc_bit_case(ld.low[pos_state][symbol], , , seq ## _LOW2); \ target = symbol - LEN_LOW_SYMBOLS + MATCH_LEN_MIN; \ } else { \ rc_update_1(ld.choice); \ case seq ## _CHOICE2: \ rc_if_0(ld.choice2, seq ## _CHOICE2) { \ rc_update_0(ld.choice2); \ rc_bit_case(ld.mid[pos_state][symbol], , , \ seq ## _MID0); \ rc_bit_case(ld.mid[pos_state][symbol], , , \ seq ## _MID1); \ rc_bit_case(ld.mid[pos_state][symbol], , , \ seq ## _MID2); \ target = symbol - LEN_MID_SYMBOLS \ + MATCH_LEN_MIN + LEN_LOW_SYMBOLS; \ } else { \ rc_update_1(ld.choice2); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH0); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH1); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH2); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH3); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH4); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH5); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH6); \ rc_bit_case(ld.high[symbol], , , seq ## _HIGH7); \ target = symbol - LEN_HIGH_SYMBOLS \ + MATCH_LEN_MIN \ + LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS; \ } \ } \ } while (0) #endif // HAVE_SMALL /// Length decoder probabilities; see comments in lzma_common.h. typedef struct { probability choice; probability choice2; probability low[POS_STATES_MAX][LEN_LOW_SYMBOLS]; probability mid[POS_STATES_MAX][LEN_MID_SYMBOLS]; probability high[LEN_HIGH_SYMBOLS]; } lzma_length_decoder; typedef struct { /////////////////// // Probabilities // /////////////////// /// Literals; see comments in lzma_common.h. probability literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE]; /// If 1, it's a match. Otherwise it's a single 8-bit literal. probability is_match[STATES][POS_STATES_MAX]; /// If 1, it's a repeated match. The distance is one of rep0 .. rep3. probability is_rep[STATES]; /// If 0, distance of a repeated match is rep0. /// Otherwise check is_rep1. probability is_rep0[STATES]; /// If 0, distance of a repeated match is rep1. /// Otherwise check is_rep2. probability is_rep1[STATES]; /// If 0, distance of a repeated match is rep2. Otherwise it is rep3. probability is_rep2[STATES]; /// If 1, the repeated match has length of one byte. Otherwise /// the length is decoded from rep_len_decoder. probability is_rep0_long[STATES][POS_STATES_MAX]; /// Probability tree for the highest two bits of the match distance. /// There is a separate probability tree for match lengths of /// 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273]. probability dist_slot[DIST_STATES][DIST_SLOTS]; /// Probability trees for additional bits for match distance when the /// distance is in the range [4, 127]. probability pos_special[FULL_DISTANCES - DIST_MODEL_END]; /// Probability tree for the lowest four bits of a match distance /// that is equal to or greater than 128. probability pos_align[ALIGN_SIZE]; /// Length of a normal match lzma_length_decoder match_len_decoder; /// Length of a repeated match lzma_length_decoder rep_len_decoder; /////////////////// // Decoder state // /////////////////// // Range coder lzma_range_decoder rc; // Types of the most recently seen LZMA symbols lzma_lzma_state state; uint32_t rep0; ///< Distance of the latest match uint32_t rep1; ///< Distance of second latest match uint32_t rep2; ///< Distance of third latest match uint32_t rep3; ///< Distance of fourth latest match uint32_t pos_mask; // (1U << pb) - 1 uint32_t literal_context_bits; uint32_t literal_pos_mask; /// Uncompressed size as bytes, or LZMA_VLI_UNKNOWN if end of /// payload marker is expected. lzma_vli uncompressed_size; //////////////////////////////// // State of incomplete symbol // //////////////////////////////// /// Position where to continue the decoder loop enum { SEQ_NORMALIZE, SEQ_IS_MATCH, seq_8(SEQ_LITERAL), seq_8(SEQ_LITERAL_MATCHED), SEQ_LITERAL_WRITE, SEQ_IS_REP, seq_len(SEQ_MATCH_LEN), seq_6(SEQ_DIST_SLOT), SEQ_DIST_MODEL, SEQ_DIRECT, seq_4(SEQ_ALIGN), SEQ_EOPM, SEQ_IS_REP0, SEQ_SHORTREP, SEQ_IS_REP0_LONG, SEQ_IS_REP1, SEQ_IS_REP2, seq_len(SEQ_REP_LEN), SEQ_COPY, } sequence; /// Base of the current probability tree probability *probs; /// Symbol being decoded. This is also used as an index variable in /// bittree decoders: probs[symbol] uint32_t symbol; /// Used as a loop termination condition on bittree decoders and /// direct bits decoder. uint32_t limit; /// Matched literal decoder: 0x100 or 0 to help avoiding branches. /// Bittree reverse decoders: Offset of the next bit: 1 << offset uint32_t offset; /// If decoding a literal: match byte. /// If decoding a match: length of the match. uint32_t len; } lzma_lzma1_decoder; static lzma_ret lzma_decode(void *coder_ptr, lzma_dict *restrict dictptr, const uint8_t *restrict in, size_t *restrict in_pos, size_t in_size) { lzma_lzma1_decoder *restrict coder = coder_ptr; //////////////////// // Initialization // //////////////////// { const lzma_ret ret = rc_read_init( &coder->rc, in, in_pos, in_size); if (ret != LZMA_STREAM_END) return ret; } /////////////// // Variables // /////////////// // Making local copies of often-used variables improves both // speed and readability. lzma_dict dict = *dictptr; const size_t dict_start = dict.pos; // Range decoder rc_to_local(coder->rc, *in_pos); // State uint32_t state = coder->state; uint32_t rep0 = coder->rep0; uint32_t rep1 = coder->rep1; uint32_t rep2 = coder->rep2; uint32_t rep3 = coder->rep3; const uint32_t pos_mask = coder->pos_mask; // These variables are actually needed only if we last time ran // out of input in the middle of the decoder loop. probability *probs = coder->probs; uint32_t symbol = coder->symbol; uint32_t limit = coder->limit; uint32_t offset = coder->offset; uint32_t len = coder->len; const uint32_t literal_pos_mask = coder->literal_pos_mask; const uint32_t literal_context_bits = coder->literal_context_bits; // Temporary variables uint32_t pos_state = dict.pos & pos_mask; lzma_ret ret = LZMA_OK; // If uncompressed size is known, there must be no end of payload // marker. const bool no_eopm = coder->uncompressed_size != LZMA_VLI_UNKNOWN; if (no_eopm && coder->uncompressed_size < dict.limit - dict.pos) dict.limit = dict.pos + (size_t)(coder->uncompressed_size); // The main decoder loop. The "switch" is used to restart the decoder at // correct location. Once restarted, the "switch" is no longer used. switch (coder->sequence) while (true) { // Calculate new pos_state. This is skipped on the first loop // since we already calculated it when setting up the local // variables. pos_state = dict.pos & pos_mask; case SEQ_NORMALIZE: case SEQ_IS_MATCH: if (unlikely(no_eopm && dict.pos == dict.limit)) break; rc_if_0(coder->is_match[state][pos_state], SEQ_IS_MATCH) { rc_update_0(coder->is_match[state][pos_state]); // It's a literal i.e. a single 8-bit byte. probs = literal_subcoder(coder->literal, literal_context_bits, literal_pos_mask, dict.pos, dict_get(&dict, 0)); symbol = 1; if (is_literal_state(state)) { // Decode literal without match byte. #ifdef HAVE_SMALL case SEQ_LITERAL: do { rc_bit(probs[symbol], , , SEQ_LITERAL); } while (symbol < (1 << 8)); #else rc_bit_case(probs[symbol], , , SEQ_LITERAL0); rc_bit_case(probs[symbol], , , SEQ_LITERAL1); rc_bit_case(probs[symbol], , , SEQ_LITERAL2); rc_bit_case(probs[symbol], , , SEQ_LITERAL3); rc_bit_case(probs[symbol], , , SEQ_LITERAL4); rc_bit_case(probs[symbol], , , SEQ_LITERAL5); rc_bit_case(probs[symbol], , , SEQ_LITERAL6); rc_bit_case(probs[symbol], , , SEQ_LITERAL7); #endif } else { // Decode literal with match byte. // // We store the byte we compare against // ("match byte") to "len" to minimize the // number of variables we need to store // between decoder calls. len = dict_get(&dict, rep0) << 1; // The usage of "offset" allows omitting some // branches, which should give tiny speed // improvement on some CPUs. "offset" gets // set to zero if match_bit didn't match. offset = 0x100; #ifdef HAVE_SMALL case SEQ_LITERAL_MATCHED: do { const uint32_t match_bit = len & offset; const uint32_t subcoder_index = offset + match_bit + symbol; rc_bit(probs[subcoder_index], offset &= ~match_bit, offset &= match_bit, SEQ_LITERAL_MATCHED); // It seems to be faster to do this // here instead of putting it to the // beginning of the loop and then // putting the "case" in the middle // of the loop. len <<= 1; } while (symbol < (1 << 8)); #else // Unroll the loop. uint32_t match_bit; uint32_t subcoder_index; # define d(seq) \ case seq: \ match_bit = len & offset; \ subcoder_index = offset + match_bit + symbol; \ rc_bit(probs[subcoder_index], \ offset &= ~match_bit, \ offset &= match_bit, \ seq) d(SEQ_LITERAL_MATCHED0); len <<= 1; d(SEQ_LITERAL_MATCHED1); len <<= 1; d(SEQ_LITERAL_MATCHED2); len <<= 1; d(SEQ_LITERAL_MATCHED3); len <<= 1; d(SEQ_LITERAL_MATCHED4); len <<= 1; d(SEQ_LITERAL_MATCHED5); len <<= 1; d(SEQ_LITERAL_MATCHED6); len <<= 1; d(SEQ_LITERAL_MATCHED7); # undef d #endif } //update_literal(state); // Use a lookup table to update to literal state, // since compared to other state updates, this would // need two branches. static const lzma_lzma_state next_state[] = { STATE_LIT_LIT, STATE_LIT_LIT, STATE_LIT_LIT, STATE_LIT_LIT, STATE_MATCH_LIT_LIT, STATE_REP_LIT_LIT, STATE_SHORTREP_LIT_LIT, STATE_MATCH_LIT, STATE_REP_LIT, STATE_SHORTREP_LIT, STATE_MATCH_LIT, STATE_REP_LIT }; state = next_state[state]; case SEQ_LITERAL_WRITE: if (unlikely(dict_put(&dict, symbol))) { coder->sequence = SEQ_LITERAL_WRITE; goto out; } continue; } // Instead of a new byte we are going to get a byte range // (distance and length) which will be repeated from our // output history. rc_update_1(coder->is_match[state][pos_state]); case SEQ_IS_REP: rc_if_0(coder->is_rep[state], SEQ_IS_REP) { // Not a repeated match rc_update_0(coder->is_rep[state]); update_match(state); // The latest three match distances are kept in // memory in case there are repeated matches. rep3 = rep2; rep2 = rep1; rep1 = rep0; // Decode the length of the match. len_decode(len, coder->match_len_decoder, pos_state, SEQ_MATCH_LEN); // Prepare to decode the highest two bits of the // match distance. probs = coder->dist_slot[get_dist_state(len)]; symbol = 1; #ifdef HAVE_SMALL case SEQ_DIST_SLOT: do { rc_bit(probs[symbol], , , SEQ_DIST_SLOT); } while (symbol < DIST_SLOTS); #else rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT0); rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT1); rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT2); rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT3); rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT4); rc_bit_case(probs[symbol], , , SEQ_DIST_SLOT5); #endif // Get rid of the highest bit that was needed for // indexing of the probability array. symbol -= DIST_SLOTS; assert(symbol <= 63); if (symbol < DIST_MODEL_START) { // Match distances [0, 3] have only two bits. rep0 = symbol; } else { // Decode the lowest [1, 29] bits of // the match distance. limit = (symbol >> 1) - 1; assert(limit >= 1 && limit <= 30); rep0 = 2 + (symbol & 1); if (symbol < DIST_MODEL_END) { // Prepare to decode the low bits for // a distance of [4, 127]. assert(limit <= 5); rep0 <<= limit; assert(rep0 <= 96); // -1 is fine, because we start // decoding at probs[1], not probs[0]. // NOTE: This violates the C standard, // since we are doing pointer // arithmetic past the beginning of // the array. assert((int32_t)(rep0 - symbol - 1) >= -1); assert((int32_t)(rep0 - symbol - 1) <= 82); probs = coder->pos_special + rep0 - symbol - 1; symbol = 1; offset = 0; case SEQ_DIST_MODEL: #ifdef HAVE_SMALL do { rc_bit(probs[symbol], , rep0 += 1 << offset, SEQ_DIST_MODEL); } while (++offset < limit); #else switch (limit) { case 5: assert(offset == 0); rc_bit(probs[symbol], , rep0 += 1, SEQ_DIST_MODEL); ++offset; --limit; case 4: rc_bit(probs[symbol], , rep0 += 1 << offset, SEQ_DIST_MODEL); ++offset; --limit; case 3: rc_bit(probs[symbol], , rep0 += 1 << offset, SEQ_DIST_MODEL); ++offset; --limit; case 2: rc_bit(probs[symbol], , rep0 += 1 << offset, SEQ_DIST_MODEL); ++offset; --limit; case 1: // We need "symbol" only for // indexing the probability // array, thus we can use // rc_bit_last() here to omit // the unneeded updating of // "symbol". rc_bit_last(probs[symbol], , rep0 += 1 << offset, SEQ_DIST_MODEL); } #endif } else { // The distance is >= 128. Decode the // lower bits without probabilities // except the lowest four bits. assert(symbol >= 14); assert(limit >= 6); limit -= ALIGN_BITS; assert(limit >= 2); case SEQ_DIRECT: // Not worth manual unrolling do { rc_direct(rep0, SEQ_DIRECT); } while (--limit > 0); // Decode the lowest four bits using // probabilities. rep0 <<= ALIGN_BITS; symbol = 1; #ifdef HAVE_SMALL offset = 0; case SEQ_ALIGN: do { rc_bit(coder->pos_align[ symbol], , rep0 += 1 << offset, SEQ_ALIGN); } while (++offset < ALIGN_BITS); #else case SEQ_ALIGN0: rc_bit(coder->pos_align[symbol], , rep0 += 1, SEQ_ALIGN0); case SEQ_ALIGN1: rc_bit(coder->pos_align[symbol], , rep0 += 2, SEQ_ALIGN1); case SEQ_ALIGN2: rc_bit(coder->pos_align[symbol], , rep0 += 4, SEQ_ALIGN2); case SEQ_ALIGN3: // Like in SEQ_DIST_MODEL, we don't // need "symbol" for anything else // than indexing the probability array. rc_bit_last(coder->pos_align[symbol], , rep0 += 8, SEQ_ALIGN3); #endif if (rep0 == UINT32_MAX) { // End of payload marker was // found. It must not be // present if uncompressed // size is known. if (coder->uncompressed_size != LZMA_VLI_UNKNOWN) { ret = LZMA_DATA_ERROR; goto out; } case SEQ_EOPM: // LZMA1 stream with // end-of-payload marker. rc_normalize(SEQ_EOPM); ret = LZMA_STREAM_END; goto out; } } } // Validate the distance we just decoded. if (unlikely(!dict_is_distance_valid(&dict, rep0))) { ret = LZMA_DATA_ERROR; goto out; } } else { rc_update_1(coder->is_rep[state]); // Repeated match // // The match distance is a value that we have had // earlier. The latest four match distances are // available as rep0, rep1, rep2 and rep3. We will // now decode which of them is the new distance. // // There cannot be a match if we haven't produced // any output, so check that first. if (unlikely(!dict_is_distance_valid(&dict, 0))) { ret = LZMA_DATA_ERROR; goto out; } case SEQ_IS_REP0: rc_if_0(coder->is_rep0[state], SEQ_IS_REP0) { rc_update_0(coder->is_rep0[state]); // The distance is rep0. case SEQ_IS_REP0_LONG: rc_if_0(coder->is_rep0_long[state][pos_state], SEQ_IS_REP0_LONG) { rc_update_0(coder->is_rep0_long[ state][pos_state]); update_short_rep(state); case SEQ_SHORTREP: if (unlikely(dict_put(&dict, dict_get( &dict, rep0)))) { coder->sequence = SEQ_SHORTREP; goto out; } continue; } // Repeating more than one byte at // distance of rep0. rc_update_1(coder->is_rep0_long[ state][pos_state]); } else { rc_update_1(coder->is_rep0[state]); case SEQ_IS_REP1: // The distance is rep1, rep2 or rep3. Once // we find out which one of these three, it // is stored to rep0 and rep1, rep2 and rep3 // are updated accordingly. rc_if_0(coder->is_rep1[state], SEQ_IS_REP1) { rc_update_0(coder->is_rep1[state]); const uint32_t distance = rep1; rep1 = rep0; rep0 = distance; } else { rc_update_1(coder->is_rep1[state]); case SEQ_IS_REP2: rc_if_0(coder->is_rep2[state], SEQ_IS_REP2) { rc_update_0(coder->is_rep2[ state]); const uint32_t distance = rep2; rep2 = rep1; rep1 = rep0; rep0 = distance; } else { rc_update_1(coder->is_rep2[ state]); const uint32_t distance = rep3; rep3 = rep2; rep2 = rep1; rep1 = rep0; rep0 = distance; } } } update_long_rep(state); // Decode the length of the repeated match. len_decode(len, coder->rep_len_decoder, pos_state, SEQ_REP_LEN); } ///////////////////////////////// // Repeat from history buffer. // ///////////////////////////////// // The length is always between these limits. There is no way // to trigger the algorithm to set len outside this range. assert(len >= MATCH_LEN_MIN); assert(len <= MATCH_LEN_MAX); case SEQ_COPY: // Repeat len bytes from distance of rep0. if (unlikely(dict_repeat(&dict, rep0, &len))) { coder->sequence = SEQ_COPY; goto out; } } rc_normalize(SEQ_NORMALIZE); coder->sequence = SEQ_IS_MATCH; out: // Save state // NOTE: Must not copy dict.limit. dictptr->pos = dict.pos; dictptr->full = dict.full; rc_from_local(coder->rc, *in_pos); coder->state = state; coder->rep0 = rep0; coder->rep1 = rep1; coder->rep2 = rep2; coder->rep3 = rep3; coder->probs = probs; coder->symbol = symbol; coder->limit = limit; coder->offset = offset; coder->len = len; // Update the remaining amount of uncompressed data if uncompressed // size was known. if (coder->uncompressed_size != LZMA_VLI_UNKNOWN) { coder->uncompressed_size -= dict.pos - dict_start; // Since there cannot be end of payload marker if the // uncompressed size was known, we check here if we // finished decoding. if (coder->uncompressed_size == 0 && ret == LZMA_OK && coder->sequence != SEQ_NORMALIZE) ret = coder->sequence == SEQ_IS_MATCH ? LZMA_STREAM_END : LZMA_DATA_ERROR; } // We can do an additional check in the range decoder to catch some // corrupted files. if (ret == LZMA_STREAM_END) { if (!rc_is_finished(coder->rc)) ret = LZMA_DATA_ERROR; // Reset the range decoder so that it is ready to reinitialize // for a new LZMA2 chunk. rc_reset(coder->rc); } return ret; } static void lzma_decoder_uncompressed(void *coder_ptr, lzma_vli uncompressed_size) { lzma_lzma1_decoder *coder = coder_ptr; coder->uncompressed_size = uncompressed_size; } static void lzma_decoder_reset(void *coder_ptr, const void *opt) { lzma_lzma1_decoder *coder = coder_ptr; const lzma_options_lzma *options = opt; // NOTE: We assume that lc/lp/pb are valid since they were // successfully decoded with lzma_lzma_decode_properties(). // Calculate pos_mask. We don't need pos_bits as is for anything. coder->pos_mask = (1U << options->pb) - 1; // Initialize the literal decoder. literal_init(coder->literal, options->lc, options->lp); coder->literal_context_bits = options->lc; coder->literal_pos_mask = (1U << options->lp) - 1; // State coder->state = STATE_LIT_LIT; coder->rep0 = 0; coder->rep1 = 0; coder->rep2 = 0; coder->rep3 = 0; coder->pos_mask = (1U << options->pb) - 1; // Range decoder rc_reset(coder->rc); // Bit and bittree decoders for (uint32_t i = 0; i < STATES; ++i) { for (uint32_t j = 0; j <= coder->pos_mask; ++j) { bit_reset(coder->is_match[i][j]); bit_reset(coder->is_rep0_long[i][j]); } bit_reset(coder->is_rep[i]); bit_reset(coder->is_rep0[i]); bit_reset(coder->is_rep1[i]); bit_reset(coder->is_rep2[i]); } for (uint32_t i = 0; i < DIST_STATES; ++i) bittree_reset(coder->dist_slot[i], DIST_SLOT_BITS); for (uint32_t i = 0; i < FULL_DISTANCES - DIST_MODEL_END; ++i) bit_reset(coder->pos_special[i]); bittree_reset(coder->pos_align, ALIGN_BITS); // Len decoders (also bit/bittree) const uint32_t num_pos_states = 1U << options->pb; bit_reset(coder->match_len_decoder.choice); bit_reset(coder->match_len_decoder.choice2); bit_reset(coder->rep_len_decoder.choice); bit_reset(coder->rep_len_decoder.choice2); for (uint32_t pos_state = 0; pos_state < num_pos_states; ++pos_state) { bittree_reset(coder->match_len_decoder.low[pos_state], LEN_LOW_BITS); bittree_reset(coder->match_len_decoder.mid[pos_state], LEN_MID_BITS); bittree_reset(coder->rep_len_decoder.low[pos_state], LEN_LOW_BITS); bittree_reset(coder->rep_len_decoder.mid[pos_state], LEN_MID_BITS); } bittree_reset(coder->match_len_decoder.high, LEN_HIGH_BITS); bittree_reset(coder->rep_len_decoder.high, LEN_HIGH_BITS); coder->sequence = SEQ_IS_MATCH; coder->probs = NULL; coder->symbol = 0; coder->limit = 0; coder->offset = 0; coder->len = 0; return; } extern lzma_ret lzma_lzma_decoder_create(lzma_lz_decoder *lz, const lzma_allocator *allocator, const void *opt, lzma_lz_options *lz_options) { if (lz->coder == NULL) { lz->coder = lzma_alloc(sizeof(lzma_lzma1_decoder), allocator); if (lz->coder == NULL) return LZMA_MEM_ERROR; lz->code = &lzma_decode; lz->reset = &lzma_decoder_reset; lz->set_uncompressed = &lzma_decoder_uncompressed; } // All dictionary sizes are OK here. LZ decoder will take care of // the special cases. const lzma_options_lzma *options = opt; lz_options->dict_size = options->dict_size; lz_options->preset_dict = options->preset_dict; lz_options->preset_dict_size = options->preset_dict_size; return LZMA_OK; } /// Allocate and initialize LZMA decoder. This is used only via LZ /// initialization (lzma_lzma_decoder_init() passes function pointer to /// the LZ initialization). static lzma_ret lzma_decoder_init(lzma_lz_decoder *lz, const lzma_allocator *allocator, const void *options, lzma_lz_options *lz_options) { if (!is_lclppb_valid(options)) return LZMA_PROG_ERROR; return_if_error(lzma_lzma_decoder_create( lz, allocator, options, lz_options)); lzma_decoder_reset(lz->coder, options); lzma_decoder_uncompressed(lz->coder, LZMA_VLI_UNKNOWN); return LZMA_OK; } extern lzma_ret lzma_lzma_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator, const lzma_filter_info *filters) { // LZMA can only be the last filter in the chain. This is enforced // by the raw_decoder initialization. assert(filters[1].init == NULL); return lzma_lz_decoder_init(next, allocator, filters, &lzma_decoder_init); } extern bool lzma_lzma_lclppb_decode(lzma_options_lzma *options, uint8_t byte) { if (byte > (4 * 5 + 4) * 9 + 8) return true; // See the file format specification to understand this. options->pb = byte / (9 * 5); byte -= options->pb * 9 * 5; options->lp = byte / 9; options->lc = byte - options->lp * 9; return options->lc + options->lp > LZMA_LCLP_MAX; } extern uint64_t lzma_lzma_decoder_memusage_nocheck(const void *options) { const lzma_options_lzma *const opt = options; return sizeof(lzma_lzma1_decoder) + lzma_lz_decoder_memusage(opt->dict_size); } extern uint64_t lzma_lzma_decoder_memusage(const void *options) { if (!is_lclppb_valid(options)) return UINT64_MAX; return lzma_lzma_decoder_memusage_nocheck(options); } extern lzma_ret lzma_lzma_props_decode(void **options, const lzma_allocator *allocator, const uint8_t *props, size_t props_size) { if (props_size != 5) return LZMA_OPTIONS_ERROR; lzma_options_lzma *opt = lzma_alloc(sizeof(lzma_options_lzma), allocator); if (opt == NULL) return LZMA_MEM_ERROR; if (lzma_lzma_lclppb_decode(opt, props[0])) goto error; // All dictionary sizes are accepted, including zero. LZ decoder // will automatically use a dictionary at least a few KiB even if // a smaller dictionary is requested. opt->dict_size = unaligned_read32le(props + 1); opt->preset_dict = NULL; opt->preset_dict_size = 0; *options = opt; return LZMA_OK; error: lzma_free(opt, allocator); return LZMA_OPTIONS_ERROR; } Index: head/contrib/xz/src/liblzma/rangecoder/range_common.h =================================================================== --- head/contrib/xz/src/liblzma/rangecoder/range_common.h (revision 333782) +++ head/contrib/xz/src/liblzma/rangecoder/range_common.h (revision 333783) @@ -1,73 +1,71 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file range_common.h /// \brief Common things for range encoder and decoder /// // Authors: Igor Pavlov // Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #ifndef LZMA_RANGE_COMMON_H #define LZMA_RANGE_COMMON_H -#ifdef HAVE_CONFIG_H -# include "common.h" -#endif +#include "common.h" /////////////// // Constants // /////////////// #define RC_SHIFT_BITS 8 #define RC_TOP_BITS 24 #define RC_TOP_VALUE (UINT32_C(1) << RC_TOP_BITS) #define RC_BIT_MODEL_TOTAL_BITS 11 #define RC_BIT_MODEL_TOTAL (UINT32_C(1) << RC_BIT_MODEL_TOTAL_BITS) #define RC_MOVE_BITS 5 //////////// // Macros // //////////// // Resets the probability so that both 0 and 1 have probability of 50 % #define bit_reset(prob) \ prob = RC_BIT_MODEL_TOTAL >> 1 // This does the same for a complete bit tree. // (A tree represented as an array.) #define bittree_reset(probs, bit_levels) \ for (uint32_t bt_i = 0; bt_i < (1 << (bit_levels)); ++bt_i) \ bit_reset((probs)[bt_i]) ////////////////////// // Type definitions // ////////////////////// /// \brief Type of probabilities used with range coder /// /// This needs to be at least 12-bit integer, so uint16_t is a logical choice. /// However, on some architecture and compiler combinations, a bigger type /// may give better speed, because the probability variables are accessed /// a lot. On the other hand, bigger probability type increases cache /// footprint, since there are 2 to 14 thousand probability variables in /// LZMA (assuming the limit of lc + lp <= 4; with lc + lp <= 12 there /// would be about 1.5 million variables). /// /// With malicious files, the initialization speed of the LZMA decoder can /// become important. In that case, smaller probability variables mean that /// there is less bytes to write to RAM, which makes initialization faster. /// With big probability type, the initialization can become so slow that it /// can be a problem e.g. for email servers doing virus scanning. /// /// I will be sticking to uint16_t unless some specific architectures /// are *much* faster (20-50 %) with uint32_t. typedef uint16_t probability; #endif Index: head/contrib/xz/src/xz/file_io.c =================================================================== --- head/contrib/xz/src/xz/file_io.c (revision 333782) +++ head/contrib/xz/src/xz/file_io.c (revision 333783) @@ -1,1294 +1,1300 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file file_io.c /// \brief File opening, unlinking, and closing // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "private.h" #include #ifdef TUKLIB_DOSLIKE # include #else # include static bool warn_fchown; #endif #if defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMES) # include #elif defined(HAVE__FUTIME) # include #elif defined(HAVE_UTIME) # include #endif #ifdef HAVE_CAPSICUM # ifdef HAVE_SYS_CAPSICUM_H # include # else # include # endif #endif #include "tuklib_open_stdxxx.h" #ifndef O_BINARY # define O_BINARY 0 #endif #ifndef O_NOCTTY # define O_NOCTTY 0 #endif // Using this macro to silence a warning from gcc -Wlogical-op. #if EAGAIN == EWOULDBLOCK # define IS_EAGAIN_OR_EWOULDBLOCK(e) ((e) == EAGAIN) #else # define IS_EAGAIN_OR_EWOULDBLOCK(e) \ ((e) == EAGAIN || (e) == EWOULDBLOCK) #endif typedef enum { IO_WAIT_MORE, // Reading or writing is possible. IO_WAIT_ERROR, // Error or user_abort IO_WAIT_TIMEOUT, // poll() timed out } io_wait_ret; /// If true, try to create sparse files when decompressing. static bool try_sparse = true; #ifdef ENABLE_SANDBOX /// True if the conditions for sandboxing (described in main()) have been met. static bool sandbox_allowed = false; #endif #ifndef TUKLIB_DOSLIKE /// File status flags of standard input. This is used by io_open_src() /// and io_close_src(). static int stdin_flags; static bool restore_stdin_flags = false; /// Original file status flags of standard output. This is used by /// io_open_dest() and io_close_dest() to save and restore the flags. static int stdout_flags; static bool restore_stdout_flags = false; /// Self-pipe used together with the user_abort variable to avoid /// race conditions with signal handling. static int user_abort_pipe[2]; #endif static bool io_write_buf(file_pair *pair, const uint8_t *buf, size_t size); extern void io_init(void) { // Make sure that stdin, stdout, and stderr are connected to // a valid file descriptor. Exit immediately with exit code ERROR // if we cannot make the file descriptors valid. Maybe we should // print an error message, but our stderr could be screwed anyway. tuklib_open_stdxxx(E_ERROR); #ifndef TUKLIB_DOSLIKE // If fchown() fails setting the owner, we warn about it only if // we are root. warn_fchown = geteuid() == 0; // Create a pipe for the self-pipe trick. if (pipe(user_abort_pipe)) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); // Make both ends of the pipe non-blocking. for (unsigned i = 0; i < 2; ++i) { int flags = fcntl(user_abort_pipe[i], F_GETFL); if (flags == -1 || fcntl(user_abort_pipe[i], F_SETFL, flags | O_NONBLOCK) == -1) message_fatal(_("Error creating a pipe: %s"), strerror(errno)); } #endif #ifdef __DJGPP__ // Avoid doing useless things when statting files. // This isn't important but doesn't hurt. _djstat_flags = _STAT_EXEC_EXT | _STAT_EXEC_MAGIC | _STAT_DIRSIZE; #endif return; } #ifndef TUKLIB_DOSLIKE extern void io_write_to_user_abort_pipe(void) { // If the write() fails, it's probably due to the pipe being full. // Failing in that case is fine. If the reason is something else, // there's not much we can do since this is called in a signal // handler. So ignore the errors and try to avoid warnings with // GCC and glibc when _FORTIFY_SOURCE=2 is used. uint8_t b = '\0'; const int ret = write(user_abort_pipe[1], &b, 1); (void)ret; return; } #endif extern void io_no_sparse(void) { try_sparse = false; return; } #ifdef ENABLE_SANDBOX extern void io_allow_sandbox(void) { sandbox_allowed = true; return; } /// Enables operating-system-specific sandbox if it is possible. /// src_fd is the file descriptor of the input file. static void io_sandbox_enter(int src_fd) { if (!sandbox_allowed) { message(V_DEBUG, _("Sandbox is disabled due " "to incompatible command line arguments")); return; } const char dummy_str[] = "x"; // Try to ensure that both libc and xz locale files have been // loaded when NLS is enabled. snprintf(NULL, 0, "%s%s", _(dummy_str), strerror(EINVAL)); // Try to ensure that iconv data files needed for handling multibyte // characters have been loaded. This is needed at least with glibc. tuklib_mbstr_width(dummy_str, NULL); #ifdef HAVE_CAPSICUM // Capsicum needs FreeBSD 10.0 or later. cap_rights_t rights; if (cap_rights_limit(src_fd, cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_LOOKUP, CAP_READ, CAP_SEEK))) goto error; if (cap_rights_limit(STDOUT_FILENO, cap_rights_init(&rights, CAP_EVENT, CAP_FCNTL, CAP_FSTAT, CAP_LOOKUP, CAP_WRITE, CAP_SEEK))) goto error; if (cap_rights_limit(user_abort_pipe[0], cap_rights_init(&rights, CAP_EVENT))) goto error; if (cap_rights_limit(user_abort_pipe[1], cap_rights_init(&rights, CAP_WRITE))) goto error; if (cap_enter()) goto error; #else # error ENABLE_SANDBOX is defined but no sandboxing method was found. #endif message(V_DEBUG, _("Sandbox was successfully enabled")); return; error: message(V_DEBUG, _("Failed to enable the sandbox")); } #endif // ENABLE_SANDBOX #ifndef TUKLIB_DOSLIKE /// \brief Waits for input or output to become available or for a signal /// /// This uses the self-pipe trick to avoid a race condition that can occur /// if a signal is caught after user_abort has been checked but before e.g. /// read() has been called. In that situation read() could block unless /// non-blocking I/O is used. With non-blocking I/O something like select() /// or poll() is needed to avoid a busy-wait loop, and the same race condition /// pops up again. There are pselect() (POSIX-1.2001) and ppoll() (not in /// POSIX) but neither is portable enough in 2013. The self-pipe trick is /// old and very portable. static io_wait_ret io_wait(file_pair *pair, int timeout, bool is_reading) { struct pollfd pfd[2]; if (is_reading) { pfd[0].fd = pair->src_fd; pfd[0].events = POLLIN; } else { pfd[0].fd = pair->dest_fd; pfd[0].events = POLLOUT; } pfd[1].fd = user_abort_pipe[0]; pfd[1].events = POLLIN; while (true) { const int ret = poll(pfd, 2, timeout); if (user_abort) return IO_WAIT_ERROR; if (ret == -1) { if (errno == EINTR || errno == EAGAIN) continue; message_error(_("%s: poll() failed: %s"), is_reading ? pair->src_name : pair->dest_name, strerror(errno)); return IO_WAIT_ERROR; } if (ret == 0) { assert(opt_flush_timeout != 0); flush_needed = true; return IO_WAIT_TIMEOUT; } if (pfd[0].revents != 0) return IO_WAIT_MORE; } } #endif /// \brief Unlink a file /// /// This tries to verify that the file being unlinked really is the file that /// we want to unlink by verifying device and inode numbers. There's still /// a small unavoidable race, but this is much better than nothing (the file /// could have been moved/replaced even hours earlier). static void io_unlink(const char *name, const struct stat *known_st) { #if defined(TUKLIB_DOSLIKE) // On DOS-like systems, st_ino is meaningless, so don't bother // testing it. Just silence a compiler warning. (void)known_st; #else struct stat new_st; // If --force was used, use stat() instead of lstat(). This way // (de)compressing symlinks works correctly. However, it also means // that xz cannot detect if a regular file foo is renamed to bar // and then a symlink foo -> bar is created. Because of stat() // instead of lstat(), xz will think that foo hasn't been replaced // with another file. Thus, xz will remove foo even though it no // longer is the same file that xz used when it started compressing. // Probably it's not too bad though, so this doesn't need a more // complex fix. const int stat_ret = opt_force ? stat(name, &new_st) : lstat(name, &new_st); if (stat_ret # ifdef __VMS // st_ino is an array, and we don't want to // compare st_dev at all. || memcmp(&new_st.st_ino, &known_st->st_ino, sizeof(new_st.st_ino)) != 0 # else // Typical POSIX-like system || new_st.st_dev != known_st->st_dev || new_st.st_ino != known_st->st_ino # endif ) // TRANSLATORS: When compression or decompression finishes, // and xz is going to remove the source file, xz first checks // if the source file still exists, and if it does, does its // device and inode numbers match what xz saw when it opened // the source file. If these checks fail, this message is // shown, %s being the filename, and the file is not deleted. // The check for device and inode numbers is there, because // it is possible that the user has put a new file in place // of the original file, and in that case it obviously // shouldn't be removed. message_error(_("%s: File seems to have been moved, " "not removing"), name); else #endif // There's a race condition between lstat() and unlink() // but at least we have tried to avoid removing wrong file. if (unlink(name)) message_error(_("%s: Cannot remove: %s"), name, strerror(errno)); return; } /// \brief Copies owner/group and permissions /// /// \todo ACL and EA support /// static void io_copy_attrs(const file_pair *pair) { // Skip chown and chmod on Windows. #ifndef TUKLIB_DOSLIKE // This function is more tricky than you may think at first. // Blindly copying permissions may permit users to access the // destination file who didn't have permission to access the // source file. // Try changing the owner of the file. If we aren't root or the owner // isn't already us, fchown() probably doesn't succeed. We warn // about failing fchown() only if we are root. if (fchown(pair->dest_fd, pair->src_st.st_uid, -1) && warn_fchown) message_warning(_("%s: Cannot set the file owner: %s"), pair->dest_name, strerror(errno)); mode_t mode; if (fchown(pair->dest_fd, -1, pair->src_st.st_gid)) { message_warning(_("%s: Cannot set the file group: %s"), pair->dest_name, strerror(errno)); // We can still safely copy some additional permissions: // `group' must be at least as strict as `other' and // also vice versa. // // NOTE: After this, the owner of the source file may // get additional permissions. This shouldn't be too bad, // because the owner would have had permission to chmod // the original file anyway. mode = ((pair->src_st.st_mode & 0070) >> 3) & (pair->src_st.st_mode & 0007); mode = (pair->src_st.st_mode & 0700) | (mode << 3) | mode; } else { // Drop the setuid, setgid, and sticky bits. mode = pair->src_st.st_mode & 0777; } if (fchmod(pair->dest_fd, mode)) message_warning(_("%s: Cannot set the file permissions: %s"), pair->dest_name, strerror(errno)); #endif // Copy the timestamps. We have several possible ways to do this, of // which some are better in both security and precision. // // First, get the nanosecond part of the timestamps. As of writing, // it's not standardized by POSIX, and there are several names for // the same thing in struct stat. long atime_nsec; long mtime_nsec; # if defined(HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC) // GNU and Solaris atime_nsec = pair->src_st.st_atim.tv_nsec; mtime_nsec = pair->src_st.st_mtim.tv_nsec; # elif defined(HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC) // BSD atime_nsec = pair->src_st.st_atimespec.tv_nsec; mtime_nsec = pair->src_st.st_mtimespec.tv_nsec; # elif defined(HAVE_STRUCT_STAT_ST_ATIMENSEC) // GNU and BSD without extensions atime_nsec = pair->src_st.st_atimensec; mtime_nsec = pair->src_st.st_mtimensec; # elif defined(HAVE_STRUCT_STAT_ST_UATIME) // Tru64 atime_nsec = pair->src_st.st_uatime * 1000; mtime_nsec = pair->src_st.st_umtime * 1000; # elif defined(HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC) // UnixWare atime_nsec = pair->src_st.st_atim.st__tim.tv_nsec; mtime_nsec = pair->src_st.st_mtim.st__tim.tv_nsec; # else // Safe fallback atime_nsec = 0; mtime_nsec = 0; # endif // Construct a structure to hold the timestamps and call appropriate // function to set the timestamps. #if defined(HAVE_FUTIMENS) // Use nanosecond precision. struct timespec tv[2]; tv[0].tv_sec = pair->src_st.st_atime; tv[0].tv_nsec = atime_nsec; tv[1].tv_sec = pair->src_st.st_mtime; tv[1].tv_nsec = mtime_nsec; (void)futimens(pair->dest_fd, tv); #elif defined(HAVE_FUTIMES) || defined(HAVE_FUTIMESAT) || defined(HAVE_UTIMES) // Use microsecond precision. struct timeval tv[2]; tv[0].tv_sec = pair->src_st.st_atime; tv[0].tv_usec = atime_nsec / 1000; tv[1].tv_sec = pair->src_st.st_mtime; tv[1].tv_usec = mtime_nsec / 1000; # if defined(HAVE_FUTIMES) (void)futimes(pair->dest_fd, tv); # elif defined(HAVE_FUTIMESAT) (void)futimesat(pair->dest_fd, NULL, tv); # else // Argh, no function to use a file descriptor to set the timestamp. (void)utimes(pair->dest_name, tv); # endif #elif defined(HAVE__FUTIME) // Use one-second precision with Windows-specific _futime(). // We could use utime() too except that for some reason the // timestamp will get reset at close(). With _futime() it works. // This struct cannot be const as _futime() takes a non-const pointer. struct _utimbuf buf = { .actime = pair->src_st.st_atime, .modtime = pair->src_st.st_mtime, }; // Avoid warnings. (void)atime_nsec; (void)mtime_nsec; (void)_futime(pair->dest_fd, &buf); #elif defined(HAVE_UTIME) // Use one-second precision. utime() doesn't support using file // descriptor either. Some systems have broken utime() prototype // so don't make this const. struct utimbuf buf = { .actime = pair->src_st.st_atime, .modtime = pair->src_st.st_mtime, }; // Avoid warnings. (void)atime_nsec; (void)mtime_nsec; (void)utime(pair->dest_name, &buf); #endif return; } /// Opens the source file. Returns false on success, true on error. static bool io_open_src_real(file_pair *pair) { // There's nothing to open when reading from stdin. if (pair->src_name == stdin_filename) { pair->src_fd = STDIN_FILENO; #ifdef TUKLIB_DOSLIKE setmode(STDIN_FILENO, O_BINARY); #else // Try to set stdin to non-blocking mode. It won't work // e.g. on OpenBSD if stdout is e.g. /dev/null. In such // case we proceed as if stdin were non-blocking anyway // (in case of /dev/null it will be in practice). The // same applies to stdout in io_open_dest_real(). stdin_flags = fcntl(STDIN_FILENO, F_GETFL); if (stdin_flags == -1) { message_error(_("Error getting the file status flags " "from standard input: %s"), strerror(errno)); return true; } if ((stdin_flags & O_NONBLOCK) == 0 && fcntl(STDIN_FILENO, F_SETFL, stdin_flags | O_NONBLOCK) != -1) restore_stdin_flags = true; #endif #ifdef HAVE_POSIX_FADVISE // It will fail if stdin is a pipe and that's fine. - (void)posix_fadvise(STDIN_FILENO, 0, 0, POSIX_FADV_SEQUENTIAL); + (void)posix_fadvise(STDIN_FILENO, 0, 0, + opt_mode == MODE_LIST + ? POSIX_FADV_RANDOM + : POSIX_FADV_SEQUENTIAL); #endif return false; } // Symlinks are not followed unless writing to stdout or --force // was used. const bool follow_symlinks = opt_stdout || opt_force; // We accept only regular files if we are writing the output // to disk too. bzip2 allows overriding this with --force but // gzip and xz don't. const bool reg_files_only = !opt_stdout; // Flags for open() int flags = O_RDONLY | O_BINARY | O_NOCTTY; #ifndef TUKLIB_DOSLIKE // Use non-blocking I/O: // - It prevents blocking when opening FIFOs and some other // special files, which is good if we want to accept only // regular files. // - It can help avoiding some race conditions with signal handling. flags |= O_NONBLOCK; #endif #if defined(O_NOFOLLOW) if (!follow_symlinks) flags |= O_NOFOLLOW; #elif !defined(TUKLIB_DOSLIKE) // Some POSIX-like systems lack O_NOFOLLOW (it's not required // by POSIX). Check for symlinks with a separate lstat() on // these systems. if (!follow_symlinks) { struct stat st; if (lstat(pair->src_name, &st)) { message_error("%s: %s", pair->src_name, strerror(errno)); return true; } else if (S_ISLNK(st.st_mode)) { message_warning(_("%s: Is a symbolic link, " "skipping"), pair->src_name); return true; } } #else // Avoid warnings. (void)follow_symlinks; #endif // Try to open the file. Signals have been blocked so EINTR shouldn't // be possible. pair->src_fd = open(pair->src_name, flags); if (pair->src_fd == -1) { // Signals (that have a signal handler) have been blocked. assert(errno != EINTR); #ifdef O_NOFOLLOW // Give an understandable error message if the reason // for failing was that the file was a symbolic link. // // Note that at least Linux, OpenBSD, Solaris, and Darwin // use ELOOP to indicate that O_NOFOLLOW was the reason // that open() failed. Because there may be // directories in the pathname, ELOOP may occur also // because of a symlink loop in the directory part. // So ELOOP doesn't tell us what actually went wrong, // and this stupidity went into POSIX-1.2008 too. // // FreeBSD associates EMLINK with O_NOFOLLOW and // Tru64 uses ENOTSUP. We use these directly here // and skip the lstat() call and the associated race. // I want to hear if there are other kernels that // fail with something else than ELOOP with O_NOFOLLOW. bool was_symlink = false; # if defined(__FreeBSD__) || defined(__DragonFly__) if (errno == EMLINK) was_symlink = true; # elif defined(__digital__) && defined(__unix__) if (errno == ENOTSUP) was_symlink = true; # elif defined(__NetBSD__) if (errno == EFTYPE) was_symlink = true; # else if (errno == ELOOP && !follow_symlinks) { const int saved_errno = errno; struct stat st; if (lstat(pair->src_name, &st) == 0 && S_ISLNK(st.st_mode)) was_symlink = true; errno = saved_errno; } # endif if (was_symlink) message_warning(_("%s: Is a symbolic link, " "skipping"), pair->src_name); else #endif // Something else than O_NOFOLLOW failing // (assuming that the race conditions didn't // confuse us). message_error("%s: %s", pair->src_name, strerror(errno)); return true; } // Stat the source file. We need the result also when we copy // the permissions, and when unlinking. // // NOTE: Use stat() instead of fstat() with DJGPP, because // then we have a better chance to get st_ino value that can // be used in io_open_dest_real() to prevent overwriting the // source file. #ifdef __DJGPP__ if (stat(pair->src_name, &pair->src_st)) goto error_msg; #else if (fstat(pair->src_fd, &pair->src_st)) goto error_msg; #endif if (S_ISDIR(pair->src_st.st_mode)) { message_warning(_("%s: Is a directory, skipping"), pair->src_name); goto error; } if (reg_files_only && !S_ISREG(pair->src_st.st_mode)) { message_warning(_("%s: Not a regular file, skipping"), pair->src_name); goto error; } #ifndef TUKLIB_DOSLIKE if (reg_files_only && !opt_force) { if (pair->src_st.st_mode & (S_ISUID | S_ISGID)) { // gzip rejects setuid and setgid files even // when --force was used. bzip2 doesn't check // for them, but calls fchown() after fchmod(), // and many systems automatically drop setuid // and setgid bits there. // // We accept setuid and setgid files if // --force was used. We drop these bits // explicitly in io_copy_attr(). message_warning(_("%s: File has setuid or " "setgid bit set, skipping"), pair->src_name); goto error; } if (pair->src_st.st_mode & S_ISVTX) { message_warning(_("%s: File has sticky bit " "set, skipping"), pair->src_name); goto error; } if (pair->src_st.st_nlink > 1) { message_warning(_("%s: Input file has more " "than one hard link, " "skipping"), pair->src_name); goto error; } } // If it is something else than a regular file, wait until // there is input available. This way reading from FIFOs // will work when open() is used with O_NONBLOCK. if (!S_ISREG(pair->src_st.st_mode)) { signals_unblock(); const io_wait_ret ret = io_wait(pair, -1, true); signals_block(); if (ret != IO_WAIT_MORE) goto error; } #endif #ifdef HAVE_POSIX_FADVISE // It will fail with some special files like FIFOs but that is fine. - (void)posix_fadvise(pair->src_fd, 0, 0, POSIX_FADV_SEQUENTIAL); + (void)posix_fadvise(pair->src_fd, 0, 0, + opt_mode == MODE_LIST + ? POSIX_FADV_RANDOM + : POSIX_FADV_SEQUENTIAL); #endif return false; error_msg: message_error("%s: %s", pair->src_name, strerror(errno)); error: (void)close(pair->src_fd); return true; } extern file_pair * io_open_src(const char *src_name) { if (is_empty_filename(src_name)) return NULL; // Since we have only one file open at a time, we can use // a statically allocated structure. static file_pair pair; pair = (file_pair){ .src_name = src_name, .dest_name = NULL, .src_fd = -1, .dest_fd = -1, .src_eof = false, .dest_try_sparse = false, .dest_pending_sparse = 0, }; // Block the signals, for which we have a custom signal handler, so // that we don't need to worry about EINTR. signals_block(); const bool error = io_open_src_real(&pair); signals_unblock(); #ifdef ENABLE_SANDBOX if (!error) io_sandbox_enter(pair.src_fd); #endif return error ? NULL : &pair; } /// \brief Closes source file of the file_pair structure /// /// \param pair File whose src_fd should be closed /// \param success If true, the file will be removed from the disk if /// closing succeeds and --keep hasn't been used. static void io_close_src(file_pair *pair, bool success) { #ifndef TUKLIB_DOSLIKE if (restore_stdin_flags) { assert(pair->src_fd == STDIN_FILENO); restore_stdin_flags = false; if (fcntl(STDIN_FILENO, F_SETFL, stdin_flags) == -1) message_error(_("Error restoring the status flags " "to standard input: %s"), strerror(errno)); } #endif if (pair->src_fd != STDIN_FILENO && pair->src_fd != -1) { // Close the file before possibly unlinking it. On DOS-like // systems this is always required since unlinking will fail // if the file is open. On POSIX systems it usually works // to unlink open files, but in some cases it doesn't and // one gets EBUSY in errno. // // xz 5.2.2 and older unlinked the file before closing it // (except on DOS-like systems). The old code didn't handle // EBUSY and could fail e.g. on some CIFS shares. The // advantage of unlinking before closing is negligible // (avoids a race between close() and stat()/lstat() and // unlink()), so let's keep this simple. (void)close(pair->src_fd); if (success && !opt_keep_original) io_unlink(pair->src_name, &pair->src_st); } return; } static bool io_open_dest_real(file_pair *pair) { if (opt_stdout || pair->src_fd == STDIN_FILENO) { // We don't modify or free() this. pair->dest_name = (char *)"(stdout)"; pair->dest_fd = STDOUT_FILENO; #ifdef TUKLIB_DOSLIKE setmode(STDOUT_FILENO, O_BINARY); #else // Try to set O_NONBLOCK if it isn't already set. // If it fails, we assume that stdout is non-blocking // in practice. See the comments in io_open_src_real() // for similar situation with stdin. // // NOTE: O_APPEND may be unset later in this function // and it relies on stdout_flags being set here. stdout_flags = fcntl(STDOUT_FILENO, F_GETFL); if (stdout_flags == -1) { message_error(_("Error getting the file status flags " "from standard output: %s"), strerror(errno)); return true; } if ((stdout_flags & O_NONBLOCK) == 0 && fcntl(STDOUT_FILENO, F_SETFL, stdout_flags | O_NONBLOCK) != -1) restore_stdout_flags = true; #endif } else { pair->dest_name = suffix_get_dest_name(pair->src_name); if (pair->dest_name == NULL) return true; #ifdef __DJGPP__ struct stat st; if (stat(pair->dest_name, &st) == 0) { // Check that it isn't a special file like "prn". if (st.st_dev == -1) { message_error("%s: Refusing to write to " "a DOS special file", pair->dest_name); free(pair->dest_name); return true; } // Check that we aren't overwriting the source file. if (st.st_dev == pair->src_st.st_dev && st.st_ino == pair->src_st.st_ino) { message_error("%s: Output file is the same " "as the input file", pair->dest_name); free(pair->dest_name); return true; } } #endif // If --force was used, unlink the target file first. if (opt_force && unlink(pair->dest_name) && errno != ENOENT) { message_error(_("%s: Cannot remove: %s"), pair->dest_name, strerror(errno)); free(pair->dest_name); return true; } // Open the file. int flags = O_WRONLY | O_BINARY | O_NOCTTY | O_CREAT | O_EXCL; #ifndef TUKLIB_DOSLIKE flags |= O_NONBLOCK; #endif const mode_t mode = S_IRUSR | S_IWUSR; pair->dest_fd = open(pair->dest_name, flags, mode); if (pair->dest_fd == -1) { message_error("%s: %s", pair->dest_name, strerror(errno)); free(pair->dest_name); return true; } } #ifndef TUKLIB_DOSLIKE // dest_st isn't used on DOS-like systems except as a dummy // argument to io_unlink(), so don't fstat() on such systems. if (fstat(pair->dest_fd, &pair->dest_st)) { // If fstat() really fails, we have a safe fallback here. # if defined(__VMS) pair->dest_st.st_ino[0] = 0; pair->dest_st.st_ino[1] = 0; pair->dest_st.st_ino[2] = 0; # else pair->dest_st.st_dev = 0; pair->dest_st.st_ino = 0; # endif } else if (try_sparse && opt_mode == MODE_DECOMPRESS) { // When writing to standard output, we need to be extra // careful: // - It may be connected to something else than // a regular file. // - We aren't necessarily writing to a new empty file // or to the end of an existing file. // - O_APPEND may be active. // // TODO: I'm keeping this disabled for DOS-like systems // for now. FAT doesn't support sparse files, but NTFS // does, so maybe this should be enabled on Windows after // some testing. if (pair->dest_fd == STDOUT_FILENO) { if (!S_ISREG(pair->dest_st.st_mode)) return false; if (stdout_flags & O_APPEND) { // Creating a sparse file is not possible // when O_APPEND is active (it's used by // shell's >> redirection). As I understand // it, it is safe to temporarily disable // O_APPEND in xz, because if someone // happened to write to the same file at the // same time, results would be bad anyway // (users shouldn't assume that xz uses any // specific block size when writing data). // // The write position may be something else // than the end of the file, so we must fix // it to start writing at the end of the file // to imitate O_APPEND. if (lseek(STDOUT_FILENO, 0, SEEK_END) == -1) return false; // Construct the new file status flags. // If O_NONBLOCK was set earlier in this // function, it must be kept here too. int flags = stdout_flags & ~O_APPEND; if (restore_stdout_flags) flags |= O_NONBLOCK; // If this fcntl() fails, we continue but won't // try to create sparse output. The original // flags will still be restored if needed (to // unset O_NONBLOCK) when the file is finished. if (fcntl(STDOUT_FILENO, F_SETFL, flags) == -1) return false; // Disabling O_APPEND succeeded. Mark // that the flags should be restored // in io_close_dest(). (This may have already // been set when enabling O_NONBLOCK.) restore_stdout_flags = true; } else if (lseek(STDOUT_FILENO, 0, SEEK_CUR) != pair->dest_st.st_size) { // Writing won't start exactly at the end // of the file. We cannot use sparse output, // because it would probably corrupt the file. return false; } } pair->dest_try_sparse = true; } #endif return false; } extern bool io_open_dest(file_pair *pair) { signals_block(); const bool ret = io_open_dest_real(pair); signals_unblock(); return ret; } /// \brief Closes destination file of the file_pair structure /// /// \param pair File whose dest_fd should be closed /// \param success If false, the file will be removed from the disk. /// /// \return Zero if closing succeeds. On error, -1 is returned and /// error message printed. static bool io_close_dest(file_pair *pair, bool success) { #ifndef TUKLIB_DOSLIKE // If io_open_dest() has disabled O_APPEND, restore it here. if (restore_stdout_flags) { assert(pair->dest_fd == STDOUT_FILENO); restore_stdout_flags = false; if (fcntl(STDOUT_FILENO, F_SETFL, stdout_flags) == -1) { message_error(_("Error restoring the O_APPEND flag " "to standard output: %s"), strerror(errno)); return true; } } #endif if (pair->dest_fd == -1 || pair->dest_fd == STDOUT_FILENO) return false; if (close(pair->dest_fd)) { message_error(_("%s: Closing the file failed: %s"), pair->dest_name, strerror(errno)); // Closing destination file failed, so we cannot trust its // contents. Get rid of junk: io_unlink(pair->dest_name, &pair->dest_st); free(pair->dest_name); return true; } // If the operation using this file wasn't successful, we git rid // of the junk file. if (!success) io_unlink(pair->dest_name, &pair->dest_st); free(pair->dest_name); return false; } extern void io_close(file_pair *pair, bool success) { // Take care of sparseness at the end of the output file. if (success && pair->dest_try_sparse && pair->dest_pending_sparse > 0) { // Seek forward one byte less than the size of the pending // hole, then write one zero-byte. This way the file grows // to its correct size. An alternative would be to use // ftruncate() but that isn't portable enough (e.g. it // doesn't work with FAT on Linux; FAT isn't that important // since it doesn't support sparse files anyway, but we don't // want to create corrupt files on it). if (lseek(pair->dest_fd, pair->dest_pending_sparse - 1, SEEK_CUR) == -1) { message_error(_("%s: Seeking failed when trying " "to create a sparse file: %s"), pair->dest_name, strerror(errno)); success = false; } else { const uint8_t zero[1] = { '\0' }; if (io_write_buf(pair, zero, 1)) success = false; } } signals_block(); // Copy the file attributes. We need to skip this if destination // file isn't open or it is standard output. if (success && pair->dest_fd != -1 && pair->dest_fd != STDOUT_FILENO) io_copy_attrs(pair); // Close the destination first. If it fails, we must not remove // the source file! if (io_close_dest(pair, success)) success = false; // Close the source file, and unlink it if the operation using this // file pair was successful and we haven't requested to keep the // source file. io_close_src(pair, success); signals_unblock(); return; } extern void io_fix_src_pos(file_pair *pair, size_t rewind_size) { assert(rewind_size <= IO_BUFFER_SIZE); if (rewind_size > 0) { // This doesn't need to work on unseekable file descriptors, // so just ignore possible errors. (void)lseek(pair->src_fd, -(off_t)(rewind_size), SEEK_CUR); } return; } extern size_t io_read(file_pair *pair, io_buf *buf_union, size_t size) { // We use small buffers here. assert(size < SSIZE_MAX); uint8_t *buf = buf_union->u8; size_t left = size; while (left > 0) { const ssize_t amount = read(pair->src_fd, buf, left); if (amount == 0) { pair->src_eof = true; break; } if (amount == -1) { if (errno == EINTR) { if (user_abort) return SIZE_MAX; continue; } #ifndef TUKLIB_DOSLIKE if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { const io_wait_ret ret = io_wait(pair, mytime_get_flush_timeout(), true); switch (ret) { case IO_WAIT_MORE: continue; case IO_WAIT_ERROR: return SIZE_MAX; case IO_WAIT_TIMEOUT: return size - left; default: message_bug(); } } #endif message_error(_("%s: Read error: %s"), pair->src_name, strerror(errno)); return SIZE_MAX; } buf += (size_t)(amount); left -= (size_t)(amount); } return size - left; } extern bool io_pread(file_pair *pair, io_buf *buf, size_t size, off_t pos) { // Using lseek() and read() is more portable than pread() and // for us it is as good as real pread(). if (lseek(pair->src_fd, pos, SEEK_SET) != pos) { message_error(_("%s: Error seeking the file: %s"), pair->src_name, strerror(errno)); return true; } const size_t amount = io_read(pair, buf, size); if (amount == SIZE_MAX) return true; if (amount != size) { message_error(_("%s: Unexpected end of file"), pair->src_name); return true; } return false; } static bool is_sparse(const io_buf *buf) { assert(IO_BUFFER_SIZE % sizeof(uint64_t) == 0); for (size_t i = 0; i < ARRAY_SIZE(buf->u64); ++i) if (buf->u64[i] != 0) return false; return true; } static bool io_write_buf(file_pair *pair, const uint8_t *buf, size_t size) { assert(size < SSIZE_MAX); while (size > 0) { const ssize_t amount = write(pair->dest_fd, buf, size); if (amount == -1) { if (errno == EINTR) { if (user_abort) return true; continue; } #ifndef TUKLIB_DOSLIKE if (IS_EAGAIN_OR_EWOULDBLOCK(errno)) { if (io_wait(pair, -1, false) == IO_WAIT_MORE) continue; return true; } #endif // Handle broken pipe specially. gzip and bzip2 // don't print anything on SIGPIPE. In addition, // gzip --quiet uses exit status 2 (warning) on // broken pipe instead of whatever raise(SIGPIPE) // would make it return. It is there to hide "Broken // pipe" message on some old shells (probably old // GNU bash). // // We don't do anything special with --quiet, which // is what bzip2 does too. If we get SIGPIPE, we // will handle it like other signals by setting // user_abort, and get EPIPE here. if (errno != EPIPE) message_error(_("%s: Write error: %s"), pair->dest_name, strerror(errno)); return true; } buf += (size_t)(amount); size -= (size_t)(amount); } return false; } extern bool io_write(file_pair *pair, const io_buf *buf, size_t size) { assert(size <= IO_BUFFER_SIZE); if (pair->dest_try_sparse) { // Check if the block is sparse (contains only zeros). If it // sparse, we just store the amount and return. We will take // care of actually skipping over the hole when we hit the // next data block or close the file. // // Since io_close() requires that dest_pending_sparse > 0 // if the file ends with sparse block, we must also return // if size == 0 to avoid doing the lseek(). if (size == IO_BUFFER_SIZE) { if (is_sparse(buf)) { pair->dest_pending_sparse += size; return false; } } else if (size == 0) { return false; } // This is not a sparse block. If we have a pending hole, // skip it now. if (pair->dest_pending_sparse > 0) { if (lseek(pair->dest_fd, pair->dest_pending_sparse, SEEK_CUR) == -1) { message_error(_("%s: Seeking failed when " "trying to create a sparse " "file: %s"), pair->dest_name, strerror(errno)); return true; } pair->dest_pending_sparse = 0; } } return io_write_buf(pair, buf->u8, size); } Index: head/contrib/xz/src/xz/list.c =================================================================== --- head/contrib/xz/src/xz/list.c (revision 333782) +++ head/contrib/xz/src/xz/list.c (revision 333783) @@ -1,1186 +1,1192 @@ /////////////////////////////////////////////////////////////////////////////// // /// \file list.c /// \brief Listing information about .xz files // // Author: Lasse Collin // // This file has been put into the public domain. // You can do whatever you want with this file. // /////////////////////////////////////////////////////////////////////////////// #include "private.h" #include "tuklib_integer.h" /// Information about a .xz file typedef struct { /// Combined Index of all Streams in the file lzma_index *idx; /// Total amount of Stream Padding uint64_t stream_padding; /// Highest memory usage so far uint64_t memusage_max; /// True if all Blocks so far have Compressed Size and /// Uncompressed Size fields bool all_have_sizes; /// Oldest XZ Utils version that will decompress the file uint32_t min_version; } xz_file_info; #define XZ_FILE_INFO_INIT { NULL, 0, 0, true, 50000002 } /// Information about a .xz Block typedef struct { /// Size of the Block Header uint32_t header_size; /// A few of the Block Flags as a string char flags[3]; /// Size of the Compressed Data field in the Block lzma_vli compressed_size; /// Decoder memory usage for this Block uint64_t memusage; /// The filter chain of this Block in human-readable form char filter_chain[FILTERS_STR_SIZE]; } block_header_info; /// Check ID to string mapping static const char check_names[LZMA_CHECK_ID_MAX + 1][12] = { // TRANSLATORS: Indicates that there is no integrity check. // This string is used in tables, so the width must not // exceed ten columns with a fixed-width font. N_("None"), "CRC32", // TRANSLATORS: Indicates that integrity check name is not known, // but the Check ID is known (here 2). This and other "Unknown-N" // strings are used in tables, so the width must not exceed ten // columns with a fixed-width font. It's OK to omit the dash if // you need space for one extra letter, but don't use spaces. N_("Unknown-2"), N_("Unknown-3"), "CRC64", N_("Unknown-5"), N_("Unknown-6"), N_("Unknown-7"), N_("Unknown-8"), N_("Unknown-9"), "SHA-256", N_("Unknown-11"), N_("Unknown-12"), N_("Unknown-13"), N_("Unknown-14"), N_("Unknown-15"), }; /// Buffer size for get_check_names(). This may be a bit ridiculous, /// but at least it's enough if some language needs many multibyte chars. #define CHECKS_STR_SIZE 1024 /// Value of the Check field as hexadecimal string. /// This is set by parse_check_value(). static char check_value[2 * LZMA_CHECK_SIZE_MAX + 1]; /// Totals that are displayed if there was more than one file. /// The "files" counter is also used in print_info_adv() to show /// the file number. static struct { uint64_t files; uint64_t streams; uint64_t blocks; uint64_t compressed_size; uint64_t uncompressed_size; uint64_t stream_padding; uint64_t memusage_max; uint32_t checks; uint32_t min_version; bool all_have_sizes; -} totals = { 0, 0, 0, 0, 0, 0, 0, 0, 0, true }; +} totals = { 0, 0, 0, 0, 0, 0, 0, 0, 50000002, true }; /// Convert XZ Utils version number to a string. static const char * xz_ver_to_str(uint32_t ver) { static char buf[32]; unsigned int major = ver / 10000000U; ver -= major * 10000000U; unsigned int minor = ver / 10000U; ver -= minor * 10000U; unsigned int patch = ver / 10U; ver -= patch * 10U; const char *stability = ver == 0 ? "alpha" : ver == 1 ? "beta" : ""; snprintf(buf, sizeof(buf), "%u.%u.%u%s", major, minor, patch, stability); return buf; } /// \brief Parse the Index(es) from the given .xz file /// /// \param xfi Pointer to structure where the decoded information /// is stored. /// \param pair Input file /// /// \return On success, false is returned. On error, true is returned. /// // TODO: This function is pretty big. liblzma should have a function that // takes a callback function to parse the Index(es) from a .xz file to make // it easy for applications. static bool parse_indexes(xz_file_info *xfi, file_pair *pair) { if (pair->src_st.st_size <= 0) { message_error(_("%s: File is empty"), pair->src_name); return true; } if (pair->src_st.st_size < 2 * LZMA_STREAM_HEADER_SIZE) { message_error(_("%s: Too small to be a valid .xz file"), pair->src_name); return true; } io_buf buf; lzma_stream_flags header_flags; lzma_stream_flags footer_flags; lzma_ret ret; // lzma_stream for the Index decoder lzma_stream strm = LZMA_STREAM_INIT; // All Indexes decoded so far lzma_index *combined_index = NULL; // The Index currently being decoded lzma_index *this_index = NULL; // Current position in the file. We parse the file backwards so // initialize it to point to the end of the file. off_t pos = pair->src_st.st_size; // Each loop iteration decodes one Index. do { // Check that there is enough data left to contain at least // the Stream Header and Stream Footer. This check cannot // fail in the first pass of this loop. if (pos < 2 * LZMA_STREAM_HEADER_SIZE) { message_error("%s: %s", pair->src_name, message_strm(LZMA_DATA_ERROR)); goto error; } pos -= LZMA_STREAM_HEADER_SIZE; lzma_vli stream_padding = 0; // Locate the Stream Footer. There may be Stream Padding which // we must skip when reading backwards. while (true) { if (pos < LZMA_STREAM_HEADER_SIZE) { message_error("%s: %s", pair->src_name, message_strm( LZMA_DATA_ERROR)); goto error; } if (io_pread(pair, &buf, LZMA_STREAM_HEADER_SIZE, pos)) goto error; // Stream Padding is always a multiple of four bytes. int i = 2; if (buf.u32[i] != 0) break; // To avoid calling io_pread() for every four bytes // of Stream Padding, take advantage that we read // 12 bytes (LZMA_STREAM_HEADER_SIZE) already and // check them too before calling io_pread() again. do { stream_padding += 4; pos -= 4; --i; } while (i >= 0 && buf.u32[i] == 0); } // Decode the Stream Footer. ret = lzma_stream_footer_decode(&footer_flags, buf.u8); if (ret != LZMA_OK) { message_error("%s: %s", pair->src_name, message_strm(ret)); goto error; } // Check that the Stream Footer doesn't specify something // that we don't support. This can only happen if the xz // version is older than liblzma and liblzma supports // something new. // // It is enough to check Stream Footer. Stream Header must // match when it is compared against Stream Footer with // lzma_stream_flags_compare(). if (footer_flags.version != 0) { message_error("%s: %s", pair->src_name, message_strm(LZMA_OPTIONS_ERROR)); goto error; } // Check that the size of the Index field looks sane. lzma_vli index_size = footer_flags.backward_size; if ((lzma_vli)(pos) < index_size + LZMA_STREAM_HEADER_SIZE) { message_error("%s: %s", pair->src_name, message_strm(LZMA_DATA_ERROR)); goto error; } // Set pos to the beginning of the Index. pos -= index_size; // See how much memory we can use for decoding this Index. uint64_t memlimit = hardware_memlimit_get(MODE_LIST); uint64_t memused = 0; if (combined_index != NULL) { memused = lzma_index_memused(combined_index); if (memused > memlimit) message_bug(); memlimit -= memused; } // Decode the Index. ret = lzma_index_decoder(&strm, &this_index, memlimit); if (ret != LZMA_OK) { message_error("%s: %s", pair->src_name, message_strm(ret)); goto error; } do { // Don't give the decoder more input than the // Index size. strm.avail_in = my_min(IO_BUFFER_SIZE, index_size); if (io_pread(pair, &buf, strm.avail_in, pos)) goto error; pos += strm.avail_in; index_size -= strm.avail_in; strm.next_in = buf.u8; ret = lzma_code(&strm, LZMA_RUN); } while (ret == LZMA_OK); // If the decoding seems to be successful, check also that // the Index decoder consumed as much input as indicated // by the Backward Size field. if (ret == LZMA_STREAM_END) if (index_size != 0 || strm.avail_in != 0) ret = LZMA_DATA_ERROR; if (ret != LZMA_STREAM_END) { // LZMA_BUFFER_ERROR means that the Index decoder // would have liked more input than what the Index // size should be according to Stream Footer. // The message for LZMA_DATA_ERROR makes more // sense in that case. if (ret == LZMA_BUF_ERROR) ret = LZMA_DATA_ERROR; message_error("%s: %s", pair->src_name, message_strm(ret)); // If the error was too low memory usage limit, // show also how much memory would have been needed. if (ret == LZMA_MEMLIMIT_ERROR) { uint64_t needed = lzma_memusage(&strm); if (UINT64_MAX - needed < memused) needed = UINT64_MAX; else needed += memused; message_mem_needed(V_ERROR, needed); } goto error; } // Decode the Stream Header and check that its Stream Flags // match the Stream Footer. pos -= footer_flags.backward_size + LZMA_STREAM_HEADER_SIZE; if ((lzma_vli)(pos) < lzma_index_total_size(this_index)) { message_error("%s: %s", pair->src_name, message_strm(LZMA_DATA_ERROR)); goto error; } pos -= lzma_index_total_size(this_index); if (io_pread(pair, &buf, LZMA_STREAM_HEADER_SIZE, pos)) goto error; ret = lzma_stream_header_decode(&header_flags, buf.u8); if (ret != LZMA_OK) { message_error("%s: %s", pair->src_name, message_strm(ret)); goto error; } ret = lzma_stream_flags_compare(&header_flags, &footer_flags); if (ret != LZMA_OK) { message_error("%s: %s", pair->src_name, message_strm(ret)); goto error; } // Store the decoded Stream Flags into this_index. This is // needed so that we can print which Check is used in each // Stream. ret = lzma_index_stream_flags(this_index, &footer_flags); if (ret != LZMA_OK) message_bug(); // Store also the size of the Stream Padding field. It is // needed to show the offsets of the Streams correctly. ret = lzma_index_stream_padding(this_index, stream_padding); if (ret != LZMA_OK) message_bug(); if (combined_index != NULL) { // Append the earlier decoded Indexes // after this_index. ret = lzma_index_cat( this_index, combined_index, NULL); if (ret != LZMA_OK) { message_error("%s: %s", pair->src_name, message_strm(ret)); goto error; } } combined_index = this_index; this_index = NULL; xfi->stream_padding += stream_padding; } while (pos > 0); lzma_end(&strm); // All OK. Make combined_index available to the caller. xfi->idx = combined_index; return false; error: // Something went wrong, free the allocated memory. lzma_end(&strm); lzma_index_end(combined_index, NULL); lzma_index_end(this_index, NULL); return true; } /// \brief Parse the Block Header /// /// The result is stored into *bhi. The caller takes care of initializing it. /// /// \return False on success, true on error. static bool parse_block_header(file_pair *pair, const lzma_index_iter *iter, block_header_info *bhi, xz_file_info *xfi) { #if IO_BUFFER_SIZE < LZMA_BLOCK_HEADER_SIZE_MAX # error IO_BUFFER_SIZE < LZMA_BLOCK_HEADER_SIZE_MAX #endif // Get the whole Block Header with one read, but don't read past // the end of the Block (or even its Check field). const uint32_t size = my_min(iter->block.total_size - lzma_check_size(iter->stream.flags->check), LZMA_BLOCK_HEADER_SIZE_MAX); io_buf buf; if (io_pread(pair, &buf, size, iter->block.compressed_file_offset)) return true; // Zero would mean Index Indicator and thus not a valid Block. if (buf.u8[0] == 0) goto data_error; // Initialize the block structure and decode Block Header Size. lzma_filter filters[LZMA_FILTERS_MAX + 1]; lzma_block block; block.version = 0; block.check = iter->stream.flags->check; block.filters = filters; block.header_size = lzma_block_header_size_decode(buf.u8[0]); if (block.header_size > size) goto data_error; // Decode the Block Header. switch (lzma_block_header_decode(&block, NULL, buf.u8)) { case LZMA_OK: break; case LZMA_OPTIONS_ERROR: message_error("%s: %s", pair->src_name, message_strm(LZMA_OPTIONS_ERROR)); return true; case LZMA_DATA_ERROR: goto data_error; default: message_bug(); } // Check the Block Flags. These must be done before calling // lzma_block_compressed_size(), because it overwrites // block.compressed_size. bhi->flags[0] = block.compressed_size != LZMA_VLI_UNKNOWN ? 'c' : '-'; bhi->flags[1] = block.uncompressed_size != LZMA_VLI_UNKNOWN ? 'u' : '-'; bhi->flags[2] = '\0'; // Collect information if all Blocks have both Compressed Size // and Uncompressed Size fields. They can be useful e.g. for // multi-threaded decompression so it can be useful to know it. xfi->all_have_sizes &= block.compressed_size != LZMA_VLI_UNKNOWN && block.uncompressed_size != LZMA_VLI_UNKNOWN; // Validate or set block.compressed_size. switch (lzma_block_compressed_size(&block, iter->block.unpadded_size)) { case LZMA_OK: // Validate also block.uncompressed_size if it is present. // If it isn't present, there's no need to set it since // we aren't going to actually decompress the Block; if // we were decompressing, then we should set it so that // the Block decoder could validate the Uncompressed Size // that was stored in the Index. if (block.uncompressed_size == LZMA_VLI_UNKNOWN || block.uncompressed_size == iter->block.uncompressed_size) break; // If the above fails, the file is corrupt so // LZMA_DATA_ERROR is a good error code. + // Fall through + case LZMA_DATA_ERROR: // Free the memory allocated by lzma_block_header_decode(). for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i) free(filters[i].options); goto data_error; default: message_bug(); } // Copy the known sizes. bhi->header_size = block.header_size; bhi->compressed_size = block.compressed_size; // Calculate the decoder memory usage and update the maximum // memory usage of this Block. bhi->memusage = lzma_raw_decoder_memusage(filters); if (xfi->memusage_max < bhi->memusage) xfi->memusage_max = bhi->memusage; // Determine the minimum XZ Utils version that supports this Block. // // Currently the only thing that 5.0.0 doesn't support is empty // LZMA2 Block. This decoder bug was fixed in 5.0.2. { size_t i = 0; while (filters[i + 1].id != LZMA_VLI_UNKNOWN) ++i; if (filters[i].id == LZMA_FILTER_LZMA2 && iter->block.uncompressed_size == 0 && xfi->min_version < 50000022U) xfi->min_version = 50000022U; } // Convert the filter chain to human readable form. message_filters_to_str(bhi->filter_chain, filters, false); // Free the memory allocated by lzma_block_header_decode(). for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i) free(filters[i].options); return false; data_error: // Show the error message. message_error("%s: %s", pair->src_name, message_strm(LZMA_DATA_ERROR)); return true; } /// \brief Parse the Check field and put it into check_value[] /// /// \return False on success, true on error. static bool parse_check_value(file_pair *pair, const lzma_index_iter *iter) { // Don't read anything from the file if there is no integrity Check. if (iter->stream.flags->check == LZMA_CHECK_NONE) { snprintf(check_value, sizeof(check_value), "---"); return false; } // Locate and read the Check field. const uint32_t size = lzma_check_size(iter->stream.flags->check); const off_t offset = iter->block.compressed_file_offset + iter->block.total_size - size; io_buf buf; if (io_pread(pair, &buf, size, offset)) return true; // CRC32 and CRC64 are in little endian. Guess that all the future // 32-bit and 64-bit Check values are little endian too. It shouldn't // be a too big problem if this guess is wrong. if (size == 4) snprintf(check_value, sizeof(check_value), "%08" PRIx32, conv32le(buf.u32[0])); else if (size == 8) snprintf(check_value, sizeof(check_value), "%016" PRIx64, conv64le(buf.u64[0])); else for (size_t i = 0; i < size; ++i) snprintf(check_value + i * 2, 3, "%02x", buf.u8[i]); return false; } /// \brief Parse detailed information about a Block /// /// Since this requires seek(s), listing information about all Blocks can /// be slow. /// /// \param pair Input file /// \param iter Location of the Block whose Check value should /// be printed. /// \param bhi Pointer to structure where to store the information /// about the Block Header field. /// /// \return False on success, true on error. If an error occurs, /// the error message is printed too so the caller doesn't /// need to worry about that. static bool parse_details(file_pair *pair, const lzma_index_iter *iter, block_header_info *bhi, xz_file_info *xfi) { if (parse_block_header(pair, iter, bhi, xfi)) return true; if (parse_check_value(pair, iter)) return true; return false; } /// \brief Get the compression ratio /// /// This has slightly different format than that is used in message.c. static const char * get_ratio(uint64_t compressed_size, uint64_t uncompressed_size) { if (uncompressed_size == 0) return "---"; const double ratio = (double)(compressed_size) / (double)(uncompressed_size); if (ratio > 9.999) return "---"; static char buf[16]; snprintf(buf, sizeof(buf), "%.3f", ratio); return buf; } /// \brief Get a comma-separated list of Check names /// /// The check names are translated with gettext except when in robot mode. /// /// \param buf Buffer to hold the resulting string /// \param checks Bit mask of Checks to print /// \param space_after_comma /// It's better to not use spaces in table-like listings, /// but in more verbose formats a space after a comma /// is good for readability. static void get_check_names(char buf[CHECKS_STR_SIZE], uint32_t checks, bool space_after_comma) { - assert(checks != 0); + // If we get called when there are no Checks to print, set checks + // to 1 so that we print "None". This can happen in the robot mode + // when printing the totals line if there are no valid input files. + if (checks == 0) + checks = 1; char *pos = buf; size_t left = CHECKS_STR_SIZE; const char *sep = space_after_comma ? ", " : ","; bool comma = false; for (size_t i = 0; i <= LZMA_CHECK_ID_MAX; ++i) { if (checks & (UINT32_C(1) << i)) { my_snprintf(&pos, &left, "%s%s", comma ? sep : "", opt_robot ? check_names[i] : _(check_names[i])); comma = true; } } return; } static bool print_info_basic(const xz_file_info *xfi, file_pair *pair) { static bool headings_displayed = false; if (!headings_displayed) { headings_displayed = true; // TRANSLATORS: These are column headings. From Strms (Streams) // to Ratio, the columns are right aligned. Check and Filename // are left aligned. If you need longer words, it's OK to // use two lines here. Test with "xz -l foo.xz". puts(_("Strms Blocks Compressed Uncompressed Ratio " "Check Filename")); } char checks[CHECKS_STR_SIZE]; get_check_names(checks, lzma_index_checks(xfi->idx), false); const char *cols[7] = { uint64_to_str(lzma_index_stream_count(xfi->idx), 0), uint64_to_str(lzma_index_block_count(xfi->idx), 1), uint64_to_nicestr(lzma_index_file_size(xfi->idx), NICESTR_B, NICESTR_TIB, false, 2), uint64_to_nicestr(lzma_index_uncompressed_size(xfi->idx), NICESTR_B, NICESTR_TIB, false, 3), get_ratio(lzma_index_file_size(xfi->idx), lzma_index_uncompressed_size(xfi->idx)), checks, pair->src_name, }; printf("%*s %*s %*s %*s %*s %-*s %s\n", tuklib_mbstr_fw(cols[0], 5), cols[0], tuklib_mbstr_fw(cols[1], 7), cols[1], tuklib_mbstr_fw(cols[2], 11), cols[2], tuklib_mbstr_fw(cols[3], 11), cols[3], tuklib_mbstr_fw(cols[4], 5), cols[4], tuklib_mbstr_fw(cols[5], 7), cols[5], cols[6]); return false; } static void print_adv_helper(uint64_t stream_count, uint64_t block_count, uint64_t compressed_size, uint64_t uncompressed_size, uint32_t checks, uint64_t stream_padding) { char checks_str[CHECKS_STR_SIZE]; get_check_names(checks_str, checks, true); printf(_(" Streams: %s\n"), uint64_to_str(stream_count, 0)); printf(_(" Blocks: %s\n"), uint64_to_str(block_count, 0)); printf(_(" Compressed size: %s\n"), uint64_to_nicestr(compressed_size, NICESTR_B, NICESTR_TIB, true, 0)); printf(_(" Uncompressed size: %s\n"), uint64_to_nicestr(uncompressed_size, NICESTR_B, NICESTR_TIB, true, 0)); printf(_(" Ratio: %s\n"), get_ratio(compressed_size, uncompressed_size)); printf(_(" Check: %s\n"), checks_str); printf(_(" Stream padding: %s\n"), uint64_to_nicestr(stream_padding, NICESTR_B, NICESTR_TIB, true, 0)); return; } static bool print_info_adv(xz_file_info *xfi, file_pair *pair) { // Print the overall information. print_adv_helper(lzma_index_stream_count(xfi->idx), lzma_index_block_count(xfi->idx), lzma_index_file_size(xfi->idx), lzma_index_uncompressed_size(xfi->idx), lzma_index_checks(xfi->idx), xfi->stream_padding); // Size of the biggest Check. This is used to calculate the width // of the CheckVal field. The table would get insanely wide if // we always reserved space for 64-byte Check (128 chars as hex). uint32_t check_max = 0; // Print information about the Streams. // // TRANSLATORS: The second line is column headings. All except // Check are right aligned; Check is left aligned. Test with // "xz -lv foo.xz". puts(_(" Streams:\n Stream Blocks" " CompOffset UncompOffset" " CompSize UncompSize Ratio" " Check Padding")); lzma_index_iter iter; lzma_index_iter_init(&iter, xfi->idx); while (!lzma_index_iter_next(&iter, LZMA_INDEX_ITER_STREAM)) { const char *cols1[4] = { uint64_to_str(iter.stream.number, 0), uint64_to_str(iter.stream.block_count, 1), uint64_to_str(iter.stream.compressed_offset, 2), uint64_to_str(iter.stream.uncompressed_offset, 3), }; printf(" %*s %*s %*s %*s ", tuklib_mbstr_fw(cols1[0], 6), cols1[0], tuklib_mbstr_fw(cols1[1], 9), cols1[1], tuklib_mbstr_fw(cols1[2], 15), cols1[2], tuklib_mbstr_fw(cols1[3], 15), cols1[3]); const char *cols2[5] = { uint64_to_str(iter.stream.compressed_size, 0), uint64_to_str(iter.stream.uncompressed_size, 1), get_ratio(iter.stream.compressed_size, iter.stream.uncompressed_size), _(check_names[iter.stream.flags->check]), uint64_to_str(iter.stream.padding, 2), }; printf("%*s %*s %*s %-*s %*s\n", tuklib_mbstr_fw(cols2[0], 15), cols2[0], tuklib_mbstr_fw(cols2[1], 15), cols2[1], tuklib_mbstr_fw(cols2[2], 5), cols2[2], tuklib_mbstr_fw(cols2[3], 10), cols2[3], tuklib_mbstr_fw(cols2[4], 7), cols2[4]); // Update the maximum Check size. if (lzma_check_size(iter.stream.flags->check) > check_max) check_max = lzma_check_size(iter.stream.flags->check); } // Cache the verbosity level to a local variable. const bool detailed = message_verbosity_get() >= V_DEBUG; // Information collected from Block Headers block_header_info bhi; // Print information about the Blocks but only if there is // at least one Block. if (lzma_index_block_count(xfi->idx) > 0) { // Calculate the width of the CheckVal field. const int checkval_width = my_max(8, 2 * check_max); // TRANSLATORS: The second line is column headings. All // except Check are right aligned; Check is left aligned. printf(_(" Blocks:\n Stream Block" " CompOffset UncompOffset" " TotalSize UncompSize Ratio Check")); if (detailed) { // TRANSLATORS: These are additional column headings // for the most verbose listing mode. CheckVal // (Check value), Flags, and Filters are left aligned. // Header (Block Header Size), CompSize, and MemUsage // are right aligned. %*s is replaced with 0-120 // spaces to make the CheckVal column wide enough. // Test with "xz -lvv foo.xz". printf(_(" CheckVal %*s Header Flags " "CompSize MemUsage Filters"), checkval_width - 8, ""); } putchar('\n'); lzma_index_iter_init(&iter, xfi->idx); // Iterate over the Blocks. while (!lzma_index_iter_next(&iter, LZMA_INDEX_ITER_BLOCK)) { if (detailed && parse_details(pair, &iter, &bhi, xfi)) return true; const char *cols1[4] = { uint64_to_str(iter.stream.number, 0), uint64_to_str( iter.block.number_in_stream, 1), uint64_to_str( iter.block.compressed_file_offset, 2), uint64_to_str( iter.block.uncompressed_file_offset, 3) }; printf(" %*s %*s %*s %*s ", tuklib_mbstr_fw(cols1[0], 6), cols1[0], tuklib_mbstr_fw(cols1[1], 9), cols1[1], tuklib_mbstr_fw(cols1[2], 15), cols1[2], tuklib_mbstr_fw(cols1[3], 15), cols1[3]); const char *cols2[4] = { uint64_to_str(iter.block.total_size, 0), uint64_to_str(iter.block.uncompressed_size, 1), get_ratio(iter.block.total_size, iter.block.uncompressed_size), _(check_names[iter.stream.flags->check]) }; printf("%*s %*s %*s %-*s", tuklib_mbstr_fw(cols2[0], 15), cols2[0], tuklib_mbstr_fw(cols2[1], 15), cols2[1], tuklib_mbstr_fw(cols2[2], 5), cols2[2], tuklib_mbstr_fw(cols2[3], detailed ? 11 : 1), cols2[3]); if (detailed) { const lzma_vli compressed_size = iter.block.unpadded_size - bhi.header_size - lzma_check_size( iter.stream.flags->check); const char *cols3[6] = { check_value, uint64_to_str(bhi.header_size, 0), bhi.flags, uint64_to_str(compressed_size, 1), uint64_to_str( round_up_to_mib(bhi.memusage), 2), bhi.filter_chain }; // Show MiB for memory usage, because it // is the only size which is not in bytes. printf("%-*s %*s %-5s %*s %*s MiB %s", checkval_width, cols3[0], tuklib_mbstr_fw(cols3[1], 6), cols3[1], cols3[2], tuklib_mbstr_fw(cols3[3], 15), cols3[3], tuklib_mbstr_fw(cols3[4], 7), cols3[4], cols3[5]); } putchar('\n'); } } if (detailed) { printf(_(" Memory needed: %s MiB\n"), uint64_to_str( round_up_to_mib(xfi->memusage_max), 0)); printf(_(" Sizes in headers: %s\n"), xfi->all_have_sizes ? _("Yes") : _("No")); printf(_(" Minimum XZ Utils version: %s\n"), xz_ver_to_str(xfi->min_version)); } return false; } static bool print_info_robot(xz_file_info *xfi, file_pair *pair) { char checks[CHECKS_STR_SIZE]; get_check_names(checks, lzma_index_checks(xfi->idx), false); printf("name\t%s\n", pair->src_name); printf("file\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%s\t%s\t%" PRIu64 "\n", lzma_index_stream_count(xfi->idx), lzma_index_block_count(xfi->idx), lzma_index_file_size(xfi->idx), lzma_index_uncompressed_size(xfi->idx), get_ratio(lzma_index_file_size(xfi->idx), lzma_index_uncompressed_size(xfi->idx)), checks, xfi->stream_padding); if (message_verbosity_get() >= V_VERBOSE) { lzma_index_iter iter; lzma_index_iter_init(&iter, xfi->idx); while (!lzma_index_iter_next(&iter, LZMA_INDEX_ITER_STREAM)) printf("stream\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%s\t%s\t%" PRIu64 "\n", iter.stream.number, iter.stream.block_count, iter.stream.compressed_offset, iter.stream.uncompressed_offset, iter.stream.compressed_size, iter.stream.uncompressed_size, get_ratio(iter.stream.compressed_size, iter.stream.uncompressed_size), check_names[iter.stream.flags->check], iter.stream.padding); lzma_index_iter_rewind(&iter); block_header_info bhi; while (!lzma_index_iter_next(&iter, LZMA_INDEX_ITER_BLOCK)) { if (message_verbosity_get() >= V_DEBUG && parse_details( pair, &iter, &bhi, xfi)) return true; printf("block\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%s\t%s", iter.stream.number, iter.block.number_in_stream, iter.block.number_in_file, iter.block.compressed_file_offset, iter.block.uncompressed_file_offset, iter.block.total_size, iter.block.uncompressed_size, get_ratio(iter.block.total_size, iter.block.uncompressed_size), check_names[iter.stream.flags->check]); if (message_verbosity_get() >= V_DEBUG) printf("\t%s\t%" PRIu32 "\t%s\t%" PRIu64 "\t%" PRIu64 "\t%s", check_value, bhi.header_size, bhi.flags, bhi.compressed_size, bhi.memusage, bhi.filter_chain); putchar('\n'); } } if (message_verbosity_get() >= V_DEBUG) printf("summary\t%" PRIu64 "\t%s\t%" PRIu32 "\n", xfi->memusage_max, xfi->all_have_sizes ? "yes" : "no", xfi->min_version); return false; } static void update_totals(const xz_file_info *xfi) { // TODO: Integer overflow checks ++totals.files; totals.streams += lzma_index_stream_count(xfi->idx); totals.blocks += lzma_index_block_count(xfi->idx); totals.compressed_size += lzma_index_file_size(xfi->idx); totals.uncompressed_size += lzma_index_uncompressed_size(xfi->idx); totals.stream_padding += xfi->stream_padding; totals.checks |= lzma_index_checks(xfi->idx); if (totals.memusage_max < xfi->memusage_max) totals.memusage_max = xfi->memusage_max; if (totals.min_version < xfi->min_version) totals.min_version = xfi->min_version; totals.all_have_sizes &= xfi->all_have_sizes; return; } static void print_totals_basic(void) { // Print a separator line. char line[80]; memset(line, '-', sizeof(line)); line[sizeof(line) - 1] = '\0'; puts(line); // Get the check names. char checks[CHECKS_STR_SIZE]; get_check_names(checks, totals.checks, false); // Print the totals except the file count, which needs // special handling. printf("%5s %7s %11s %11s %5s %-7s ", uint64_to_str(totals.streams, 0), uint64_to_str(totals.blocks, 1), uint64_to_nicestr(totals.compressed_size, NICESTR_B, NICESTR_TIB, false, 2), uint64_to_nicestr(totals.uncompressed_size, NICESTR_B, NICESTR_TIB, false, 3), get_ratio(totals.compressed_size, totals.uncompressed_size), checks); // Since we print totals only when there are at least two files, // the English message will always use "%s files". But some other // languages need different forms for different plurals so we // have to translate this with ngettext(). // // TRANSLATORS: %s is an integer. Only the plural form of this // message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". printf(ngettext("%s file\n", "%s files\n", totals.files <= ULONG_MAX ? totals.files : (totals.files % 1000000) + 1000000), uint64_to_str(totals.files, 0)); return; } static void print_totals_adv(void) { putchar('\n'); puts(_("Totals:")); printf(_(" Number of files: %s\n"), uint64_to_str(totals.files, 0)); print_adv_helper(totals.streams, totals.blocks, totals.compressed_size, totals.uncompressed_size, totals.checks, totals.stream_padding); if (message_verbosity_get() >= V_DEBUG) { printf(_(" Memory needed: %s MiB\n"), uint64_to_str( round_up_to_mib(totals.memusage_max), 0)); printf(_(" Sizes in headers: %s\n"), totals.all_have_sizes ? _("Yes") : _("No")); printf(_(" Minimum XZ Utils version: %s\n"), xz_ver_to_str(totals.min_version)); } return; } static void print_totals_robot(void) { char checks[CHECKS_STR_SIZE]; get_check_names(checks, totals.checks, false); printf("totals\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%" PRIu64 "\t%s\t%s\t%" PRIu64 "\t%" PRIu64, totals.streams, totals.blocks, totals.compressed_size, totals.uncompressed_size, get_ratio(totals.compressed_size, totals.uncompressed_size), checks, totals.stream_padding, totals.files); if (message_verbosity_get() >= V_DEBUG) printf("\t%" PRIu64 "\t%s\t%" PRIu32, totals.memusage_max, totals.all_have_sizes ? "yes" : "no", totals.min_version); putchar('\n'); return; } extern void list_totals(void) { if (opt_robot) { // Always print totals in --robot mode. It can be convenient // in some cases and doesn't complicate usage of the // single-file case much. print_totals_robot(); } else if (totals.files > 1) { // For non-robot mode, totals are printed only if there // is more than one file. if (message_verbosity_get() <= V_WARNING) print_totals_basic(); else print_totals_adv(); } return; } extern void list_file(const char *filename) { if (opt_format != FORMAT_XZ && opt_format != FORMAT_AUTO) message_fatal(_("--list works only on .xz files " "(--format=xz or --format=auto)")); message_filename(filename); if (filename == stdin_filename) { message_error(_("--list does not support reading from " "standard input")); return; } // Unset opt_stdout so that io_open_src() won't accept special files. // Set opt_force so that io_open_src() will follow symlinks. opt_stdout = false; opt_force = true; file_pair *pair = io_open_src(filename); if (pair == NULL) return; xz_file_info xfi = XZ_FILE_INFO_INIT; if (!parse_indexes(&xfi, pair)) { bool fail; // We have three main modes: // - --robot, which has submodes if --verbose is specified // once or twice // - Normal --list without --verbose // - --list with one or two --verbose if (opt_robot) fail = print_info_robot(&xfi, pair); else if (message_verbosity_get() <= V_WARNING) fail = print_info_basic(&xfi, pair); else fail = print_info_adv(&xfi, pair); // Update the totals that are displayed after all // the individual files have been listed. Don't count // broken files. if (!fail) update_totals(&xfi); lzma_index_end(xfi.idx, NULL); } io_close(pair, false); return; } Index: head/contrib/xz/src/xz/xz.1 =================================================================== --- head/contrib/xz/src/xz/xz.1 (revision 333782) +++ head/contrib/xz/src/xz/xz.1 (revision 333783) @@ -1,2786 +1,2786 @@ '\" t .\" .\" Author: Lasse Collin .\" .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZ 1 "2015-05-11" "Tukaani" "XZ Utils" +.TH XZ 1 "2017-04-19" "Tukaani" "XZ Utils" . .SH NAME xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files . .SH SYNOPSIS .B xz .RI [ option... ] .RI [ file... ] . .SH COMMAND ALIASES .B unxz is equivalent to .BR "xz \-\-decompress" . .br .B xzcat is equivalent to .BR "xz \-\-decompress \-\-stdout" . .br .B lzma is equivalent to .BR "xz \-\-format=lzma" . .br .B unlzma is equivalent to .BR "xz \-\-format=lzma \-\-decompress" . .br .B lzcat is equivalent to .BR "xz \-\-format=lzma \-\-decompress \-\-stdout" . .PP When writing scripts that need to decompress files, it is recommended to always use the name .B xz with appropriate arguments .RB ( "xz \-d" or .BR "xz \-dc" ) instead of the names .B unxz and .BR xzcat . . .SH DESCRIPTION .B xz is a general-purpose data compression tool with command line syntax similar to .BR gzip (1) and .BR bzip2 (1). The native file format is the .B .xz format, but the legacy .B .lzma format used by LZMA Utils and raw compressed streams with no container format headers are also supported. .PP .B xz compresses or decompresses each .I file according to the selected operation mode. If no .I files are given or .I file is .BR \- , .B xz reads from standard input and writes the processed data to standard output. .B xz will refuse (display an error and skip the .IR file ) to write compressed data to standard output if it is a terminal. Similarly, .B xz will refuse to read compressed data from standard input if it is a terminal. .PP Unless .B \-\-stdout is specified, .I files other than .B \- are written to a new file whose name is derived from the source .I file name: .IP \(bu 3 When compressing, the suffix of the target file format .RB ( .xz or .BR .lzma ) is appended to the source filename to get the target filename. .IP \(bu 3 When decompressing, the .B .xz or .B .lzma suffix is removed from the filename to get the target filename. .B xz also recognizes the suffixes .B .txz and .BR .tlz , and replaces them with the .B .tar suffix. .PP If the target file already exists, an error is displayed and the .I file is skipped. .PP Unless writing to standard output, .B xz will display a warning and skip the .I file if any of the following applies: .IP \(bu 3 .I File is not a regular file. Symbolic links are not followed, and thus they are not considered to be regular files. .IP \(bu 3 .I File has more than one hard link. .IP \(bu 3 .I File has setuid, setgid, or sticky bit set. .IP \(bu 3 The operation mode is set to compress and the .I file already has a suffix of the target file format .RB ( .xz or .B .txz when compressing to the .B .xz format, and .B .lzma or .B .tlz when compressing to the .B .lzma format). .IP \(bu 3 The operation mode is set to decompress and the .I file doesn't have a suffix of any of the supported file formats .RB ( .xz , .BR .txz , .BR .lzma , or .BR .tlz ). .PP After successfully compressing or decompressing the .IR file , .B xz copies the owner, group, permissions, access time, and modification time from the source .I file to the target file. If copying the group fails, the permissions are modified so that the target file doesn't become accessible to users who didn't have permission to access the source .IR file . .B xz doesn't support copying other metadata like access control lists or extended attributes yet. .PP Once the target file has been successfully closed, the source .I file is removed unless .B \-\-keep was specified. The source .I file is never removed if the output is written to standard output. .PP Sending .B SIGINFO or .B SIGUSR1 to the .B xz process makes it print progress information to standard error. This has only limited use since when standard error is a terminal, using .B \-\-verbose will display an automatically updating progress indicator. . .SS "Memory usage" The memory usage of .B xz varies from a few hundred kilobytes to several gigabytes depending on the compression settings. The settings used when compressing a file determine the memory requirements of the decompressor. Typically the decompressor needs 5\ % to 20\ % of the amount of memory that the compressor needed when creating the file. For example, decompressing a file created with .B xz \-9 currently requires 65\ MiB of memory. Still, it is possible to have .B .xz files that require several gigabytes of memory to decompress. .PP Especially users of older systems may find the possibility of very large memory usage annoying. To prevent uncomfortable surprises, .B xz has a built-in memory usage limiter, which is disabled by default. While some operating systems provide ways to limit the memory usage of processes, relying on it wasn't deemed to be flexible enough (e.g. using .BR ulimit (1) to limit virtual memory tends to cripple .BR mmap (2)). .PP The memory usage limiter can be enabled with the command line option \fB\-\-memlimit=\fIlimit\fR. Often it is more convenient to enable the limiter by default by setting the environment variable .BR XZ_DEFAULTS , e.g.\& .BR XZ_DEFAULTS=\-\-memlimit=150MiB . It is possible to set the limits separately for compression and decompression by using \fB\-\-memlimit\-compress=\fIlimit\fR and \fB\-\-memlimit\-decompress=\fIlimit\fR. Using these two options outside .B XZ_DEFAULTS is rarely useful because a single run of .B xz cannot do both compression and decompression and .BI \-\-memlimit= limit (or \fB\-M\fR \fIlimit\fR) is shorter to type on the command line. .PP If the specified memory usage limit is exceeded when decompressing, .B xz will display an error and decompressing the file will fail. If the limit is exceeded when compressing, .B xz will try to scale the settings down so that the limit is no longer exceeded (except when using \fB\-\-format=raw\fR or \fB\-\-no\-adjust\fR). This way the operation won't fail unless the limit is very small. The scaling of the settings is done in steps that don't match the compression level presets, e.g. if the limit is only slightly less than the amount required for .BR "xz \-9" , the settings will be scaled down only a little, not all the way down to .BR "xz \-8" . . .SS "Concatenation and padding with .xz files" It is possible to concatenate .B .xz files as is. .B xz will decompress such files as if they were a single .B .xz file. .PP It is possible to insert padding between the concatenated parts or after the last part. The padding must consist of null bytes and the size of the padding must be a multiple of four bytes. This can be useful e.g. if the .B .xz file is stored on a medium that measures file sizes in 512-byte blocks. .PP Concatenation and padding are not allowed with .B .lzma files or raw streams. . .SH OPTIONS . .SS "Integer suffixes and special values" In most places where an integer argument is expected, an optional suffix is supported to easily indicate large integers. There must be no space between the integer and the suffix. .TP .B KiB Multiply the integer by 1,024 (2^10). .BR Ki , .BR k , .BR kB , .BR K , and .B KB are accepted as synonyms for .BR KiB . .TP .B MiB Multiply the integer by 1,048,576 (2^20). .BR Mi , .BR m , .BR M , and .B MB are accepted as synonyms for .BR MiB . .TP .B GiB Multiply the integer by 1,073,741,824 (2^30). .BR Gi , .BR g , .BR G , and .B GB are accepted as synonyms for .BR GiB . .PP The special value .B max can be used to indicate the maximum integer value supported by the option. . .SS "Operation mode" If multiple operation mode options are given, the last one takes effect. .TP .BR \-z ", " \-\-compress Compress. This is the default operation mode when no operation mode option is specified and no other operation mode is implied from the command name (for example, .B unxz implies .BR \-\-decompress ). .TP .BR \-d ", " \-\-decompress ", " \-\-uncompress Decompress. .TP .BR \-t ", " \-\-test Test the integrity of compressed .IR files . This option is equivalent to .B "\-\-decompress \-\-stdout" except that the decompressed data is discarded instead of being written to standard output. No files are created or removed. .TP .BR \-l ", " \-\-list Print information about compressed .IR files . No uncompressed output is produced, and no files are created or removed. In list mode, the program cannot read the compressed data from standard input or from other unseekable sources. .IP "" The default listing shows basic information about .IR files , one file per line. To get more detailed information, use also the .B \-\-verbose option. For even more information, use .B \-\-verbose twice, but note that this may be slow, because getting all the extra information requires many seeks. The width of verbose output exceeds 80 characters, so piping the output to e.g.\& .B "less\ \-S" may be convenient if the terminal isn't wide enough. .IP "" The exact output may vary between .B xz versions and different locales. For machine-readable output, .B \-\-robot \-\-list should be used. . .SS "Operation modifiers" .TP .BR \-k ", " \-\-keep Don't delete the input files. .TP .BR \-f ", " \-\-force This option has several effects: .RS .IP \(bu 3 If the target file already exists, delete it before compressing or decompressing. .IP \(bu 3 Compress or decompress even if the input is a symbolic link to a regular file, has more than one hard link, or has the setuid, setgid, or sticky bit set. The setuid, setgid, and sticky bits are not copied to the target file. .IP \(bu 3 When used with .B \-\-decompress .BR \-\-stdout and .B xz cannot recognize the type of the source file, copy the source file as is to standard output. This allows .B xzcat .B \-\-force to be used like .BR cat (1) for files that have not been compressed with .BR xz . Note that in future, .B xz might support new compressed file formats, which may make .B xz decompress more types of files instead of copying them as is to standard output. .BI \-\-format= format can be used to restrict .B xz to decompress only a single file format. .RE .TP .BR \-c ", " \-\-stdout ", " \-\-to\-stdout Write the compressed or decompressed data to standard output instead of a file. This implies .BR \-\-keep . .TP .B \-\-single\-stream Decompress only the first .B .xz stream, and silently ignore possible remaining input data following the stream. Normally such trailing garbage makes .B xz display an error. .IP "" .B xz never decompresses more than one stream from .B .lzma files or raw streams, but this option still makes .B xz ignore the possible trailing data after the .B .lzma file or raw stream. .IP "" This option has no effect if the operation mode is not .B \-\-decompress or .BR \-\-test . .TP .B \-\-no\-sparse Disable creation of sparse files. By default, if decompressing into a regular file, .B xz tries to make the file sparse if the decompressed data contains long sequences of binary zeros. It also works when writing to standard output as long as standard output is connected to a regular file and certain additional conditions are met to make it safe. Creating sparse files may save disk space and speed up the decompression by reducing the amount of disk I/O. .TP \fB\-S\fR \fI.suf\fR, \fB\-\-suffix=\fI.suf When compressing, use .I .suf as the suffix for the target file instead of .B .xz or .BR .lzma . If not writing to standard output and the source file already has the suffix .IR .suf , a warning is displayed and the file is skipped. .IP "" When decompressing, recognize files with the suffix .I .suf in addition to files with the .BR .xz , .BR .txz , .BR .lzma , or .B .tlz suffix. If the source file has the suffix .IR .suf , the suffix is removed to get the target filename. .IP "" When compressing or decompressing raw streams .RB ( \-\-format=raw ), the suffix must always be specified unless writing to standard output, because there is no default suffix for raw streams. .TP \fB\-\-files\fR[\fB=\fIfile\fR] Read the filenames to process from .IR file ; if .I file is omitted, filenames are read from standard input. Filenames must be terminated with the newline character. A dash .RB ( \- ) is taken as a regular filename; it doesn't mean standard input. If filenames are given also as command line arguments, they are processed before the filenames read from .IR file . .TP \fB\-\-files0\fR[\fB=\fIfile\fR] This is identical to \fB\-\-files\fR[\fB=\fIfile\fR] except that each filename must be terminated with the null character. . .SS "Basic file format and compression options" .TP \fB\-F\fR \fIformat\fR, \fB\-\-format=\fIformat Specify the file .I format to compress or decompress: .RS .TP .B auto This is the default. When compressing, .B auto is equivalent to .BR xz . When decompressing, the format of the input file is automatically detected. Note that raw streams (created with .BR \-\-format=raw ) cannot be auto-detected. .TP .B xz Compress to the .B .xz file format, or accept only .B .xz files when decompressing. .TP .BR lzma ", " alone Compress to the legacy .B .lzma file format, or accept only .B .lzma files when decompressing. The alternative name .B alone is provided for backwards compatibility with LZMA Utils. .TP .B raw Compress or uncompress a raw stream (no headers). This is meant for advanced users only. To decode raw streams, you need use .B \-\-format=raw and explicitly specify the filter chain, which normally would have been stored in the container headers. .RE .TP \fB\-C\fR \fIcheck\fR, \fB\-\-check=\fIcheck Specify the type of the integrity check. The check is calculated from the uncompressed data and stored in the .B .xz file. This option has an effect only when compressing into the .B .xz format; the .B .lzma format doesn't support integrity checks. The integrity check (if any) is verified when the .B .xz file is decompressed. .IP "" Supported .I check types: .RS .TP .B none Don't calculate an integrity check at all. This is usually a bad idea. This can be useful when integrity of the data is verified by other means anyway. .TP .B crc32 Calculate CRC32 using the polynomial from IEEE-802.3 (Ethernet). .TP .B crc64 Calculate CRC64 using the polynomial from ECMA-182. This is the default, since it is slightly better than CRC32 at detecting damaged files and the speed difference is negligible. .TP .B sha256 Calculate SHA-256. This is somewhat slower than CRC32 and CRC64. .RE .IP "" Integrity of the .B .xz headers is always verified with CRC32. It is not possible to change or disable it. .TP .B \-\-ignore\-check Don't verify the integrity check of the compressed data when decompressing. The CRC32 values in the .B .xz headers will still be verified normally. .IP "" .B "Do not use this option unless you know what you are doing." Possible reasons to use this option: .RS .IP \(bu 3 Trying to recover data from a corrupt .xz file. .IP \(bu 3 Speeding up decompression. This matters mostly with SHA-256 or with files that have compressed extremely well. It's recommended to not use this option for this purpose unless the file integrity is verified externally in some other way. .RE .TP .BR \-0 " ... " \-9 Select a compression preset level. The default is .BR \-6 . If multiple preset levels are specified, the last one takes effect. If a custom filter chain was already specified, setting a compression preset level clears the custom filter chain. .IP "" The differences between the presets are more significant than with .BR gzip (1) and .BR bzip2 (1). The selected compression settings determine the memory requirements of the decompressor, thus using a too high preset level might make it painful to decompress the file on an old system with little RAM. Specifically, .B "it's not a good idea to blindly use \-9 for everything" like it often is with .BR gzip (1) and .BR bzip2 (1). .RS .TP .BR "\-0" " ... " "\-3" These are somewhat fast presets. .B \-0 is sometimes faster than .B "gzip \-9" while compressing much better. The higher ones often have speed comparable to .BR bzip2 (1) with comparable or better compression ratio, although the results depend a lot on the type of data being compressed. .TP .BR "\-4" " ... " "\-6" Good to very good compression while keeping decompressor memory usage reasonable even for old systems. .B \-6 is the default, which is usually a good choice e.g. for distributing files that need to be decompressible even on systems with only 16\ MiB RAM. .RB ( \-5e or .B \-6e may be worth considering too. See .BR \-\-extreme .) .TP .B "\-7 ... \-9" These are like .B \-6 but with higher compressor and decompressor memory requirements. These are useful only when compressing files bigger than 8\ MiB, 16\ MiB, and 32\ MiB, respectively. .RE .IP "" On the same hardware, the decompression speed is approximately a constant number of bytes of compressed data per second. In other words, the better the compression, the faster the decompression will usually be. This also means that the amount of uncompressed output produced per second can vary a lot. .IP "" The following table summarises the features of the presets: .RS .RS .PP .TS tab(;); c c c c c n n n n n. Preset;DictSize;CompCPU;CompMem;DecMem \-0;256 KiB;0;3 MiB;1 MiB \-1;1 MiB;1;9 MiB;2 MiB \-2;2 MiB;2;17 MiB;3 MiB \-3;4 MiB;3;32 MiB;5 MiB \-4;4 MiB;4;48 MiB;5 MiB \-5;8 MiB;5;94 MiB;9 MiB \-6;8 MiB;6;94 MiB;9 MiB \-7;16 MiB;6;186 MiB;17 MiB \-8;32 MiB;6;370 MiB;33 MiB \-9;64 MiB;6;674 MiB;65 MiB .TE .RE .RE .IP "" Column descriptions: .RS .IP \(bu 3 DictSize is the LZMA2 dictionary size. It is waste of memory to use a dictionary bigger than the size of the uncompressed file. This is why it is good to avoid using the presets .BR \-7 " ... " \-9 when there's no real need for them. At .B \-6 and lower, the amount of memory wasted is usually low enough to not matter. .IP \(bu 3 CompCPU is a simplified representation of the LZMA2 settings that affect compression speed. The dictionary size affects speed too, so while CompCPU is the same for levels .BR \-6 " ... " \-9 , higher levels still tend to be a little slower. To get even slower and thus possibly better compression, see .BR \-\-extreme . .IP \(bu 3 CompMem contains the compressor memory requirements in the single-threaded mode. It may vary slightly between .B xz versions. Memory requirements of some of the future multithreaded modes may be dramatically higher than that of the single-threaded mode. .IP \(bu 3 DecMem contains the decompressor memory requirements. That is, the compression settings determine the memory requirements of the decompressor. The exact decompressor memory usage is slightly more than the LZMA2 dictionary size, but the values in the table have been rounded up to the next full MiB. .RE .TP .BR \-e ", " \-\-extreme Use a slower variant of the selected compression preset level .RB ( \-0 " ... " \-9 ) to hopefully get a little bit better compression ratio, but with bad luck this can also make it worse. Decompressor memory usage is not affected, but compressor memory usage increases a little at preset levels .BR \-0 " ... " \-3 . .IP "" Since there are two presets with dictionary sizes 4\ MiB and 8\ MiB, the presets .B \-3e and .B \-5e use slightly faster settings (lower CompCPU) than .B \-4e and .BR \-6e , respectively. That way no two presets are identical. .RS .RS .PP .TS tab(;); c c c c c n n n n n. Preset;DictSize;CompCPU;CompMem;DecMem \-0e;256 KiB;8;4 MiB;1 MiB \-1e;1 MiB;8;13 MiB;2 MiB \-2e;2 MiB;8;25 MiB;3 MiB \-3e;4 MiB;7;48 MiB;5 MiB \-4e;4 MiB;8;48 MiB;5 MiB \-5e;8 MiB;7;94 MiB;9 MiB \-6e;8 MiB;8;94 MiB;9 MiB \-7e;16 MiB;8;186 MiB;17 MiB \-8e;32 MiB;8;370 MiB;33 MiB \-9e;64 MiB;8;674 MiB;65 MiB .TE .RE .RE .IP "" For example, there are a total of four presets that use 8\ MiB dictionary, whose order from the fastest to the slowest is .BR \-5 , .BR \-6 , .BR \-5e , and .BR \-6e . .TP .B \-\-fast .PD 0 .TP .B \-\-best .PD These are somewhat misleading aliases for .B \-0 and .BR \-9 , respectively. These are provided only for backwards compatibility with LZMA Utils. Avoid using these options. .TP .BI \-\-block\-size= size When compressing to the .B .xz format, split the input data into blocks of .I size bytes. The blocks are compressed independently from each other, which helps with multi-threading and makes limited random-access decompression possible. This option is typically used to override the default block size in multi-threaded mode, but this option can be used in single-threaded mode too. .IP "" In multi-threaded mode about three times .I size bytes will be allocated in each thread for buffering input and output. The default .I size is three times the LZMA2 dictionary size or 1 MiB, whichever is more. Typically a good value is 2\-4 times the size of the LZMA2 dictionary or at least 1 MiB. Using .I size less than the LZMA2 dictionary size is waste of RAM because then the LZMA2 dictionary buffer will never get fully used. The sizes of the blocks are stored in the block headers, which a future version of .B xz will use for multi-threaded decompression. .IP "" In single-threaded mode no block splitting is done by default. Setting this option doesn't affect memory usage. No size information is stored in block headers, thus files created in single-threaded mode won't be identical to files created in multi-threaded mode. The lack of size information also means that a future version of .B xz won't be able decompress the files in multi-threaded mode. .TP .BI \-\-block\-list= sizes When compressing to the .B .xz format, start a new block after the given intervals of uncompressed data. .IP "" The uncompressed .I sizes of the blocks are specified as a comma-separated list. Omitting a size (two or more consecutive commas) is a shorthand to use the size of the previous block. .IP "" If the input file is bigger than the sum of .IR sizes , the last value in .I sizes is repeated until the end of the file. A special value of .B 0 may be used as the last value to indicate that the rest of the file should be encoded as a single block. .IP "" If one specifies .I sizes that exceed the encoder's block size (either the default value in threaded mode or the value specified with \fB\-\-block\-size=\fIsize\fR), the encoder will create additional blocks while keeping the boundaries specified in .IR sizes . For example, if one specifies .B \-\-block\-size=10MiB .B \-\-block\-list=5MiB,10MiB,8MiB,12MiB,24MiB and the input file is 80 MiB, one will get 11 blocks: 5, 10, 8, 10, 2, 10, 10, 4, 10, 10, and 1 MiB. .IP "" In multi-threaded mode the sizes of the blocks are stored in the block headers. This isn't done in single-threaded mode, so the encoded output won't be identical to that of the multi-threaded mode. .TP .BI \-\-flush\-timeout= timeout When compressing, if more than .I timeout milliseconds (a positive integer) has passed since the previous flush and reading more input would block, all the pending input data is flushed from the encoder and made available in the output stream. This can be useful if .B xz is used to compress data that is streamed over a network. Small .I timeout values make the data available at the receiving end with a small delay, but large .I timeout values give better compression ratio. .IP "" This feature is disabled by default. If this option is specified more than once, the last one takes effect. The special .I timeout value of .B 0 can be used to explicitly disable this feature. .IP "" This feature is not available on non-POSIX systems. .IP "" .\" FIXME .B "This feature is still experimental." Currently .B xz is unsuitable for decompressing the stream in real time due to how .B xz does buffering. .TP .BI \-\-memlimit\-compress= limit Set a memory usage limit for compression. If this option is specified multiple times, the last one takes effect. .IP "" If the compression settings exceed the .IR limit , .B xz will adjust the settings downwards so that the limit is no longer exceeded and display a notice that automatic adjustment was done. Such adjustments are not made when compressing with .B \-\-format=raw or if .B \-\-no\-adjust has been specified. In those cases, an error is displayed and .B xz will exit with exit status 1. .IP "" The .I limit can be specified in multiple ways: .RS .IP \(bu 3 The .I limit can be an absolute value in bytes. Using an integer suffix like .B MiB can be useful. Example: .B "\-\-memlimit\-compress=80MiB" .IP \(bu 3 The .I limit can be specified as a percentage of total physical memory (RAM). This can be useful especially when setting the .B XZ_DEFAULTS environment variable in a shell initialization script that is shared between different computers. That way the limit is automatically bigger on systems with more memory. Example: .B "\-\-memlimit\-compress=70%" .IP \(bu 3 The .I limit can be reset back to its default value by setting it to .BR 0 . This is currently equivalent to setting the .I limit to .B max (no memory usage limit). Once multithreading support has been implemented, there may be a difference between .B 0 and .B max for the multithreaded case, so it is recommended to use .B 0 instead of .B max until the details have been decided. .RE .IP "" See also the section .BR "Memory usage" . .TP .BI \-\-memlimit\-decompress= limit Set a memory usage limit for decompression. This also affects the .B \-\-list mode. If the operation is not possible without exceeding the .IR limit , .B xz will display an error and decompressing the file will fail. See .BI \-\-memlimit\-compress= limit for possible ways to specify the .IR limit . .TP \fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, \fB\-\-memory=\fIlimit This is equivalent to specifying \fB\-\-memlimit\-compress=\fIlimit \fB\-\-memlimit\-decompress=\fIlimit\fR. .TP .B \-\-no\-adjust Display an error and exit if the compression settings exceed the memory usage limit. The default is to adjust the settings downwards so that the memory usage limit is not exceeded. Automatic adjusting is always disabled when creating raw streams .RB ( \-\-format=raw ). .TP \fB\-T\fR \fIthreads\fR, \fB\-\-threads=\fIthreads Specify the number of worker threads to use. Setting .I threads to a special value .B 0 makes .B xz use as many threads as there are CPU cores on the system. The actual number of threads can be less than .I threads if the input file is not big enough for threading with the given settings or if using more threads would exceed the memory usage limit. .IP "" Currently the only threading method is to split the input into blocks and compress them independently from each other. The default block size depends on the compression level and can be overriden with the .BI \-\-block\-size= size option. .IP "" Threaded decompression hasn't been implemented yet. It will only work on files that contain multiple blocks with size information in block headers. All files compressed in multi-threaded mode meet this condition, but files compressed in single-threaded mode don't even if .BI \-\-block\-size= size is used. . .SS "Custom compressor filter chains" A custom filter chain allows specifying the compression settings in detail instead of relying on the settings associated to the presets. When a custom filter chain is specified, preset options (\fB\-0\fR ... \fB\-9\fR and \fB\-\-extreme\fR) earlier on the command line are forgotten. If a preset option is specified after one or more custom filter chain options, the new preset takes effect and the custom filter chain options specified earlier are forgotten. .PP A filter chain is comparable to piping on the command line. When compressing, the uncompressed input goes to the first filter, whose output goes to the next filter (if any). The output of the last filter gets written to the compressed file. The maximum number of filters in the chain is four, but typically a filter chain has only one or two filters. .PP Many filters have limitations on where they can be in the filter chain: some filters can work only as the last filter in the chain, some only as a non-last filter, and some work in any position in the chain. Depending on the filter, this limitation is either inherent to the filter design or exists to prevent security issues. .PP A custom filter chain is specified by using one or more filter options in the order they are wanted in the filter chain. That is, the order of filter options is significant! When decoding raw streams .RB ( \-\-format=raw ), the filter chain is specified in the same order as it was specified when compressing. .PP Filters take filter-specific .I options as a comma-separated list. Extra commas in .I options are ignored. Every option has a default value, so you need to specify only those you want to change. .PP To see the whole filter chain and .IR options , use .B "xz \-vv" (that is, use .B \-\-verbose twice). This works also for viewing the filter chain options used by presets. .TP \fB\-\-lzma1\fR[\fB=\fIoptions\fR] .PD 0 .TP \fB\-\-lzma2\fR[\fB=\fIoptions\fR] .PD Add LZMA1 or LZMA2 filter to the filter chain. These filters can be used only as the last filter in the chain. .IP "" LZMA1 is a legacy filter, which is supported almost solely due to the legacy .B .lzma file format, which supports only LZMA1. LZMA2 is an updated version of LZMA1 to fix some practical issues of LZMA1. The .B .xz format uses LZMA2 and doesn't support LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 are practically the same. .IP "" LZMA1 and LZMA2 share the same set of .IR options : .RS .TP .BI preset= preset Reset all LZMA1 or LZMA2 .I options to .IR preset . .I Preset consist of an integer, which may be followed by single-letter preset modifiers. The integer can be from .B 0 to .BR 9 , matching the command line options \fB\-0\fR ... \fB\-9\fR. The only supported modifier is currently .BR e , which matches .BR \-\-extreme . If no .B preset is specified, the default values of LZMA1 or LZMA2 .I options are taken from the preset .BR 6 . .TP .BI dict= size Dictionary (history buffer) .I size indicates how many bytes of the recently processed uncompressed data is kept in memory. The algorithm tries to find repeating byte sequences (matches) in the uncompressed data, and replace them with references to the data currently in the dictionary. The bigger the dictionary, the higher is the chance to find a match. Thus, increasing dictionary .I size usually improves compression ratio, but a dictionary bigger than the uncompressed file is waste of memory. .IP "" Typical dictionary .I size is from 64\ KiB to 64\ MiB. The minimum is 4\ KiB. The maximum for compression is currently 1.5\ GiB (1536\ MiB). The decompressor already supports dictionaries up to one byte less than 4\ GiB, which is the maximum for the LZMA1 and LZMA2 stream formats. .IP "" Dictionary .I size and match finder .RI ( mf ) together determine the memory usage of the LZMA1 or LZMA2 encoder. The same (or bigger) dictionary .I size is required for decompressing that was used when compressing, thus the memory usage of the decoder is determined by the dictionary size used when compressing. The .B .xz headers store the dictionary .I size either as .RI "2^" n or .RI "2^" n " + 2^(" n "\-1)," so these .I sizes are somewhat preferred for compression. Other .I sizes will get rounded up when stored in the .B .xz headers. .TP .BI lc= lc Specify the number of literal context bits. The minimum is 0 and the maximum is 4; the default is 3. In addition, the sum of .I lc and .I lp must not exceed 4. .IP "" All bytes that cannot be encoded as matches are encoded as literals. That is, literals are simply 8-bit bytes that are encoded one at a time. .IP "" The literal coding makes an assumption that the highest .I lc bits of the previous uncompressed byte correlate with the next byte. E.g. in typical English text, an upper-case letter is often followed by a lower-case letter, and a lower-case letter is usually followed by another lower-case letter. In the US-ASCII character set, the highest three bits are 010 for upper-case letters and 011 for lower-case letters. When .I lc is at least 3, the literal coding can take advantage of this property in the uncompressed data. .IP "" The default value (3) is usually good. If you want maximum compression, test .BR lc=4 . Sometimes it helps a little, and sometimes it makes compression worse. If it makes it worse, test e.g.\& .B lc=2 too. .TP .BI lp= lp Specify the number of literal position bits. The minimum is 0 and the maximum is 4; the default is 0. .IP "" .I Lp affects what kind of alignment in the uncompressed data is assumed when encoding literals. See .I pb below for more information about alignment. .TP .BI pb= pb Specify the number of position bits. The minimum is 0 and the maximum is 4; the default is 2. .IP "" .I Pb affects what kind of alignment in the uncompressed data is assumed in general. The default means four-byte alignment .RI (2^ pb =2^2=4), which is often a good choice when there's no better guess. .IP "" When the aligment is known, setting .I pb accordingly may reduce the file size a little. E.g. with text files having one-byte alignment (US-ASCII, ISO-8859-*, UTF-8), setting .B pb=0 can improve compression slightly. For UTF-16 text, .B pb=1 is a good choice. If the alignment is an odd number like 3 bytes, .B pb=0 might be the best choice. .IP "" Even though the assumed alignment can be adjusted with .I pb and .IR lp , LZMA1 and LZMA2 still slightly favor 16-byte alignment. It might be worth taking into account when designing file formats that are likely to be often compressed with LZMA1 or LZMA2. .TP .BI mf= mf Match finder has a major effect on encoder speed, memory usage, and compression ratio. Usually Hash Chain match finders are faster than Binary Tree match finders. The default depends on the .IR preset : 0 uses .BR hc3 , 1\-3 use .BR hc4 , and the rest use .BR bt4 . .IP "" The following match finders are supported. The memory usage formulas below are rough approximations, which are closest to the reality when .I dict is a power of two. .RS .TP .B hc3 Hash Chain with 2- and 3-byte hashing .br Minimum value for .IR nice : 3 .br Memory usage: .br .I dict * 7.5 (if .I dict <= 16 MiB); .br .I dict * 5.5 + 64 MiB (if .I dict > 16 MiB) .TP .B hc4 Hash Chain with 2-, 3-, and 4-byte hashing .br Minimum value for .IR nice : 4 .br Memory usage: .br .I dict * 7.5 (if .I dict <= 32 MiB); .br .I dict * 6.5 (if .I dict > 32 MiB) .TP .B bt2 Binary Tree with 2-byte hashing .br Minimum value for .IR nice : 2 .br Memory usage: .I dict * 9.5 .TP .B bt3 Binary Tree with 2- and 3-byte hashing .br Minimum value for .IR nice : 3 .br Memory usage: .br .I dict * 11.5 (if .I dict <= 16 MiB); .br .I dict * 9.5 + 64 MiB (if .I dict > 16 MiB) .TP .B bt4 Binary Tree with 2-, 3-, and 4-byte hashing .br Minimum value for .IR nice : 4 .br Memory usage: .br .I dict * 11.5 (if .I dict <= 32 MiB); .br .I dict * 10.5 (if .I dict > 32 MiB) .RE .TP .BI mode= mode Compression .I mode specifies the method to analyze the data produced by the match finder. Supported .I modes are .B fast and .BR normal . The default is .B fast for .I presets 0\-3 and .B normal for .I presets 4\-9. .IP "" Usually .B fast is used with Hash Chain match finders and .B normal with Binary Tree match finders. This is also what the .I presets do. .TP .BI nice= nice Specify what is considered to be a nice length for a match. Once a match of at least .I nice bytes is found, the algorithm stops looking for possibly better matches. .IP "" .I Nice can be 2\-273 bytes. Higher values tend to give better compression ratio at the expense of speed. The default depends on the .IR preset . .TP .BI depth= depth Specify the maximum search depth in the match finder. The default is the special value of 0, which makes the compressor determine a reasonable .I depth from .I mf and .IR nice . .IP "" Reasonable .I depth for Hash Chains is 4\-100 and 16\-1000 for Binary Trees. Using very high values for .I depth can make the encoder extremely slow with some files. Avoid setting the .I depth over 1000 unless you are prepared to interrupt the compression in case it is taking far too long. .RE .IP "" When decoding raw streams .RB ( \-\-format=raw ), LZMA2 needs only the dictionary .IR size . LZMA1 needs also .IR lc , .IR lp , and .IR pb . .TP \fB\-\-x86\fR[\fB=\fIoptions\fR] .PD 0 .TP \fB\-\-powerpc\fR[\fB=\fIoptions\fR] .TP \fB\-\-ia64\fR[\fB=\fIoptions\fR] .TP \fB\-\-arm\fR[\fB=\fIoptions\fR] .TP \fB\-\-armthumb\fR[\fB=\fIoptions\fR] .TP \fB\-\-sparc\fR[\fB=\fIoptions\fR] .PD Add a branch/call/jump (BCJ) filter to the filter chain. These filters can be used only as a non-last filter in the filter chain. .IP "" A BCJ filter converts relative addresses in the machine code to their absolute counterparts. This doesn't change the size of the data, but it increases redundancy, which can help LZMA2 to produce 0\-15\ % smaller .B .xz file. The BCJ filters are always reversible, so using a BCJ filter for wrong type of data doesn't cause any data loss, although it may make the compression ratio slightly worse. .IP "" It is fine to apply a BCJ filter on a whole executable; there's no need to apply it only on the executable section. Applying a BCJ filter on an archive that contains both executable and non-executable files may or may not give good results, so it generally isn't good to blindly apply a BCJ filter when compressing binary packages for distribution. .IP "" These BCJ filters are very fast and use insignificant amount of memory. If a BCJ filter improves compression ratio of a file, it can improve decompression speed at the same time. This is because, on the same hardware, the decompression speed of LZMA2 is roughly a fixed number of bytes of compressed data per second. .IP "" These BCJ filters have known problems related to the compression ratio: .RS .IP \(bu 3 Some types of files containing executable code (e.g. object files, static libraries, and Linux kernel modules) have the addresses in the instructions filled with filler values. These BCJ filters will still do the address conversion, which will make the compression worse with these files. .IP \(bu 3 Applying a BCJ filter on an archive containing multiple similar executables can make the compression ratio worse than not using a BCJ filter. This is because the BCJ filter doesn't detect the boundaries of the executable files, and doesn't reset the address conversion counter for each executable. .RE .IP "" Both of the above problems will be fixed in the future in a new filter. The old BCJ filters will still be useful in embedded systems, because the decoder of the new filter will be bigger and use more memory. .IP "" Different instruction sets have have different alignment: .RS .RS .PP .TS tab(;); l n l l n l. Filter;Alignment;Notes x86;1;32-bit or 64-bit x86 PowerPC;4;Big endian only ARM;4;Little endian only ARM-Thumb;2;Little endian only IA-64;16;Big or little endian SPARC;4;Big or little endian .TE .RE .RE .IP "" Since the BCJ-filtered data is usually compressed with LZMA2, the compression ratio may be improved slightly if the LZMA2 options are set to match the alignment of the selected BCJ filter. For example, with the IA-64 filter, it's good to set .B pb=4 with LZMA2 (2^4=16). The x86 filter is an exception; it's usually good to stick to LZMA2's default four-byte alignment when compressing x86 executables. .IP "" All BCJ filters support the same .IR options : .RS .TP .BI start= offset Specify the start .I offset that is used when converting between relative and absolute addresses. The .I offset must be a multiple of the alignment of the filter (see the table above). The default is zero. In practice, the default is good; specifying a custom .I offset is almost never useful. .RE .TP \fB\-\-delta\fR[\fB=\fIoptions\fR] Add the Delta filter to the filter chain. The Delta filter can be only used as a non-last filter in the filter chain. .IP "" Currently only simple byte-wise delta calculation is supported. It can be useful when compressing e.g. uncompressed bitmap images or uncompressed PCM audio. However, special purpose algorithms may give significantly better results than Delta + LZMA2. This is true especially with audio, which compresses faster and better e.g. with .BR flac (1). .IP "" Supported .IR options : .RS .TP .BI dist= distance Specify the .I distance of the delta calculation in bytes. .I distance must be 1\-256. The default is 1. .IP "" For example, with .B dist=2 and eight-byte input A1 B1 A2 B3 A3 B5 A4 B7, the output will be A1 B1 01 02 01 02 01 02. .RE . .SS "Other options" .TP .BR \-q ", " \-\-quiet Suppress warnings and notices. Specify this twice to suppress errors too. This option has no effect on the exit status. That is, even if a warning was suppressed, the exit status to indicate a warning is still used. .TP .BR \-v ", " \-\-verbose Be verbose. If standard error is connected to a terminal, .B xz will display a progress indicator. Specifying .B \-\-verbose twice will give even more verbose output. .IP "" The progress indicator shows the following information: .RS .IP \(bu 3 Completion percentage is shown if the size of the input file is known. That is, the percentage cannot be shown in pipes. .IP \(bu 3 Amount of compressed data produced (compressing) or consumed (decompressing). .IP \(bu 3 Amount of uncompressed data consumed (compressing) or produced (decompressing). .IP \(bu 3 Compression ratio, which is calculated by dividing the amount of compressed data processed so far by the amount of uncompressed data processed so far. .IP \(bu 3 Compression or decompression speed. This is measured as the amount of uncompressed data consumed (compression) or produced (decompression) per second. It is shown after a few seconds have passed since .B xz started processing the file. .IP \(bu 3 Elapsed time in the format M:SS or H:MM:SS. .IP \(bu 3 Estimated remaining time is shown only when the size of the input file is known and a couple of seconds have already passed since .B xz started processing the file. The time is shown in a less precise format which never has any colons, e.g. 2 min 30 s. .RE .IP "" When standard error is not a terminal, .B \-\-verbose will make .B xz print the filename, compressed size, uncompressed size, compression ratio, and possibly also the speed and elapsed time on a single line to standard error after compressing or decompressing the file. The speed and elapsed time are included only when the operation took at least a few seconds. If the operation didn't finish, e.g. due to user interruption, also the completion percentage is printed if the size of the input file is known. .TP .BR \-Q ", " \-\-no\-warn Don't set the exit status to 2 even if a condition worth a warning was detected. This option doesn't affect the verbosity level, thus both .B \-\-quiet and .B \-\-no\-warn have to be used to not display warnings and to not alter the exit status. .TP .B \-\-robot Print messages in a machine-parsable format. This is intended to ease writing frontends that want to use .B xz instead of liblzma, which may be the case with various scripts. The output with this option enabled is meant to be stable across .B xz releases. See the section .B "ROBOT MODE" for details. .TP .BR \-\-info\-memory Display, in human-readable format, how much physical memory (RAM) .B xz thinks the system has and the memory usage limits for compression and decompression, and exit successfully. .TP .BR \-h ", " \-\-help Display a help message describing the most commonly used options, and exit successfully. .TP .BR \-H ", " \-\-long\-help Display a help message describing all features of .BR xz , and exit successfully .TP .BR \-V ", " \-\-version Display the version number of .B xz and liblzma in human readable format. To get machine-parsable output, specify .B \-\-robot before .BR \-\-version . . .SH "ROBOT MODE" The robot mode is activated with the .B \-\-robot option. It makes the output of .B xz easier to parse by other programs. Currently .B \-\-robot is supported only together with .BR \-\-version , .BR \-\-info\-memory , and .BR \-\-list . It will be supported for compression and decompression in the future. . .SS Version .B "xz \-\-robot \-\-version" will print the version number of .B xz and liblzma in the following format: .PP .BI XZ_VERSION= XYYYZZZS .br .BI LIBLZMA_VERSION= XYYYZZZS .TP .I X Major version. .TP .I YYY Minor version. Even numbers are stable. Odd numbers are alpha or beta versions. .TP .I ZZZ Patch level for stable releases or just a counter for development releases. .TP .I S Stability. 0 is alpha, 1 is beta, and 2 is stable. .I S should be always 2 when .I YYY is even. .PP .I XYYYZZZS are the same on both lines if .B xz and liblzma are from the same XZ Utils release. .PP Examples: 4.999.9beta is .B 49990091 and 5.0.0 is .BR 50000002 . . .SS "Memory limit information" .B "xz \-\-robot \-\-info\-memory" prints a single line with three tab-separated columns: .IP 1. 4 Total amount of physical memory (RAM) in bytes .IP 2. 4 Memory usage limit for compression in bytes. A special value of zero indicates the default setting, which for single-threaded mode is the same as no limit. .IP 3. 4 Memory usage limit for decompression in bytes. A special value of zero indicates the default setting, which for single-threaded mode is the same as no limit. .PP In the future, the output of .B "xz \-\-robot \-\-info\-memory" may have more columns, but never more than a single line. . .SS "List mode" .B "xz \-\-robot \-\-list" uses tab-separated output. The first column of every line has a string that indicates the type of the information found on that line: .TP .B name This is always the first line when starting to list a file. The second column on the line is the filename. .TP .B file This line contains overall information about the .B .xz file. This line is always printed after the .B name line. .TP .B stream This line type is used only when .B \-\-verbose was specified. There are as many .B stream lines as there are streams in the .B .xz file. .TP .B block This line type is used only when .B \-\-verbose was specified. There are as many .B block lines as there are blocks in the .B .xz file. The .B block lines are shown after all the .B stream lines; different line types are not interleaved. .TP .B summary This line type is used only when .B \-\-verbose was specified twice. This line is printed after all .B block lines. Like the .B file line, the .B summary line contains overall information about the .B .xz file. .TP .B totals This line is always the very last line of the list output. It shows the total counts and sizes. .PP The columns of the .B file lines: .PD 0 .RS .IP 2. 4 Number of streams in the file .IP 3. 4 Total number of blocks in the stream(s) .IP 4. 4 Compressed size of the file .IP 5. 4 Uncompressed size of the file .IP 6. 4 Compression ratio, for example .BR 0.123. If ratio is over 9.999, three dashes .RB ( \-\-\- ) are displayed instead of the ratio. .IP 7. 4 Comma-separated list of integrity check names. The following strings are used for the known check types: .BR None , .BR CRC32 , .BR CRC64 , and .BR SHA\-256 . For unknown check types, .BI Unknown\- N is used, where .I N is the Check ID as a decimal number (one or two digits). .IP 8. 4 Total size of stream padding in the file .RE .PD .PP The columns of the .B stream lines: .PD 0 .RS .IP 2. 4 Stream number (the first stream is 1) .IP 3. 4 Number of blocks in the stream .IP 4. 4 Compressed start offset .IP 5. 4 Uncompressed start offset .IP 6. 4 Compressed size (does not include stream padding) .IP 7. 4 Uncompressed size .IP 8. 4 Compression ratio .IP 9. 4 Name of the integrity check .IP 10. 4 Size of stream padding .RE .PD .PP The columns of the .B block lines: .PD 0 .RS .IP 2. 4 Number of the stream containing this block .IP 3. 4 Block number relative to the beginning of the stream (the first block is 1) .IP 4. 4 Block number relative to the beginning of the file .IP 5. 4 Compressed start offset relative to the beginning of the file .IP 6. 4 Uncompressed start offset relative to the beginning of the file .IP 7. 4 Total compressed size of the block (includes headers) .IP 8. 4 Uncompressed size .IP 9. 4 Compression ratio .IP 10. 4 Name of the integrity check .RE .PD .PP If .B \-\-verbose was specified twice, additional columns are included on the .B block lines. These are not displayed with a single .BR \-\-verbose , because getting this information requires many seeks and can thus be slow: .PD 0 .RS .IP 11. 4 Value of the integrity check in hexadecimal .IP 12. 4 Block header size .IP 13. 4 Block flags: .B c indicates that compressed size is present, and .B u indicates that uncompressed size is present. If the flag is not set, a dash .RB ( \- ) is shown instead to keep the string length fixed. New flags may be added to the end of the string in the future. .IP 14. 4 Size of the actual compressed data in the block (this excludes the block header, block padding, and check fields) .IP 15. 4 Amount of memory (in bytes) required to decompress this block with this .B xz version .IP 16. 4 Filter chain. Note that most of the options used at compression time cannot be known, because only the options that are needed for decompression are stored in the .B .xz headers. .RE .PD .PP The columns of the .B summary lines: .PD 0 .RS .IP 2. 4 Amount of memory (in bytes) required to decompress this file with this .B xz version .IP 3. 4 .B yes or .B no indicating if all block headers have both compressed size and uncompressed size stored in them .PP .I Since .B xz .I 5.1.2alpha: .IP 4. 4 Minimum .B xz version required to decompress the file .RE .PD .PP The columns of the .B totals line: .PD 0 .RS .IP 2. 4 Number of streams .IP 3. 4 Number of blocks .IP 4. 4 Compressed size .IP 5. 4 Uncompressed size .IP 6. 4 Average compression ratio .IP 7. 4 Comma-separated list of integrity check names that were present in the files .IP 8. 4 Stream padding size .IP 9. 4 Number of files. This is here to keep the order of the earlier columns the same as on .B file lines. .PD .RE .PP If .B \-\-verbose was specified twice, additional columns are included on the .B totals line: .PD 0 .RS .IP 10. 4 Maximum amount of memory (in bytes) required to decompress the files with this .B xz version .IP 11. 4 .B yes or .B no indicating if all block headers have both compressed size and uncompressed size stored in them .PP .I Since .B xz .I 5.1.2alpha: .IP 12. 4 Minimum .B xz version required to decompress the file .RE .PD .PP Future versions may add new line types and new columns can be added to the existing line types, but the existing columns won't be changed. . .SH "EXIT STATUS" .TP .B 0 All is good. .TP .B 1 An error occurred. .TP .B 2 Something worth a warning occurred, but no actual errors occurred. .PP Notices (not warnings or errors) printed on standard error don't affect the exit status. . .SH ENVIRONMENT .B xz parses space-separated lists of options from the environment variables .B XZ_DEFAULTS and .BR XZ_OPT , in this order, before parsing the options from the command line. Note that only options are parsed from the environment variables; all non-options are silently ignored. Parsing is done with .BR getopt_long (3) which is used also for the command line arguments. .TP .B XZ_DEFAULTS User-specific or system-wide default options. Typically this is set in a shell initialization script to enable .BR xz 's memory usage limiter by default. Excluding shell initialization scripts and similar special cases, scripts must never set or unset .BR XZ_DEFAULTS . .TP .B XZ_OPT This is for passing options to .B xz when it is not possible to set the options directly on the .B xz command line. This is the case e.g. when .B xz is run by a script or tool, e.g. GNU .BR tar (1): .RS .RS .PP .nf .ft CW XZ_OPT=\-2v tar caf foo.tar.xz foo .ft R .fi .RE .RE .IP "" Scripts may use .B XZ_OPT e.g. to set script-specific default compression options. It is still recommended to allow users to override .B XZ_OPT if that is reasonable, e.g. in .BR sh (1) scripts one may use something like this: .RS .RS .PP .nf .ft CW XZ_OPT=${XZ_OPT\-"\-7e"} export XZ_OPT .ft R .fi .RE .RE . .SH "LZMA UTILS COMPATIBILITY" The command line syntax of .B xz is practically a superset of .BR lzma , .BR unlzma , and .BR lzcat as found from LZMA Utils 4.32.x. In most cases, it is possible to replace LZMA Utils with XZ Utils without breaking existing scripts. There are some incompatibilities though, which may sometimes cause problems. . .SS "Compression preset levels" The numbering of the compression level presets is not identical in .B xz and LZMA Utils. The most important difference is how dictionary sizes are mapped to different presets. Dictionary size is roughly equal to the decompressor memory usage. .RS .PP .TS tab(;); c c c c n n. Level;xz;LZMA Utils \-0;256 KiB;N/A \-1;1 MiB;64 KiB \-2;2 MiB;1 MiB \-3;4 MiB;512 KiB \-4;4 MiB;1 MiB \-5;8 MiB;2 MiB \-6;8 MiB;4 MiB \-7;16 MiB;8 MiB \-8;32 MiB;16 MiB \-9;64 MiB;32 MiB .TE .RE .PP The dictionary size differences affect the compressor memory usage too, but there are some other differences between LZMA Utils and XZ Utils, which make the difference even bigger: .RS .PP .TS tab(;); c c c c n n. Level;xz;LZMA Utils 4.32.x \-0;3 MiB;N/A \-1;9 MiB;2 MiB \-2;17 MiB;12 MiB \-3;32 MiB;12 MiB \-4;48 MiB;16 MiB \-5;94 MiB;26 MiB \-6;94 MiB;45 MiB \-7;186 MiB;83 MiB \-8;370 MiB;159 MiB \-9;674 MiB;311 MiB .TE .RE .PP The default preset level in LZMA Utils is .B \-7 while in XZ Utils it is .BR \-6 , so both use an 8 MiB dictionary by default. . .SS "Streamed vs. non-streamed .lzma files" The uncompressed size of the file can be stored in the .B .lzma header. LZMA Utils does that when compressing regular files. The alternative is to mark that uncompressed size is unknown and use end-of-payload marker to indicate where the decompressor should stop. LZMA Utils uses this method when uncompressed size isn't known, which is the case for example in pipes. .PP .B xz supports decompressing .B .lzma files with or without end-of-payload marker, but all .B .lzma files created by .B xz will use end-of-payload marker and have uncompressed size marked as unknown in the .B .lzma header. This may be a problem in some uncommon situations. For example, a .B .lzma decompressor in an embedded device might work only with files that have known uncompressed size. If you hit this problem, you need to use LZMA Utils or LZMA SDK to create .B .lzma files with known uncompressed size. . .SS "Unsupported .lzma files" The .B .lzma format allows .I lc values up to 8, and .I lp values up to 4. LZMA Utils can decompress files with any .I lc and .IR lp , but always creates files with .B lc=3 and .BR lp=0 . Creating files with other .I lc and .I lp is possible with .B xz and with LZMA SDK. .PP The implementation of the LZMA1 filter in liblzma requires that the sum of .I lc and .I lp must not exceed 4. Thus, .B .lzma files, which exceed this limitation, cannot be decompressed with .BR xz . .PP LZMA Utils creates only .B .lzma files which have a dictionary size of .RI "2^" n (a power of 2) but accepts files with any dictionary size. liblzma accepts only .B .lzma files which have a dictionary size of .RI "2^" n or .RI "2^" n " + 2^(" n "\-1)." This is to decrease false positives when detecting .B .lzma files. .PP These limitations shouldn't be a problem in practice, since practically all .B .lzma files have been compressed with settings that liblzma will accept. . .SS "Trailing garbage" When decompressing, LZMA Utils silently ignore everything after the first .B .lzma stream. In most situations, this is a bug. This also means that LZMA Utils don't support decompressing concatenated .B .lzma files. .PP If there is data left after the first .B .lzma stream, .B xz considers the file to be corrupt unless .B \-\-single\-stream was used. This may break obscure scripts which have assumed that trailing garbage is ignored. . .SH NOTES . .SS "Compressed output may vary" The exact compressed output produced from the same uncompressed input file may vary between XZ Utils versions even if compression options are identical. This is because the encoder can be improved (faster or better compression) without affecting the file format. The output can vary even between different builds of the same XZ Utils version, if different build options are used. .PP The above means that once .B \-\-rsyncable has been implemented, the resulting files won't necessarily be rsyncable unless both old and new files have been compressed with the same xz version. This problem can be fixed if a part of the encoder implementation is frozen to keep rsyncable output stable across xz versions. . .SS "Embedded .xz decompressors" Embedded .B .xz decompressor implementations like XZ Embedded don't necessarily support files created with integrity .I check types other than .B none and .BR crc32 . Since the default is .BR \-\-check=crc64 , you must use .B \-\-check=none or .B \-\-check=crc32 when creating files for embedded systems. .PP Outside embedded systems, all .B .xz format decompressors support all the .I check types, or at least are able to decompress the file without verifying the integrity check if the particular .I check is not supported. .PP XZ Embedded supports BCJ filters, but only with the default start offset. . .SH EXAMPLES . .SS Basics Compress the file .I foo into .I foo.xz using the default compression level .RB ( \-6 ), and remove .I foo if compression is successful: .RS .PP .nf .ft CW xz foo .ft R .fi .RE .PP Decompress .I bar.xz into .I bar and don't remove .I bar.xz even if decompression is successful: .RS .PP .nf .ft CW xz \-dk bar.xz .ft R .fi .RE .PP Create .I baz.tar.xz with the preset .B \-4e .RB ( "\-4 \-\-extreme" ), which is slower than e.g. the default .BR \-6 , but needs less memory for compression and decompression (48\ MiB and 5\ MiB, respectively): .RS .PP .nf .ft CW tar cf \- baz | xz \-4e > baz.tar.xz .ft R .fi .RE .PP A mix of compressed and uncompressed files can be decompressed to standard output with a single command: .RS .PP .nf .ft CW xz \-dcf a.txt b.txt.xz c.txt d.txt.lzma > abcd.txt .ft R .fi .RE . .SS "Parallel compression of many files" On GNU and *BSD, .BR find (1) and .BR xargs (1) can be used to parallelize compression of many files: .RS .PP .nf .ft CW find . \-type f \e! \-name '*.xz' \-print0 \e | xargs \-0r \-P4 \-n16 xz \-T1 .ft R .fi .RE .PP The .B \-P option to .BR xargs (1) sets the number of parallel .B xz processes. The best value for the .B \-n option depends on how many files there are to be compressed. If there are only a couple of files, the value should probably be 1; with tens of thousands of files, 100 or even more may be appropriate to reduce the number of .B xz processes that .BR xargs (1) will eventually create. .PP The option .B \-T1 for .B xz is there to force it to single-threaded mode, because .BR xargs (1) is used to control the amount of parallelization. . .SS "Robot mode" Calculate how many bytes have been saved in total after compressing multiple files: .RS .PP .nf .ft CW xz \-\-robot \-\-list *.xz | awk '/^totals/{print $5\-$4}' .ft R .fi .RE .PP A script may want to know that it is using new enough .BR xz . The following .BR sh (1) script checks that the version number of the .B xz tool is at least 5.0.0. This method is compatible with old beta versions, which didn't support the .B \-\-robot option: .RS .PP .nf .ft CW if ! eval "$(xz \-\-robot \-\-version 2> /dev/null)" || [ "$XZ_VERSION" \-lt 50000002 ]; then echo "Your xz is too old." fi unset XZ_VERSION LIBLZMA_VERSION .ft R .fi .RE .PP Set a memory usage limit for decompression using .BR XZ_OPT , but if a limit has already been set, don't increase it: .RS .PP .nf .ft CW NEWLIM=$((123 << 20)) # 123 MiB OLDLIM=$(xz \-\-robot \-\-info\-memory | cut \-f3) if [ $OLDLIM \-eq 0 \-o $OLDLIM \-gt $NEWLIM ]; then XZ_OPT="$XZ_OPT \-\-memlimit\-decompress=$NEWLIM" export XZ_OPT fi .ft R .fi .RE . .SS "Custom compressor filter chains" The simplest use for custom filter chains is customizing a LZMA2 preset. This can be useful, because the presets cover only a subset of the potentially useful combinations of compression settings. .PP The CompCPU columns of the tables from the descriptions of the options .BR "\-0" " ... " "\-9" and .B \-\-extreme are useful when customizing LZMA2 presets. Here are the relevant parts collected from those two tables: .RS .PP .TS tab(;); c c n n. Preset;CompCPU \-0;0 \-1;1 \-2;2 \-3;3 \-4;4 \-5;5 \-6;6 \-5e;7 \-6e;8 .TE .RE .PP If you know that a file requires somewhat big dictionary (e.g. 32 MiB) to compress well, but you want to compress it quicker than .B "xz \-8" would do, a preset with a low CompCPU value (e.g. 1) can be modified to use a bigger dictionary: .RS .PP .nf .ft CW xz \-\-lzma2=preset=1,dict=32MiB foo.tar .ft R .fi .RE .PP With certain files, the above command may be faster than .B "xz \-6" while compressing significantly better. However, it must be emphasized that only some files benefit from a big dictionary while keeping the CompCPU value low. The most obvious situation, where a big dictionary can help a lot, is an archive containing very similar files of at least a few megabytes each. The dictionary size has to be significantly bigger than any individual file to allow LZMA2 to take full advantage of the similarities between consecutive files. .PP If very high compressor and decompressor memory usage is fine, and the file being compressed is at least several hundred megabytes, it may be useful to use an even bigger dictionary than the 64 MiB that .B "xz \-9" would use: .RS .PP .nf .ft CW xz \-vv \-\-lzma2=dict=192MiB big_foo.tar .ft R .fi .RE .PP Using .B \-vv .RB ( "\-\-verbose \-\-verbose" ) like in the above example can be useful to see the memory requirements of the compressor and decompressor. Remember that using a dictionary bigger than the size of the uncompressed file is waste of memory, so the above command isn't useful for small files. .PP Sometimes the compression time doesn't matter, but the decompressor memory usage has to be kept low e.g. to make it possible to decompress the file on an embedded system. The following command uses .B \-6e .RB ( "\-6 \-\-extreme" ) as a base and sets the dictionary to only 64\ KiB. The resulting file can be decompressed with XZ Embedded (that's why there is .BR \-\-check=crc32 ) using about 100\ KiB of memory. .RS .PP .nf .ft CW xz \-\-check=crc32 \-\-lzma2=preset=6e,dict=64KiB foo .ft R .fi .RE .PP If you want to squeeze out as many bytes as possible, adjusting the number of literal context bits .RI ( lc ) and number of position bits .RI ( pb ) can sometimes help. Adjusting the number of literal position bits .RI ( lp ) might help too, but usually .I lc and .I pb are more important. E.g. a source code archive contains mostly US-ASCII text, so something like the following might give slightly (like 0.1\ %) smaller file than .B "xz \-6e" (try also without .BR lc=4 ): .RS .PP .nf .ft CW xz \-\-lzma2=preset=6e,pb=0,lc=4 source_code.tar .ft R .fi .RE .PP Using another filter together with LZMA2 can improve compression with certain file types. E.g. to compress a x86-32 or x86-64 shared library using the x86 BCJ filter: .RS .PP .nf .ft CW xz \-\-x86 \-\-lzma2 libfoo.so .ft R .fi .RE .PP Note that the order of the filter options is significant. If .B \-\-x86 is specified after .BR \-\-lzma2 , .B xz will give an error, because there cannot be any filter after LZMA2, and also because the x86 BCJ filter cannot be used as the last filter in the chain. .PP The Delta filter together with LZMA2 can give good results with bitmap images. It should usually beat PNG, which has a few more advanced filters than simple delta but uses Deflate for the actual compression. .PP The image has to be saved in uncompressed format, e.g. as uncompressed TIFF. The distance parameter of the Delta filter is set to match the number of bytes per pixel in the image. E.g. 24-bit RGB bitmap needs .BR dist=3 , and it is also good to pass .B pb=0 to LZMA2 to accommodate the three-byte alignment: .RS .PP .nf .ft CW xz \-\-delta=dist=3 \-\-lzma2=pb=0 foo.tiff .ft R .fi .RE .PP If multiple images have been put into a single archive (e.g.\& .BR .tar ), the Delta filter will work on that too as long as all images have the same number of bytes per pixel. . .SH "SEE ALSO" .BR xzdec (1), .BR xzdiff (1), .BR xzgrep (1), .BR xzless (1), .BR xzmore (1), .BR gzip (1), .BR bzip2 (1), .BR 7z (1) .PP -XZ Utils: +XZ Utils: .br -XZ Embedded: +XZ Embedded: .br LZMA SDK: Index: head/contrib/xz/src/xzdec/xzdec.1 =================================================================== --- head/contrib/xz/src/xzdec/xzdec.1 (revision 333782) +++ head/contrib/xz/src/xzdec/xzdec.1 (revision 333783) @@ -1,146 +1,146 @@ .\" .\" Author: Lasse Collin .\" .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZDEC 1 "2013-06-30" "Tukaani" "XZ Utils" +.TH XZDEC 1 "2017-04-19" "Tukaani" "XZ Utils" .SH NAME xzdec, lzmadec \- Small .xz and .lzma decompressors .SH SYNOPSIS .B xzdec .RI [ option... ] .RI [ file... ] .br .B lzmadec .RI [ option... ] .RI [ file... ] .SH DESCRIPTION .B xzdec is a liblzma-based decompression-only tool for .B .xz (and only .BR .xz ) files. .B xzdec is intended to work as a drop-in replacement for .BR xz (1) in the most common situations where a script has been written to use .B "xz \-\-decompress \-\-stdout" (and possibly a few other commonly used options) to decompress .B .xz files. .B lzmadec is identical to .B xzdec except that .B lzmadec supports .B .lzma files instead of .B .xz files. .PP To reduce the size of the executable, .B xzdec doesn't support multithreading or localization, and doesn't read options from .B XZ_DEFAULTS and .B XZ_OPT environment variables. .B xzdec doesn't support displaying intermediate progress information: sending .B SIGINFO to .B xzdec does nothing, but sending .B SIGUSR1 terminates the process instead of displaying progress information. .SH OPTIONS .TP .BR \-d ", " \-\-decompress ", " \-\-uncompress Ignored for .BR xz (1) compatibility. .B xzdec supports only decompression. .TP .BR \-k ", " \-\-keep Ignored for .BR xz (1) compatibility. .B xzdec never creates or removes any files. .TP .BR \-c ", " \-\-stdout ", " \-\-to-stdout Ignored for .BR xz (1) compatibility. .B xzdec always writes the decompressed data to standard output. .TP .BR \-q ", " \-\-quiet Specifying this once does nothing since .B xzdec never displays any warnings or notices. Specify this twice to suppress errors. .TP .BR \-Q ", " \-\-no-warn Ignored for .BR xz (1) compatibility. .B xzdec never uses the exit status 2. .TP .BR \-h ", " \-\-help Display a help message and exit successfully. .TP .BR \-V ", " \-\-version Display the version number of .B xzdec and liblzma. .SH "EXIT STATUS" .TP .B 0 All was good. .TP .B 1 An error occurred. .PP .B xzdec doesn't have any warning messages like .BR xz (1) has, thus the exit status 2 is not used by .BR xzdec . .SH NOTES Use .BR xz (1) instead of .B xzdec or .B lzmadec for normal everyday use. .B xzdec or .B lzmadec are meant only for situations where it is important to have a smaller decompressor than the full-featured .BR xz (1). .PP .B xzdec and .B lzmadec are not really that small. The size can be reduced further by dropping features from liblzma at compile time, but that shouldn't usually be done for executables distributed in typical non-embedded operating system distributions. If you need a truly small .B .xz decompressor, consider using XZ Embedded. .SH "SEE ALSO" .BR xz (1) .PP -XZ Embedded: +XZ Embedded: Index: head/contrib/xz =================================================================== --- head/contrib/xz (revision 333782) +++ head/contrib/xz (revision 333783) Property changes on: head/contrib/xz ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /vendor/xz/dist:r311478-333779 Index: head/lib/liblzma/config.h =================================================================== --- head/lib/liblzma/config.h (revision 333782) +++ head/lib/liblzma/config.h (revision 333783) @@ -1,516 +1,516 @@ /* $FreeBSD$ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ /* How many MiB of RAM to assume if the real amount cannot be determined. */ #define ASSUME_RAM 128 /* Define to 1 if translation of program messages to the user's native language is requested. */ /* FreeBSD - disabled intentionally */ /* #undef ENABLE_NLS */ /* Define to 1 if bswap_16 is available. */ /* #undef HAVE_BSWAP_16 */ /* Define to 1 if bswap_32 is available. */ /* #undef HAVE_BSWAP_32 */ /* Define to 1 if bswap_64 is available. */ /* #undef HAVE_BSWAP_64 */ /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ /* Define to 1 if Capsicum is available. */ /* #undef HAVE_CAPSICUM */ /* Define to 1 if the system has the type `CC_SHA256_CTX'. */ /* #undef HAVE_CC_SHA256_CTX */ /* Define to 1 if you have the `CC_SHA256_Init' function. */ /* #undef HAVE_CC_SHA256_INIT */ /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ /* #undef HAVE_CFLOCALECOPYCURRENT */ /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ /* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ /* Define to 1 if crc32 integrity check is enabled. */ #define HAVE_CHECK_CRC32 1 /* Define to 1 if crc64 integrity check is enabled. */ #define HAVE_CHECK_CRC64 1 /* Define to 1 if sha256 integrity check is enabled. */ #define HAVE_CHECK_SHA256 1 /* Define to 1 if you have the `clock_gettime' function. */ #define HAVE_CLOCK_GETTIME 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ /* Define if the GNU dcgettext() function is already present or preinstalled. */ /* FreeBSD - disabled intentionally */ /* #undef HAVE_DCGETTEXT */ /* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if you don't. */ #define HAVE_DECL_CLOCK_MONOTONIC 1 /* Define to 1 if you have the declaration of `program_invocation_name', and to 0 if you don't. */ #define HAVE_DECL_PROGRAM_INVOCATION_NAME 0 /* Define to 1 if any of HAVE_DECODER_foo have been defined. */ #define HAVE_DECODERS 1 /* Define to 1 if arm decoder is enabled. */ #define HAVE_DECODER_ARM 1 /* Define to 1 if armthumb decoder is enabled. */ #define HAVE_DECODER_ARMTHUMB 1 /* Define to 1 if delta decoder is enabled. */ #define HAVE_DECODER_DELTA 1 /* Define to 1 if ia64 decoder is enabled. */ #define HAVE_DECODER_IA64 1 /* Define to 1 if lzma1 decoder is enabled. */ #define HAVE_DECODER_LZMA1 1 /* Define to 1 if lzma2 decoder is enabled. */ #define HAVE_DECODER_LZMA2 1 /* Define to 1 if powerpc decoder is enabled. */ #define HAVE_DECODER_POWERPC 1 /* Define to 1 if sparc decoder is enabled. */ #define HAVE_DECODER_SPARC 1 /* Define to 1 if x86 decoder is enabled. */ #define HAVE_DECODER_X86 1 /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 /* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ #define HAVE_ENCODERS 1 /* Define to 1 if arm encoder is enabled. */ #define HAVE_ENCODER_ARM 1 /* Define to 1 if armthumb encoder is enabled. */ #define HAVE_ENCODER_ARMTHUMB 1 /* Define to 1 if delta encoder is enabled. */ #define HAVE_ENCODER_DELTA 1 /* Define to 1 if ia64 encoder is enabled. */ #define HAVE_ENCODER_IA64 1 /* Define to 1 if lzma1 encoder is enabled. */ #define HAVE_ENCODER_LZMA1 1 /* Define to 1 if lzma2 encoder is enabled. */ #define HAVE_ENCODER_LZMA2 1 /* Define to 1 if powerpc encoder is enabled. */ #define HAVE_ENCODER_POWERPC 1 /* Define to 1 if sparc encoder is enabled. */ #define HAVE_ENCODER_SPARC 1 /* Define to 1 if x86 encoder is enabled. */ #define HAVE_ENCODER_X86 1 /* Define to 1 if you have the header file. */ #define HAVE_FCNTL_H 1 /* Define to 1 if you have the `futimens' function. */ #define HAVE_FUTIMENS 1 /* Define to 1 if you have the `futimes' function. */ /* #undef HAVE_FUTIMES */ /* Define to 1 if you have the `futimesat' function. */ /* #undef HAVE_FUTIMESAT */ /* Define to 1 if you have the header file. */ #define HAVE_GETOPT_H 1 /* Define to 1 if you have the `getopt_long' function. */ #define HAVE_GETOPT_LONG 1 /* Define if the GNU gettext() function is already present or preinstalled. */ /* FreeBSD - disabled intentionally */ /* #undef HAVE_GETTEXT */ /* Define if you have the iconv() function and it works. */ #define HAVE_ICONV 1 /* Define to 1 if you have the header file. */ /* FreeBSD - only with clang because the base gcc does not support it */ #if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) #define HAVE_IMMINTRIN_H 1 #endif /* Define to 1 if you have the header file. */ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 /* Define to 1 if mbrtowc and mbstate_t are properly declared. */ #define HAVE_MBRTOWC 1 /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 /* Define to 1 to enable bt2 match finder. */ #define HAVE_MF_BT2 1 /* Define to 1 to enable bt3 match finder. */ #define HAVE_MF_BT3 1 /* Define to 1 to enable bt4 match finder. */ #define HAVE_MF_BT4 1 /* Define to 1 to enable hc3 match finder. */ #define HAVE_MF_HC3 1 /* Define to 1 to enable hc4 match finder. */ #define HAVE_MF_HC4 1 /* Define to 1 if getopt.h declares extern int optreset. */ #define HAVE_OPTRESET 1 /* Define to 1 if you have the `posix_fadvise' function. */ #define HAVE_POSIX_FADVISE 1 /* Define to 1 if you have the `pthread_condattr_setclock' function. */ #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 /* Have PTHREAD_PRIO_INHERIT. */ #define HAVE_PTHREAD_PRIO_INHERIT 1 /* Define to 1 if you have the `SHA256Init' function. */ /* #undef HAVE_SHA256INIT */ /* Define to 1 if the system has the type `SHA256_CTX'. */ /* FreeBSD - disabled libmd SHA256 for now */ /* #undef HAVE_SHA256_CTX */ /* Define to 1 if you have the header file. */ /* FreeBSD - disabled libmd SHA256 for now */ /* #undef HAVE_SHA256_H */ /* Define to 1 if you have the `SHA256_Init' function. */ /* FreeBSD - disabled libmd SHA256 for now */ /* #undef HAVE_SHA256_INIT */ /* Define to 1 if the system has the type `SHA2_CTX'. */ /* #undef HAVE_SHA2_CTX */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SHA2_H */ /* Define to 1 if optimizing for size. */ /* #undef HAVE_SMALL */ /* Define to 1 if stdbool.h conforms to C99. */ #define HAVE_STDBOOL_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 /* Define to 1 if `st_atimensec' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ /* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 /* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ /* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 /* Define to 1 if `st_uatime' is a member of `struct stat'. */ /* #undef HAVE_STRUCT_STAT_ST_UATIME */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_BYTEORDER_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_CAPSICUM_H */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_ENDIAN_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if the system has the type `uintptr_t'. */ #define HAVE_UINTPTR_T 1 /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the `utime' function. */ /* #undef HAVE_UTIME */ /* Define to 1 if you have the `utimes' function. */ /* #undef HAVE_UTIMES */ /* Define to 1 or 0, depending whether the compiler supports simple visibility declarations. */ #define HAVE_VISIBILITY 1 /* Define to 1 if you have the `wcwidth' function. */ #define HAVE_WCWIDTH 1 /* Define to 1 if the system has the type `_Bool'. */ #define HAVE__BOOL 1 /* Define to 1 if you have the `_futime' function. */ /* #undef HAVE__FUTIME */ /* Define to 1 if _mm_movemask_epi8 is available. */ #if defined(__FreeBSD__) && defined(__amd64__) #define HAVE__MM_MOVEMASK_EPI8 1 #endif /* Define to the sub-directory where libtool stores uninstalled libraries. */ #define LT_OBJDIR ".libs/" /* Define to 1 when using POSIX threads (pthreads). */ #define MYTHREAD_POSIX 1 /* Define to 1 when using Windows Vista compatible threads. This uses features that are not available on Windows XP. */ /* #undef MYTHREAD_VISTA */ /* Define to 1 when using Windows 95 (and thus XP) compatible threads. This avoids use of features that were added in Windows Vista. */ /* #undef MYTHREAD_WIN95 */ /* Define to 1 to disable debugging code. */ #define NDEBUG 1 /* Name of package */ #define PACKAGE "xz" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "lasse.collin@tukaani.org" /* Define to the full name of this package. */ #define PACKAGE_NAME "XZ Utils" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "XZ Utils 5.2.3" +#define PACKAGE_STRING "XZ Utils 5.2.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xz" /* Define to the home page for this package. */ -#define PACKAGE_URL "http://tukaani.org/xz/" +#define PACKAGE_URL "https://tukaani.org/xz/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "5.2.3" +#define PACKAGE_VERSION "5.2.4" /* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ /* The size of `size_t', as computed by sizeof. */ #define SIZEOF_SIZE_T 8 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Define to 1 if the number of available CPU cores can be detected with cpuset(2). */ #define TUKLIB_CPUCORES_CPUSET 1 /* Define to 1 if the number of available CPU cores can be detected with pstat_getdynamic(). */ /* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ /* Define to 1 if the number of available CPU cores can be detected with sched_getaffinity() */ /* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ /* Define to 1 if the number of available CPU cores can be detected with sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ /* #undef TUKLIB_CPUCORES_SYSCONF */ /* Define to 1 if the number of available CPU cores can be detected with sysctl(). */ /* #undef TUKLIB_CPUCORES_SYSCTL */ /* Define to 1 if the system supports fast unaligned access to 16-bit and 32-bit integers. */ /* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ /* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ /* Define to 1 if the amount of physical memory can be detected with _system_configuration.physmem. */ /* #undef TUKLIB_PHYSMEM_AIX */ /* Define to 1 if the amount of physical memory can be detected with getinvent_r(). */ /* #undef TUKLIB_PHYSMEM_GETINVENT_R */ /* Define to 1 if the amount of physical memory can be detected with getsysinfo(). */ /* #undef TUKLIB_PHYSMEM_GETSYSINFO */ /* Define to 1 if the amount of physical memory can be detected with pstat_getstatic(). */ /* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ /* Define to 1 if the amount of physical memory can be detected with sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ #define TUKLIB_PHYSMEM_SYSCONF 1 /* Define to 1 if the amount of physical memory can be detected with sysctl(). */ /* #undef TUKLIB_PHYSMEM_SYSCTL */ /* Define to 1 if the amount of physical memory can be detected with Linux sysinfo(). */ /* #undef TUKLIB_PHYSMEM_SYSINFO */ /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # define _ALL_SOURCE 1 #endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # define _GNU_SOURCE 1 #endif /* Enable threading extensions on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # define _POSIX_PTHREAD_SEMANTICS 1 #endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # define _TANDEM_SOURCE 1 #endif /* Enable general extensions on Solaris. */ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif /* Version number of package */ -#define VERSION "5.2.3" +#define VERSION "5.2.4" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined(__FreeBSD__) #include #if defined(__NO_STRICT_ALIGNMENT) #define TUKLIB_FAST_UNALIGNED_ACCESS 1 #endif #include #if _BYTE_ORDER == _BIG_ENDIAN # define WORDS_BIGENDIAN 1 #endif #endif /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 #endif /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */ /* Define to 1 if on MINIX. */ /* #undef _MINIX */ /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ /* #undef _POSIX_1_SOURCE */ /* Define to 1 if you need to in order for `stat' and other things to work. */ /* #undef _POSIX_SOURCE */ /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT32_T */ /* Define for Solaris 2.5.1 so the uint64_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT64_T */ /* Define for Solaris 2.5.1 so the uint8_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ /* #undef _UINT8_T */ /* Define to rpl_ if the getopt replacement functions and variables should be used. */ /* #undef __GETOPT_PREFIX */ /* Define to the type of a signed integer type of width exactly 32 bits if such a type exists and the standard includes do not define it. */ /* #undef int32_t */ /* Define to the type of a signed integer type of width exactly 64 bits if such a type exists and the standard includes do not define it. */ /* #undef int64_t */ /* Define to the type of an unsigned integer type of width exactly 16 bits if such a type exists and the standard includes do not define it. */ /* #undef uint16_t */ /* Define to the type of an unsigned integer type of width exactly 32 bits if such a type exists and the standard includes do not define it. */ /* #undef uint32_t */ /* Define to the type of an unsigned integer type of width exactly 64 bits if such a type exists and the standard includes do not define it. */ /* #undef uint64_t */ /* Define to the type of an unsigned integer type of width exactly 8 bits if such a type exists and the standard includes do not define it. */ /* #undef uint8_t */ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ /* #undef uintptr_t */