From 8c8d69247f5f90ea7eeac15bc4e34c5bbd16a3e4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 20 Feb 2025 21:34:33 +0100 Subject: [PATCH] Merging upstream version 1.15~pre2. Signed-off-by: Daniel Baumann --- COPYING.GPL | 3 +- ChangeLog | 7 +++ Makefile.in | 17 +++---- NEWS | 8 ++++ README | 2 +- carg_parser.c | 18 +++---- carg_parser.h | 11 +++-- configure | 8 ++-- decoder.c | 15 +++--- decoder.h | 14 +++--- doc/lzlib.info | 92 ++++++++++++++++++----------------- doc/lzlib.texi | 101 ++++++++++++++++++++------------------- doc/minilzip.1 | 8 ++-- encoder_base.c | 3 +- lzlib.c | 2 +- lzlib.h | 2 +- minilzip.c | 43 ++++++++++------- testsuite/check.sh | 77 ++++++++++++++++++++--------- testsuite/fox_nz.lz | Bin 0 -> 80 bytes testsuite/test.txt | 6 +-- testsuite/test.txt.lz | Bin 7376 -> 7341 bytes testsuite/test_em.txt.lz | Bin 14024 -> 0 bytes testsuite/test_sync.lz | Bin 7568 -> 7367 bytes 23 files changed, 249 insertions(+), 188 deletions(-) create mode 100644 testsuite/fox_nz.lz delete mode 100644 testsuite/test_em.txt.lz diff --git a/COPYING.GPL b/COPYING.GPL index 4ad17ae..42fe735 100644 --- a/COPYING.GPL +++ b/COPYING.GPL @@ -1,8 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/ChangeLog b/ChangeLog index a945949..33f023c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-10-16 Antonio Diaz Diaz + + * Version 1.15-pre2 released. + * decoder.h (Rd_try_reload): Reject a nonzero first LZMA byte. + * minilzip.c (do_decompress): Reject empty member in multimember. + * configure, Makefile.in: Don't use '--soname'; create 'liblz.so.1'. + 2024-04-19 Antonio Diaz Diaz * Version 1.15-pre1 released. diff --git a/Makefile.in b/Makefile.in index cf90c91..6d9035c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,16 +27,16 @@ lib : $(libname_static) $(libname_shared) lib$(libname).a : lzlib.o $(AR) $(ARFLAGS) $@ $< -lib$(libname).so.$(pkgversion) : lzlib_sh.o - $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $< +lib$(libname).so.$(soversion) : lzlib_sh.o + $(CC) $(CFLAGS) $(LDFLAGS) -fpic -fPIC -shared -o $@ $< bin : $(progname_static) $(progname_shared) $(progname) : $(objs) lib$(libname).a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).a -$(progname)_shared : $(objs) lib$(libname).so.$(pkgversion) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).so.$(pkgversion) +$(progname)_shared : $(objs) lib$(libname).so.$(soversion) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(objs) lib$(libname).so.$(soversion) bbexample : bbexample.o lib$(libname).a $(CC) $(CFLAGS) $(LDFLAGS) -o $@ bbexample.o lib$(libname).a @@ -113,15 +113,14 @@ install-lib : lib $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" ; \ fi if [ -n "$(libname_shared)" ] ; then \ - $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ run_ldconfig=no ; \ else run_ldconfig=yes ; \ fi ; \ rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \ rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ - cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \ - cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ + $(INSTALL_PROGRAM) ./lib$(libname).so.$(soversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ + cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(soversion) lib$(libname).so ; \ if [ "${disable_ldconfig}" != yes ] && [ $${run_ldconfig} = yes ] && \ [ -x "$(LDCONFIG)" ] ; then "$(LDCONFIG)" -n "$(DESTDIR)$(libdir)" || true ; fi ; \ fi @@ -162,7 +161,6 @@ uninstall-lib : -rm -f "$(DESTDIR)$(libdir)/lib$(libname).a" -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" - -rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" uninstall-info : -if $(CAN_RUN_INSTALLINFO) ; then \ @@ -196,8 +194,7 @@ dist : doc $(DISTNAME)/testsuite/fox.lz \ $(DISTNAME)/testsuite/fox_*.lz \ $(DISTNAME)/testsuite/test_sync.lz \ - $(DISTNAME)/testsuite/test.txt.lz \ - $(DISTNAME)/testsuite/test_em.txt.lz + $(DISTNAME)/testsuite/test.txt.lz rm -f $(DISTNAME) lzip -v -9 $(DISTNAME).tar diff --git a/NEWS b/NEWS index 94f6a9a..d7da1c1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ Changes in version 1.15: +Lzlib now reports a nonzero first LZMA byte as a LZ_data_error. + +minilzip now exits with error status 2 if any empty member is found in a +multimember file. + The targets 'lib' and 'bin' have been added to Makefile.in. 'lib' is the new default and builds just the library. 'bin' builds both the library and minilzip. @@ -9,3 +14,6 @@ minilzip is no longer built by default. 'install-bin' installs minilzip and its man page again. The use of the target 'bin' has been documented in INSTALL. + +To improve portability, the linker option '--soname' is no longer used. +Instead the shared library is written to 'liblz.so.1'. diff --git a/README b/README index 2207fb5..ec3a5a0 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Description Lzlib is a data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data. The compressed data format used by the library is the lzip format. -Lzlib is written in C. +Lzlib is written in C and is distributed under a 2-clause BSD license. The lzip file format is designed for data sharing and long-term archiving, taking into account both data integrity and decoder availability: diff --git a/carg_parser.c b/carg_parser.c index edb4eb9..e16fa73 100644 --- a/carg_parser.c +++ b/carg_parser.c @@ -148,21 +148,21 @@ static char parse_long_option( struct Arg_parser * const ap, add_error( ap, "' requires an argument" ); return 1; } - return push_back_record( ap, options[index].code, - options[index].long_name, &opt[len+3] ); + return push_back_record( ap, options[index].code, options[index].long_name, + &opt[len+3] ); /* argument may be empty */ } - if( options[index].has_arg == ap_yes ) + if( options[index].has_arg == ap_yes || options[index].has_arg == ap_yme ) { - if( !arg || !arg[0] ) + if( !arg || ( options[index].has_arg == ap_yes && !arg[0] ) ) { add_error( ap, "option '--" ); add_error( ap, options[index].long_name ); add_error( ap, "' requires an argument" ); return 1; } ++*argindp; - return push_back_record( ap, options[index].code, - options[index].long_name, arg ); + return push_back_record( ap, options[index].code, options[index].long_name, + arg ); /* argument may be empty */ } return push_back_record( ap, options[index].code, @@ -204,15 +204,15 @@ static char parse_short_option( struct Arg_parser * const ap, if( !push_back_record( ap, c, 0, &opt[cind] ) ) return 0; ++*argindp; cind = 0; } - else if( options[index].has_arg == ap_yes ) + else if( options[index].has_arg == ap_yes || options[index].has_arg == ap_yme ) { - if( !arg || !arg[0] ) + if( !arg || ( options[index].has_arg == ap_yes && !arg[0] ) ) { add_error( ap, "option requires an argument -- '" ); add_error( ap, code_str ); add_error( ap, "'" ); return 1; } - ++*argindp; cind = 0; + ++*argindp; cind = 0; /* argument may be empty */ if( !push_back_record( ap, c, 0, arg ) ) return 0; } else if( !push_back_record( ap, c, 0, 0 ) ) return 0; diff --git a/carg_parser.h b/carg_parser.h index 69ce271..65a6d7d 100644 --- a/carg_parser.h +++ b/carg_parser.h @@ -37,15 +37,20 @@ The argument '--' terminates all options; any following arguments are treated as non-option arguments, even if they begin with a hyphen. - The syntax for optional option arguments is '-' - (without whitespace), or '--='. + The syntax of options with an optional argument is + '-' (without whitespace), or + '--='. + + The syntax of options with an empty argument is '- ""', + '-- ""', or '--=""'. */ #ifdef __cplusplus extern "C" { #endif -enum ap_Has_arg { ap_no, ap_yes, ap_maybe }; +/* ap_yme = yes but maybe empty */ +enum ap_Has_arg { ap_no, ap_yes, ap_maybe, ap_yme }; struct ap_Option { diff --git a/configure b/configure index b24d769..7fa49d2 100755 --- a/configure +++ b/configure @@ -6,7 +6,7 @@ # to copy, distribute, and modify it. pkgname=lzlib -pkgversion=1.15-pre1 +pkgversion=1.15-pre2 soversion=1 libname=lz libname_static=lib${libname}.a @@ -118,12 +118,12 @@ while [ $# != 0 ] ; do --no-create) no_create=yes ;; --disable-static) libname_static= - libname_shared=lib${libname}.so.${pkgversion} progname_static= + libname_shared=lib${libname}.so.${soversion} progname_shared=${progname}_shared progname_lzip=${progname}_shared ;; --enable-shared) - libname_shared=lib${libname}.so.${pkgversion} + libname_shared=lib${libname}.so.${soversion} progname_shared=${progname}_shared progname_lzip=${progname}_shared ;; --disable-ldconfig) disable_ldconfig=yes ;; @@ -146,7 +146,7 @@ while [ $# != 0 ] ; do exit 1 ;; esac - # Check if the option took a separate argument + # Check whether the option took a separate argument if [ "${arg2}" = yes ] ; then if [ $# != 0 ] ; then args="${args} \"$1\"" ; shift else echo "configure: Missing argument to '${option}'" 1>&2 diff --git a/decoder.c b/decoder.c index d1fbe54..7b90d6e 100644 --- a/decoder.c +++ b/decoder.c @@ -35,7 +35,7 @@ static int LZd_try_check_trailer( struct LZ_decoder * const d ) /* Return value: 0 = OK, 1 = decoder error, 2 = unexpected EOF, 3 = trailer error, 4 = unknown marker found, - 5 = library error. */ + 5 = nonzero first LZMA byte found, 6 = library error. */ static int LZd_decode_member( struct LZ_decoder * const d ) { struct Range_decoder * const rdec = d->rdec; @@ -43,14 +43,15 @@ static int LZd_decode_member( struct LZ_decoder * const d ) unsigned old_mpos = rdec->member_position; if( d->member_finished ) return 0; - if( !Rd_try_reload( rdec ) ) - { if( !rdec->at_stream_end ) return 0; else return 2; } + const int tmp = Rd_try_reload( rdec ); + if( tmp > 1 ) return 5; + if( !tmp ) { if( !rdec->at_stream_end ) return 0; else return 2; } if( d->check_trailer_pending ) return LZd_try_check_trailer( d ); while( !Rd_finished( rdec ) ) { const unsigned mpos = rdec->member_position; - if( mpos - old_mpos > rd_min_available_bytes ) return 5; + if( mpos - old_mpos > rd_min_available_bytes ) return 6; old_mpos = mpos; if( !Rd_enough_available_bytes( rdec ) ) /* check unexpected EOF */ { if( !rdec->at_stream_end ) return 0; @@ -117,7 +118,7 @@ static int LZd_decode_member( struct LZ_decoder * const d ) { Rd_normalize( rdec ); const unsigned mpos = rdec->member_position; - if( mpos - old_mpos > rd_min_available_bytes ) return 5; + if( mpos - old_mpos > rd_min_available_bytes ) return 6; old_mpos = mpos; if( len == min_match_len ) /* End Of Stream marker */ { @@ -127,7 +128,9 @@ static int LZd_decode_member( struct LZ_decoder * const d ) if( len == min_match_len + 1 ) /* Sync Flush marker */ { rdec->reload_pending = true; - if( Rd_try_reload( rdec ) ) continue; + const int tmp = Rd_try_reload( rdec ); + if( tmp > 1 ) return 5; + if( tmp ) continue; if( !rdec->at_stream_end ) return 0; else break; } return 4; diff --git a/decoder.h b/decoder.h index 4b91fec..57e47cb 100644 --- a/decoder.h +++ b/decoder.h @@ -133,13 +133,15 @@ static inline bool Rd_unread_data( struct Range_decoder * const rdec, return true; } -static bool Rd_try_reload( struct Range_decoder * const rdec ) +static int Rd_try_reload( struct Range_decoder * const rdec ) { if( rdec->reload_pending && Rd_available_bytes( rdec ) >= 5 ) { rdec->reload_pending = false; rdec->code = 0; rdec->range = 0xFFFFFFFFU; + /* check first byte of the LZMA stream without reading it */ + if( rdec->cb.buffer[rdec->cb.get] != 0 ) return 2; Rd_get_byte( rdec ); /* discard first byte of the LZMA stream */ int i; for( i = 0; i < 4; ++i ) rdec->code = (rdec->code << 8) | Rd_get_byte( rdec ); @@ -164,7 +166,7 @@ static inline unsigned Rd_decode( struct Range_decoder * const rdec, rdec->range >>= 1; /* symbol <<= 1; */ /* if( rdec->code >= rdec->range ) { rdec->code -= rdec->range; symbol |= 1; } */ - const bool bit = ( rdec->code >= rdec->range ); + const bool bit = rdec->code >= rdec->range; symbol <<= 1; symbol += bit; rdec->code -= rdec->range & ( 0U - bit ); } @@ -387,14 +389,14 @@ static inline void LZd_copy_block( struct LZ_decoder * const d, bool fast, fast2; if( lpos > distance ) { - fast = ( len < d->cb.buffer_size - lpos ); - fast2 = ( fast && len <= lpos - i ); + fast = len < d->cb.buffer_size - lpos; + fast2 = fast && len <= lpos - i; } else { i += d->cb.buffer_size; - fast = ( len < d->cb.buffer_size - i ); /* (i == pos) may happen */ - fast2 = ( fast && len <= i - lpos ); + fast = len < d->cb.buffer_size - i; /* (i == pos) may happen */ + fast2 = fast && len <= i - lpos; } if( fast ) /* no wrap */ { diff --git a/doc/lzlib.info b/doc/lzlib.info index 314c98a..44bf3ce 100644 --- a/doc/lzlib.info +++ b/doc/lzlib.info @@ -11,7 +11,7 @@ File: lzlib.info, Node: Top, Next: Introduction, Up: (dir) Lzlib Manual ************ -This manual is for Lzlib (version 1.15-pre1, 19 April 2024). +This manual is for Lzlib (version 1.15-pre2, 16 October 2024). * Menu: @@ -24,7 +24,7 @@ This manual is for Lzlib (version 1.15-pre1, 19 April 2024). * Error codes:: Meaning of codes returned by functions * Error messages:: Error messages corresponding to error codes * Invoking minilzip:: Command-line interface of the test program -* Data format:: Detailed format of the compressed data +* File format:: Detailed format of the compressed file * Examples:: A small tutorial with examples * Problems:: Reporting bugs * Concept index:: Index of concepts @@ -44,7 +44,7 @@ File: lzlib.info, Node: Introduction, Next: Library version, Prev: Top, Up: Lzlib is a data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data. The compressed data format used by the library is the lzip format. -Lzlib is written in C. +Lzlib is written in C and is distributed under a 2-clause BSD license. The lzip file format is designed for data sharing and long-term archiving, taking into account both data integrity and decoder availability: @@ -339,7 +339,7 @@ except 'LZ_compress_open' whose return value must be checked by calling between applications using lzlib, but is useless and wasteful in a file, and is excluded from the media type 'application/lzip'. The LZMA marker '2' ("End Of Stream" marker) is the only marker allowed in lzip - files. *Note Data format::. + files. *Note File format::. Repeated use of 'LZ_compress_sync_flush' may degrade compression ratio, so use it only when needed. If the interval between calls to @@ -459,7 +459,7 @@ except 'LZ_decompress_open' whose return value must be checked by calling -- Function: int LZ_decompress_reset ( struct LZ_Decoder * const DECODER ) Resets the internal state of DECODER as it was just after opening it with the function 'LZ_decompress_open'. Data stored in the internal - buffers is discarded. Position counters are set to 0. + buffers are discarded. Position counters are set to 0. -- Function: int LZ_decompress_sync_to_member ( struct LZ_Decoder * const DECODER ) @@ -618,9 +618,10 @@ failed. If the call failed, then you can examine 'LZ_(de)compress_errno'. -- Constant: enum LZ_Errno LZ_data_error The data stream is corrupt. If 'LZ_decompress_member_position' is 6 or less, it indicates either a format version not supported, an invalid - dictionary size, a corrupt header in a multimember data stream, or - trailing data too similar to a valid lzip header. Lziprecover can be - used to remove conflicting trailing data from a file. + dictionary size, a nonzero first LZMA byte, a corrupt header in a + multimember data stream, or trailing data too similar to a valid lzip + header. Lziprecover can be used to repair some of these errors and to + remove conflicting trailing data from a file. -- Constant: enum LZ_Errno LZ_library_error A bug was detected in the library. Please, report it. *Note Problems::. @@ -641,7 +642,7 @@ File: lzlib.info, Node: Error messages, Next: Invoking minilzip, Prev: Error 'LZ_(de)compress_errno'.  -File: lzlib.info, Node: Invoking minilzip, Next: Data format, Prev: Error messages, Up: Top +File: lzlib.info, Node: Invoking minilzip, Next: File format, Prev: Error messages, Up: Top 9 Invoking minilzip ******************* @@ -658,8 +659,8 @@ maximum dictionary size is 512 MiB so that any lzip file can be decompressed on 32-bit machines. Lzip provides accurate and robust 3-factor integrity checking. Lzip can compress about as fast as gzip (lzip -0) or compress most files more than bzip2 (lzip -9). Decompression speed is intermediate between -gzip and bzip2. Lzip is better than gzip and bzip2 from a data recovery -perspective. Lzip has been designed, written, and tested with great care to +gzip and bzip2. Lzip provides better data recovery capabilities than gzip +and bzip2. Lzip has been designed, written, and tested with great care to replace gzip and bzip2 as the standard general-purpose compressed format for Unix-like systems. @@ -673,7 +674,7 @@ means standard input. It can be mixed with other FILES and is read just once, the first time it appears in the command line. Remember to prepend './' to any file name beginning with a hyphen, or use '--'. - minilzip supports the following options: *Note Argument syntax: +minilzip supports the following options: *Note Argument syntax: (arg_parser)Argument syntax. '-h' @@ -818,6 +819,7 @@ once, the first time it appears in the command line. Remember to prepend '-s64MiB -m273' Level Dictionary size (-s) Match length limit (-m) + ------------------------------------------------------ -0 64 KiB 16 bytes -1 1 MiB 5 bytes -2 1.5 MiB 6 bytes @@ -858,6 +860,7 @@ and may be followed by a multiplier and an optional 'B' for "byte". Table of SI and binary prefixes (unit multipliers): Prefix Value | Prefix Value +---------------------------------------------------------------------- k kilobyte (10^3 = 1000) | Ki kibibyte (2^10 = 1024) M megabyte (10^6) | Mi mebibyte (2^20) G gigabyte (10^9) | Gi gibibyte (2^30) @@ -876,16 +879,15 @@ corrupt or invalid input file, 3 for an internal consistency error (e.g., bug) which caused minilzip to panic.  -File: lzlib.info, Node: Data format, Next: Examples, Prev: Invoking minilzip, Up: Top +File: lzlib.info, Node: File format, Next: Examples, Prev: Invoking minilzip, Up: Top -10 Data format +10 File format ************** Perfection is reached, not when there is no longer anything to add, but when there is no longer anything to take away. -- Antoine de Saint-Exupery - In the diagram below, a box like this: +---+ @@ -900,12 +902,12 @@ when there is no longer anything to take away. represents a variable number of bytes. - - Lzip data consist of one or more independent "members" (compressed data -sets). The members simply appear one after another in the data stream, with -no additional information before, between, or after them. Each member can +A lzip file consists of one or more independent "members" (compressed data +sets). The members simply appear one after another in the file, with no +additional information before, between, or after them. Each member can encode in compressed form up to 16 EiB - 1 byte of uncompressed data. The -size of a multimember data stream is unlimited. +size of a multimember file is unlimited. Empty members (data size = 0) are +not allowed in multimember files. Each member has the following structure: @@ -933,7 +935,7 @@ size of a multimember data stream is unlimited. Valid values for dictionary size range from 4 KiB to 512 MiB. 'LZMA stream' - The LZMA stream, finished by an "End Of Stream" marker. Uses default + The LZMA stream, terminated by an "End Of Stream" marker. Uses default values for encoder properties. *Note Stream format: (lzip)Stream format, for a complete description. Lzip only uses the LZMA marker '2' ("End Of Stream" marker). Lzlib @@ -955,7 +957,7 @@ size of a multimember data stream is unlimited.  -File: lzlib.info, Node: Examples, Next: Problems, Prev: Data format, Up: Top +File: lzlib.info, Node: Examples, Next: Problems, Prev: File format, Up: Top 11 A small tutorial with examples ********************************* @@ -1287,13 +1289,13 @@ Concept index * buffering: Buffering. (line 6) * bugs: Problems. (line 6) * compression functions: Compression functions. (line 6) -* data format: Data format. (line 6) * decompression functions: Decompression functions. (line 6) * error codes: Error codes. (line 6) * error messages: Error messages. (line 6) * examples: Examples. (line 6) * file compression: File compression. (line 6) * file decompression: File decompression. (line 6) +* file format: File format. (line 6) * getting help: Problems. (line 6) * introduction: Introduction. (line 6) * invoking: Invoking minilzip. (line 6) @@ -1307,28 +1309,28 @@ Concept index  Tag Table: Node: Top215 -Node: Introduction1341 -Node: Library version6781 -Node: Buffering9332 -Node: Parameter limits10557 -Node: Compression functions11511 -Ref: member_size13304 -Ref: sync_flush15066 -Node: Decompression functions19754 -Node: Error codes27311 -Node: Error messages29601 -Node: Invoking minilzip30180 -Node: Data format40774 -Ref: coded-dict-size42220 -Node: Examples43625 -Node: Buffer compression44586 -Node: Buffer decompression46106 -Node: File compression47520 -Node: File decompression48503 -Node: File compression mm49507 -Node: Skipping data errors52536 -Node: Problems53841 -Node: Concept index54402 +Node: Introduction1343 +Node: Library version6831 +Node: Buffering9382 +Node: Parameter limits10607 +Node: Compression functions11561 +Ref: member_size13354 +Ref: sync_flush15116 +Node: Decompression functions19804 +Node: Error codes27362 +Node: Error messages29719 +Node: Invoking minilzip30298 +Node: File format41020 +Ref: coded-dict-size42518 +Node: Examples43925 +Node: Buffer compression44886 +Node: Buffer decompression46406 +Node: File compression47820 +Node: File decompression48803 +Node: File compression mm49807 +Node: Skipping data errors52836 +Node: Problems54141 +Node: Concept index54702  End Tag Table diff --git a/doc/lzlib.texi b/doc/lzlib.texi index 462c840..23bbbfb 100644 --- a/doc/lzlib.texi +++ b/doc/lzlib.texi @@ -6,8 +6,8 @@ @finalout @c %**end of header -@set UPDATED 19 April 2024 -@set VERSION 1.15-pre1 +@set UPDATED 16 October 2024 +@set VERSION 1.15-pre2 @dircategory Compression @direntry @@ -45,7 +45,7 @@ This manual is for Lzlib (version @value{VERSION}, @value{UPDATED}). * Error codes:: Meaning of codes returned by functions * Error messages:: Error messages corresponding to error codes * Invoking minilzip:: Command-line interface of the test program -* Data format:: Detailed format of the compressed data +* File format:: Detailed format of the compressed file * Examples:: A small tutorial with examples * Problems:: Reporting bugs * Concept index:: Index of concepts @@ -67,7 +67,7 @@ distribute, and modify it. is a data compression library providing in-memory LZMA compression and decompression functions, including integrity checking of the decompressed data. The compressed data format used by the library is the lzip format. -Lzlib is written in C. +Lzlib is written in C and is distributed under a 2-clause BSD license. The lzip file format is designed for data sharing and long-term archiving, taking into account both data integrity and decoder availability: @@ -103,16 +103,16 @@ lziprecover, losing an entire archive just because of a corrupt byte near the beginning is a thing of the past. The functions and variables forming the interface of the compression library -are declared in the file @samp{lzlib.h}. Usage examples of the library are -given in the files @samp{bbexample.c}, @samp{ffexample.c}, and -@samp{minilzip.c} from the source distribution. +are declared in the file @file{lzlib.h}. Usage examples of the library are +given in the files @file{bbexample.c}, @file{ffexample.c}, and +@file{minilzip.c} from the source distribution. -As @samp{lzlib.h} can be used by C and C++ programs, it must not impose a +As @file{lzlib.h} can be used by C and C++ programs, it must not impose a choice of system headers on the program by including one of them. Therefore it is the responsibility of the program using lzlib to include before -@samp{lzlib.h} some header that declares the type @samp{uint8_t}. There are -at least four such headers in C and C++: @samp{stdint.h}, @samp{cstdint}, -@samp{inttypes.h}, and @samp{cinttypes}. +@file{lzlib.h} some header that declares the type @samp{uint8_t}. There are +at least four such headers in C and C++: @file{stdint.h}, @file{cstdint}, +@file{inttypes.h}, and @file{cinttypes}. All the library functions are thread safe. The library does not install any signal handler. The decoder checks the consistency of the compressed data, @@ -183,10 +183,10 @@ versions of itself down to 1.0. Any application working with an older lzlib should work with a newer lzlib. Installing a newer lzlib should not break anything. This chapter describes the constants and functions that the application can use to discover the version of the library being used. All -of them are declared in @samp{lzlib.h}. +of them are declared in @file{lzlib.h}. @defvr Constant LZ_API_VERSION -This constant is defined in @samp{lzlib.h} and works as a version test +This constant is defined in @file{lzlib.h} and works as a version test macro. The application should check at compile time that LZ_API_VERSION is greater than or equal to the version required by the application: @@ -207,7 +207,7 @@ which allow the application to announce to the library its desire to have certain symbols and prototypes exposed. @deftypefun int LZ_api_version ( void ) -If LZ_API_VERSION >= 1012, this function is declared in @samp{lzlib.h} (else +If LZ_API_VERSION >= 1012, this function is declared in @file{lzlib.h} (else it doesn't exist). It returns the LZ_API_VERSION of the library object code being used. The application should check at run time that the value returned by @code{LZ_api_version} is greater than or equal to the version @@ -225,7 +225,7 @@ the functionality required by the application. @end deftypefun @deftypevr Constant {const char *} LZ_version_string -This string constant is defined in the header file @samp{lzlib.h} and +This string constant is defined in the header file @file{lzlib.h} and represents the version of the library being used at compile time. @end deftypevr @@ -385,7 +385,7 @@ lzip files; it is a device for interactive communication between applications using lzlib, but is useless and wasteful in a file, and is excluded from the media type @samp{application/lzip}. The LZMA marker @samp{2} ("End Of Stream" marker) is the only marker allowed in lzip files. -@xref{Data format}. +@xref{File format}. Repeated use of @samp{LZ_compress_sync_flush} may degrade compression ratio, so use it only when needed. If the interval between calls to @@ -524,7 +524,7 @@ detecting a truncated member. @deftypefun int LZ_decompress_reset ( struct LZ_Decoder * const @var{decoder} ) Resets the internal state of @var{decoder} as it was just after opening it with the function @samp{LZ_decompress_open}. Data stored in the -internal buffers is discarded. Position counters are set to 0. +internal buffers are discarded. Position counters are set to 0. @end deftypefun @@ -670,7 +670,7 @@ necessarily LZ_ok, and you should not use @samp{LZ_(de)compress_errno} to determine whether a call failed. If the call failed, then you can examine @samp{LZ_(de)compress_errno}. -The error codes are defined in the header file @samp{lzlib.h}. +The error codes are defined in the header file @file{lzlib.h}. @deftypevr Constant {enum LZ_Errno} LZ_ok The value of this constant is 0 and is used to indicate that there is no error. @@ -693,8 +693,8 @@ finished. @end deftypevr @deftypevr Constant {enum LZ_Errno} LZ_header_error -An invalid member header (one with the wrong magic bytes) was read. If -this happens at the end of the data stream it may indicate trailing data. +An invalid member header (one with the wrong magic bytes) was read. If this +happens at the end of the data stream it may indicate trailing data. @end deftypevr @deftypevr Constant {enum LZ_Errno} LZ_unexpected_eof @@ -702,11 +702,12 @@ The end of the data stream was reached in the middle of a member. @end deftypevr @deftypevr Constant {enum LZ_Errno} LZ_data_error -The data stream is corrupt. If @samp{LZ_decompress_member_position} is 6 -or less, it indicates either a format version not supported, an invalid -dictionary size, a corrupt header in a multimember data stream, or -trailing data too similar to a valid lzip header. Lziprecover can be -used to remove conflicting trailing data from a file. +The data stream is corrupt. If @samp{LZ_decompress_member_position} is 6 or +less, it indicates either a format version not supported, an invalid +dictionary size, a nonzero first LZMA byte, a corrupt header in a multimember +data stream, or trailing data too similar to a valid lzip header. +Lziprecover can be used to repair some of these errors and to remove +conflicting trailing data from a file. @end deftypevr @deftypevr Constant {enum LZ_Errno} LZ_library_error @@ -747,8 +748,8 @@ maximum dictionary size is 512 MiB so that any lzip file can be decompressed on 32-bit machines. Lzip provides accurate and robust 3-factor integrity checking. Lzip can compress about as fast as gzip @w{(lzip -0)} or compress most files more than bzip2 @w{(lzip -9)}. Decompression speed is intermediate between -gzip and bzip2. Lzip is better than gzip and bzip2 from a data recovery -perspective. Lzip has been designed, written, and tested with great care to +gzip and bzip2. Lzip provides better data recovery capabilities than gzip +and bzip2. Lzip has been designed, written, and tested with great care to replace gzip and bzip2 as the standard general-purpose compressed format for Unix-like systems. @@ -766,6 +767,7 @@ argument means standard input. It can be mixed with other @var{files} and is read just once, the first time it appears in the command line. Remember to prepend @file{./} to any file name beginning with a hyphen, or use @samp{--}. +@noindent minilzip supports the following @uref{http://www.nongnu.org/arg-parser/manual/arg_parser_manual.html#Argument-syntax,,options}: @ifnothtml @@ -823,7 +825,7 @@ Force overwrite of output files. @item -F @itemx --recompress When compressing, force re-compression of files whose name already has -the @samp{.lz} or @samp{.tlz} suffix. +the @file{.lz} or @file{.tlz} suffix. @item -k @itemx --keep @@ -846,8 +848,8 @@ when reading from a named pipe (fifo) or from a device. @w{@option{-o -}} is equivalent to @option{-c}. @option{-o} has no effect when testing. When compressing and splitting the output in volumes, @var{file} is used as -a prefix, and several files named @samp{@var{file}00001.lz}, -@samp{@var{file}00002.lz}, etc, are created. In this case, only one input +a prefix, and several files named @file{@var{file}00001.lz}, +@file{@var{file}00002.lz}, etc, are created. In this case, only one input file is allowed. @item -q @@ -873,7 +875,7 @@ is affected at compression time by the choice of dictionary size limit. @itemx --volume-size=@var{bytes} When compressing, and @option{-c} has not been also specified, split the compressed output into several volume files with names -@samp{original_name00001.lz}, @samp{original_name00002.lz}, etc, and set the +@file{original_name00001.lz}, @file{original_name00002.lz}, etc, and set the volume size limit to @var{bytes}. Input files are kept unchanged. Each volume is a complete, maybe multimember, lzip file. A small volume size may degrade compression ratio, so use it only when needed. Valid values range @@ -892,11 +894,10 @@ files. @item -v @itemx --verbose Verbose mode.@* -When compressing, show the compression ratio and size for each file -processed.@* -When decompressing or testing, further -v's (up to 4) increase the -verbosity level, showing status, compression ratio, dictionary size, -and trailer contents (CRC, data size, member size). +When compressing, show the compression ratio and size for each file processed.@* +When decompressing or testing, further -v's (up to 4) increase the verbosity +level, showing status, compression ratio, dictionary size, and trailer +contents (CRC, data size, member size). @item -0 .. -9 Compression level. Set the compression parameters (dictionary size and @@ -915,7 +916,7 @@ given, the last setting is used. For example @w{@option{-9 -s64MiB}} is equivalent to @w{@option{-s64MiB -m273}} @multitable {Level} {Dictionary size (-s)} {Match length limit (-m)} -@item Level @tab Dictionary size (-s) @tab Match length limit (-m) +@headitem Level @tab Dictionary size (-s) @tab Match length limit (-m) @item -0 @tab 64 KiB @tab 16 bytes @item -1 @tab 1 MiB @tab 5 bytes @item -2 @tab 1.5 MiB @tab 6 bytes @@ -960,7 +961,7 @@ and may be followed by a multiplier and an optional @samp{B} for "byte". Table of SI and binary prefixes (unit multipliers): @multitable {Prefix} {kilobyte (10^3 = 1000)} {|} {Prefix} {kibibyte (2^10 = 1024)} -@item Prefix @tab Value @tab | @tab Prefix @tab Value +@headitem Prefix @tab Value @tab | @tab Prefix @tab Value @item k @tab kilobyte (10^3 = 1000) @tab | @tab Ki @tab kibibyte (2^10 = 1024) @item M @tab megabyte (10^6) @tab | @tab Mi @tab mebibyte (2^20) @item G @tab gigabyte (10^9) @tab | @tab Gi @tab gibibyte (2^30) @@ -980,15 +981,14 @@ indicate a corrupt or invalid input file, 3 for an internal consistency error (e.g., bug) which caused minilzip to panic. -@node Data format -@chapter Data format -@cindex data format +@node File format +@chapter File format +@cindex file format Perfection is reached, not when there is no longer anything to add, but when there is no longer anything to take away.@* --- Antoine de Saint-Exupery -@sp 1 In the diagram below, a box like this: @verbatim @@ -1007,12 +1007,13 @@ represents one byte; a box like this: represents a variable number of bytes. -@sp 1 -Lzip data consist of one or more independent "members" (compressed data -sets). The members simply appear one after another in the data stream, with -no additional information before, between, or after them. Each member can +@noindent +A lzip file consists of one or more independent "members" (compressed data +sets). The members simply appear one after another in the file, with no +additional information before, between, or after them. Each member can encode in compressed form up to @w{16 EiB - 1 byte} of uncompressed data. -The size of a multimember data stream is unlimited. +The size of a multimember file is unlimited. Empty members (data size = 0) +are not allowed in multimember files. Each member has the following structure: @@ -1043,7 +1044,7 @@ Example: 0xD3 = 2^19 - 6 * 2^15 = 512 KiB - 6 * 32 KiB = 320 KiB@* Valid values for dictionary size range from 4 KiB to 512 MiB. @item LZMA stream -The LZMA stream, finished by an "End Of Stream" marker. Uses default values +The LZMA stream, terminated by an "End Of Stream" marker. Uses default values for encoder properties. @ifnothtml @xref{Stream format,,,lzip}, @@ -1077,8 +1078,8 @@ overflowing. @cindex examples This chapter provides real code examples for the most common uses of the -library. See these examples in context in the files @samp{bbexample.c} and -@samp{ffexample.c} from the source distribution of lzlib. +library. See these examples in context in the files @file{bbexample.c} and +@file{ffexample.c} from the source distribution of lzlib. Note that the interface of lzlib is symmetrical. That is, the code for normal compression and decompression is identical except because one calls diff --git a/doc/minilzip.1 b/doc/minilzip.1 index 22ad101..c60e528 100644 --- a/doc/minilzip.1 +++ b/doc/minilzip.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH MINILZIP "1" "April 2024" "minilzip 1.15-pre1" "User Commands" +.TH MINILZIP "1" "October 2024" "minilzip 1.15-pre2" "User Commands" .SH NAME minilzip \- reduces the size of files .SH SYNOPSIS @@ -16,8 +16,8 @@ maximum dictionary size is 512 MiB so that any lzip file can be decompressed on 32\-bit machines. Lzip provides accurate and robust 3\-factor integrity checking. Lzip can compress about as fast as gzip (lzip \fB\-0\fR) or compress most files more than bzip2 (lzip \fB\-9\fR). Decompression speed is intermediate between -gzip and bzip2. Lzip is better than gzip and bzip2 from a data recovery -perspective. Lzip has been designed, written, and tested with great care to +gzip and bzip2. Lzip provides better data recovery capabilities than gzip +and bzip2. Lzip has been designed, written, and tested with great care to replace gzip and bzip2 as the standard general\-purpose compressed format for Unix\-like systems. .SH OPTIONS @@ -120,7 +120,7 @@ License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. -Using lzlib 1.15\-pre1 +Using lzlib 1.15\-pre2 Using LZ_API_VERSION = 1015 .SH "SEE ALSO" The full documentation for diff --git a/encoder_base.c b/encoder_base.c index d2ed53c..cd790fb 100644 --- a/encoder_base.c +++ b/encoder_base.c @@ -168,7 +168,6 @@ static void LZeb_reset( struct LZ_encoder_base * const eb, { const unsigned long long min_member_size = min_dictionary_size; const unsigned long long max_member_size = 0x0008000000000000ULL; /* 2 PiB */ - int i; Mb_reset( &eb->mb ); eb->member_size_limit = min( max( min_member_size, member_size ), max_member_size ) - Lt_size - max_marker_size; @@ -186,7 +185,7 @@ static void LZeb_reset( struct LZ_encoder_base * const eb, Lm_init( &eb->match_len_model ); Lm_init( &eb->rep_len_model ); Re_reset( &eb->renc, eb->mb.dictionary_size ); - for( i = 0; i < num_rep_distances; ++i ) eb->reps[i] = 0; + int i; for( i = 0; i < num_rep_distances; ++i ) eb->reps[i] = 0; eb->state = 0; eb->member_finished = false; } diff --git a/lzlib.c b/lzlib.c index 4105205..23dd0ac 100644 --- a/lzlib.c +++ b/lzlib.c @@ -486,7 +486,7 @@ int LZ_decompress_read( struct LZ_Decoder * const d, { d->rdec->member_position += Cb_used_bytes( &d->rdec->cb ); Cb_reset( &d->rdec->cb ); d->lz_errno = LZ_unexpected_eof; } - else if( result == 5 ) d->lz_errno = LZ_library_error; + else if( result == 6 ) d->lz_errno = LZ_library_error; else d->lz_errno = LZ_data_error; d->fatal = true; if( Cb_empty( &d->lz_decoder->cb ) ) return -1; diff --git a/lzlib.h b/lzlib.h index 7a52342..431a736 100644 --- a/lzlib.h +++ b/lzlib.h @@ -26,7 +26,7 @@ extern "C" { #define LZ_API_VERSION 1015 -static const char * const LZ_version_string = "1.15-pre1"; +static const char * const LZ_version_string = "1.15-pre2"; enum LZ_Errno { LZ_ok = 0, LZ_bad_argument, LZ_mem_error, LZ_sequence_error, LZ_header_error, LZ_unexpected_eof, diff --git a/minilzip.c b/minilzip.c index c0e542a..db6a4d0 100644 --- a/minilzip.c +++ b/minilzip.c @@ -125,8 +125,8 @@ static void show_help( void ) "on 32-bit machines. Lzip provides accurate and robust 3-factor integrity\n" "checking. Lzip can compress about as fast as gzip (lzip -0) or compress most\n" "files more than bzip2 (lzip -9). Decompression speed is intermediate between\n" - "gzip and bzip2. Lzip is better than gzip and bzip2 from a data recovery\n" - "perspective. Lzip has been designed, written, and tested with great care to\n" + "gzip and bzip2. Lzip provides better data recovery capabilities than gzip\n" + "and bzip2. Lzip has been designed, written, and tested with great care to\n" "replace gzip and bzip2 as the standard general-purpose compressed format for\n" "Unix-like systems.\n" "\nUsage: %s [options] [files]\n", invocation_name ); @@ -348,7 +348,7 @@ static void show_header( const unsigned dictionary_size ) } -/* separate numbers of 5 or more digits in groups of 3 digits using '_' */ +/* separate numbers of 6 or more digits in groups of 3 digits using '_' */ static const char * format_num3( unsigned long long num ) { enum { buffers = 8, bufsize = 4 * sizeof num, n = 10 }; @@ -360,7 +360,7 @@ static const char * format_num3( unsigned long long num ) char * const buf = buffer[current++]; current %= buffers; char * p = buf + bufsize - 1; /* fill the buffer backwards */ *p = 0; /* terminator */ - if( num > 1024 ) + if( num > 9999 ) { char prefix = 0; /* try binary first, then si */ for( i = 0; i < n && num != 0 && num % 1024 == 0; ++i ) @@ -371,7 +371,7 @@ static const char * format_num3( unsigned long long num ) { num /= 1000; prefix = si_prefix[i]; } if( prefix ) *(--p) = prefix; } - const bool split = num >= 10000; + const bool split = num >= 100000; for( i = 0; ; ) { @@ -530,7 +530,7 @@ static int open_instream( const char * const name, struct stat * const in_statsp if( program_mode == m_compress && !recompress && eindex >= 0 ) { if( verbosity >= 0 ) - fprintf( stderr, "%s: %s: Input file already has '%s' suffix.\n", + fprintf( stderr, "%s: %s: Input file already has '%s' suffix, ignored.\n", program_name, name, known_extensions[eindex].from ); return -1; } @@ -845,13 +845,15 @@ static int compress( const unsigned long long member_size, static int do_decompress( struct LZ_Decoder * const decoder, const int infd, - struct Pretty_print * const pp, const bool ignore_trailing, - const bool loose_trailing, const bool testing ) + struct Pretty_print * const pp, const bool from_stdin, + const bool ignore_trailing, const bool loose_trailing, + const bool testing ) { enum { buffer_size = 65536 }; uint8_t buffer[buffer_size]; /* read/write buffer */ unsigned long long total_in = 0; /* to detect library stall */ bool first_member; + bool empty = false, nonempty = false; for( first_member = true; ; ) { @@ -890,9 +892,11 @@ static int do_decompress( struct LZ_Decoder * const decoder, const int infd, else if( rd < 0 ) { out_size = rd; break; } if( LZ_decompress_member_finished( decoder ) == 1 ) { + const unsigned long long data_size = LZ_decompress_data_position( decoder ); + if( !from_stdin ) + { if( data_size == 0 ) empty = true; else nonempty = true; } if( verbosity >= 1 ) { - const unsigned long long data_size = LZ_decompress_data_position( decoder ); const unsigned long long member_size = LZ_decompress_member_position( decoder ); if( verbosity >= 2 || ( verbosity == 1 && first_member ) ) Pp_show_msg( pp, 0 ); @@ -943,6 +947,8 @@ static int do_decompress( struct LZ_Decoder * const decoder, const int infd, LZ_decompress_member_version( decoder ) ); } } else if( member_pos == 5 ) Pp_show_msg( pp, "Invalid dictionary size in member header." ); + else if( member_pos == 6 ) + Pp_show_msg( pp, "Nonzero first LZMA byte." ); else if( first_member ) /* for lzlib older than 1.10 */ Pp_show_msg( pp, "Bad version or dictionary size in member header." ); else if( !loose_trailing ) @@ -982,12 +988,14 @@ static int do_decompress( struct LZ_Decoder * const decoder, const int infd, } } if( verbosity == 1 ) fputs( testing ? "ok\n" : "done\n", stderr ); + if( empty && nonempty ) + { show_file_error( pp->name, "Empty member not allowed.", 0 ); return 2; } return 0; } static int decompress( const int infd, struct Pretty_print * const pp, - const bool ignore_trailing, + const bool from_stdin, const bool ignore_trailing, const bool loose_trailing, const bool testing ) { struct LZ_Decoder * const decoder = LZ_decompress_open(); @@ -995,7 +1003,7 @@ static int decompress( const int infd, struct Pretty_print * const pp, if( !decoder || LZ_decompress_errno( decoder ) != LZ_ok ) { Pp_show_msg( pp, mem_msg ); retval = 1; } - else retval = do_decompress( decoder, infd, pp, ignore_trailing, + else retval = do_decompress( decoder, infd, pp, from_stdin, ignore_trailing, loose_trailing, testing ); LZ_decompress_close( decoder ); return retval; @@ -1098,7 +1106,7 @@ int main( const int argc, const char * const argv[] ) { 'V', "version", ap_no }, { opt_chk, "check-lib", ap_no }, { opt_lt, "loose-trailing", ap_no }, - { 0, 0, ap_no } }; + { 0, 0, ap_no } }; /* static because valgrind complains and memory management in C sucks */ static struct Arg_parser parser; @@ -1116,8 +1124,8 @@ int main( const int argc, const char * const argv[] ) const char * const arg = ap_argument( &parser, argind ); switch( code ) { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': + case '0': case '1': case '2': case '3': case '4': case '5': + case '6': case '7': case '8': case '9': encoder_options = option_mapping[code-'0']; break; case 'a': ignore_trailing = false; break; case 'b': member_size = getnum( arg, pn, 100000, max_member_size ); break; @@ -1130,7 +1138,7 @@ int main( const int argc, const char * const argv[] ) case 'm': encoder_options.match_len_limit = getnum( arg, pn, LZ_min_match_len_limit(), LZ_max_match_len_limit() ); break; - case 'n': break; + case 'n': break; /* ignored */ case 'o': if( strcmp( arg, "-" ) == 0 ) to_stdout = true; else { default_output_filename = arg; } break; case 'q': verbosity = -1; break; @@ -1212,9 +1220,10 @@ int main( const int argc, const char * const argv[] ) { const char * input_filename = ""; int infd; + const bool from_stdin = strcmp( filenames[i], "-" ) == 0; Pp_set_name( &pp, filenames[i] ); - if( strcmp( filenames[i], "-" ) == 0 ) + if( from_stdin ) { if( stdin_used ) continue; else stdin_used = true; infd = STDIN_FILENO; @@ -1260,7 +1269,7 @@ int main( const int argc, const char * const argv[] ) tmp = compress( member_size, volume_size, infd, &encoder_options, &pp, in_statsp ); else - tmp = decompress( infd, &pp, ignore_trailing, loose_trailing, + tmp = decompress( infd, &pp, from_stdin, ignore_trailing, loose_trailing, program_mode == m_test ); if( close( infd ) != 0 ) { show_file_error( pp.name, "Error closing input file", errno ); diff --git a/testsuite/check.sh b/testsuite/check.sh index 1c5daf7..21f6def 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -31,11 +31,11 @@ if [ -d tmp ] ; then rm -rf tmp ; fi mkdir tmp cd "${objdir}"/tmp || framework_failure -cat "${testdir}"/test.txt > in || framework_failure +cp "${testdir}"/test.txt in || framework_failure in_lz="${testdir}"/test.txt.lz -in_em="${testdir}"/test_em.txt.lz fox_lf="${testdir}"/fox_lf fox_lz="${testdir}"/fox.lz +fnz_lz="${testdir}"/fox_nz.lz fail=0 test_failed() { fail=1 ; printf " $1" ; [ -z "$2" ] || printf "($2)" ; } @@ -105,7 +105,7 @@ printf "LZIP\001+.............................." | "${LZIP}" -t 2> /dev/null printf "\ntesting decompression..." -for i in "${in_lz}" "${in_em}" "${testdir}"/test_sync.lz ; do +for i in "${in_lz}" "${testdir}"/test_sync.lz ; do "${LZIP}" -t "$i" || test_failed $LINENO "$i" "${LZIP}" -d "$i" -o out || test_failed $LINENO "$i" cmp in out || test_failed $LINENO "$i" @@ -118,16 +118,13 @@ for i in "${in_lz}" "${in_em}" "${testdir}"/test_sync.lz ; do rm -f out || framework_failure done -lines=`"${LZIP}" -tvv "${in_em}" 2>&1 | wc -l` || test_failed $LINENO -[ "${lines}" -eq 8 ] || test_failed $LINENO "${lines}" - -cat "${in_lz}" > out.lz || framework_failure +cp "${in_lz}" out.lz || framework_failure "${LZIP}" -dk out.lz || test_failed $LINENO cmp in out || test_failed $LINENO rm -f out || framework_failure "${LZIP}" -cd "${fox_lz}" > fox || test_failed $LINENO -cat fox > copy || framework_failure -cat "${in_lz}" > copy.lz || framework_failure +cp fox copy || framework_failure +cp "${in_lz}" copy.lz || framework_failure "${LZIP}" -d copy.lz out.lz 2> /dev/null # skip copy, decompress out [ $? = 1 ] || test_failed $LINENO [ ! -e out.lz ] || test_failed $LINENO @@ -138,7 +135,7 @@ cmp in out || test_failed $LINENO cmp in copy || test_failed $LINENO rm -f copy out || framework_failure -cat "${in_lz}" > out.lz || framework_failure +cp "${in_lz}" out.lz || framework_failure "${LZIP}" -d -S100k out.lz || test_failed $LINENO # ignore -S [ ! -e out.lz ] || test_failed $LINENO cmp in out || test_failed $LINENO @@ -154,7 +151,7 @@ rm -f ./- || framework_failure cmp in ./- || test_failed $LINENO rm -f ./- || framework_failure -cat "${in_lz}" > anyothername || framework_failure +cp "${in_lz}" anyothername || framework_failure "${LZIP}" -dv - anyothername - < "${in_lz}" > out 2> /dev/null || test_failed $LINENO cmp in out || test_failed $LINENO @@ -172,7 +169,7 @@ cat out in | cmp in - || test_failed $LINENO # out must be empty [ $? = 1 ] || test_failed $LINENO cmp in out || test_failed $LINENO rm -f out || framework_failure -cat "${in_lz}" > out.lz || framework_failure +cp "${in_lz}" out.lz || framework_failure for i in 1 2 3 4 5 6 7 ; do printf "g" >> out.lz || framework_failure "${LZIP}" -atvvvv out.lz "${in_lz}" 2> /dev/null @@ -201,6 +198,9 @@ cmp in2 out2 || test_failed $LINENO rm -f out2 || framework_failure cat "${in_lz}" "${in_lz}" > out2.lz || framework_failure +lines=`"${LZIP}" -tvv out2.lz 2>&1 | wc -l` || test_failed $LINENO +[ "${lines}" -eq 2 ] || test_failed $LINENO "${lines}" + printf "\ngarbage" >> out2.lz || framework_failure "${LZIP}" -tvvvv out2.lz 2> /dev/null || test_failed $LINENO "${LZIP}" -atq out2.lz @@ -218,6 +218,18 @@ printf "to be overwritten" > out2 || framework_failure cmp in2 out2 || test_failed $LINENO rm -f out2 || framework_failure +touch empty em || framework_failure +"${LZIP}" -0 em || test_failed $LINENO +"${LZIP}" -dk em.lz || test_failed $LINENO +cmp empty em || test_failed $LINENO +rm -f empty em || framework_failure +cat em.lz "${in_lz}" | "${LZIP}" -t || test_failed $LINENO +cat em.lz "${in_lz}" | "${LZIP}" -d > out || test_failed $LINENO +cmp in out || test_failed $LINENO +cat "${in_lz}" em.lz | "${LZIP}" -t || test_failed $LINENO +cat "${in_lz}" em.lz | "${LZIP}" -d > out || test_failed $LINENO +cmp in out || test_failed $LINENO + printf "\ntesting compression..." "${LZIP}" -c -0 in in in -S100k -o out3.lz > copy2.lz || test_failed $LINENO @@ -226,7 +238,7 @@ printf "\ntesting compression..." "${LZIP}" -d copy2.lz -o out2 || test_failed $LINENO [ -e copy2.lz ] || test_failed $LINENO cmp in2 out2 || test_failed $LINENO -rm -f out2 copy2.lz || framework_failure +rm -f copy2.lz || framework_failure "${LZIP}" -cf "${in_lz}" > lzlz 2> /dev/null # /dev/null is a tty on OS/2 [ $? = 1 ] || test_failed $LINENO @@ -293,7 +305,7 @@ rm -f out out.lz00001.lz out.lz00002.lz || framework_failure "${LZIP}" -t out00001.lz out00002.lz || test_failed $LINENO "${LZIP}" -cd out00001.lz out00002.lz | cmp in8.lz - || test_failed $LINENO [ ! -e out00003.lz ] || test_failed $LINENO -rm -f out00001.lz || framework_failure +rm -f out00001.lz out00002.lz || framework_failure "${LZIP}" -1 -S100k -o out < in8.lz || test_failed $LINENO "${LZIP}" -t out00001.lz out00002.lz || test_failed $LINENO "${LZIP}" -cd out00001.lz out00002.lz | cmp in8.lz - || test_failed $LINENO @@ -314,7 +326,8 @@ rm -f in8.lz in8.lz.lz || framework_failure "${BBEXAMPLE}" "${fox_lf}" || test_failed $LINENO "${FFEXAMPLE}" -h > /dev/null || test_failed $LINENO -"${FFEXAMPLE}" > /dev/null && test_failed $LINENO +"${FFEXAMPLE}" > /dev/null +[ $? = 1 ] || test_failed $LINENO rm -f out || framework_failure "${FFEXAMPLE}" -b in out || test_failed $LINENO cmp in out || test_failed $LINENO @@ -322,7 +335,6 @@ cmp in out || test_failed $LINENO "${FFEXAMPLE}" -b in8 | cmp in8 - || test_failed $LINENO "${FFEXAMPLE}" -b "${fox_lf}" | cmp "${fox_lf}" - || test_failed $LINENO "${FFEXAMPLE}" -d "${in_lz}" - | cmp in - || test_failed $LINENO -"${FFEXAMPLE}" -d "${in_em}" - | cmp in - || test_failed $LINENO "${FFEXAMPLE}" -c in | "${FFEXAMPLE}" -d | cmp in - || test_failed $LINENO "${FFEXAMPLE}" -m in | "${FFEXAMPLE}" -d | cmp in - || test_failed $LINENO "${FFEXAMPLE}" -l in | "${FFEXAMPLE}" -d | cmp in - || test_failed $LINENO @@ -340,9 +352,23 @@ rm -f in8 || framework_failure printf "\ntesting bad input..." +cat "${in_lz}" em.lz "${in_lz}" > inein.lz || framework_failure +"${LZIP}" -t < inein.lz || test_failed $LINENO +"${LZIP}" -d < inein.lz > out2 || test_failed $LINENO +cmp in2 out2 || test_failed $LINENO +"${LZIP}" -tq inein.lz +[ $? = 2 ] || test_failed $LINENO +"${LZIP}" -dq inein.lz +[ $? = 2 ] || test_failed $LINENO +[ ! -e inein ] || test_failed $LINENO +"${LZIP}" -cdq inein.lz > out2 +[ $? = 2 ] || test_failed $LINENO +cmp in2 out2 || test_failed $LINENO +rm -f out2 inein.lz || framework_failure + headers='LZIp LZiP LZip LzIP LzIp LziP lZIP lZIp lZiP lzIP' -body='\001\014\000\203\377\373\377\377\300\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000$\000\000\000\000\000\000\000' -cat "${in_lz}" > int.lz || framework_failure +body='\001\014\000\000\101\376\367\377\377\340\000\200\000\215\357\002\322\001\000\000\000\000\000\000\000\045\000\000\000\000\000\000\000' +cp "${in_lz}" int.lz || framework_failure printf "LZIP${body}" >> int.lz || framework_failure if "${LZIP}" -tq int.lz ; then for header in ${headers} ; do @@ -359,7 +385,7 @@ if "${LZIP}" -tq int.lz ; then [ $? = 2 ] || test_failed $LINENO ${header} "${LZIP}" -cdq --loose-trailing int.lz > /dev/null [ $? = 2 ] || test_failed $LINENO ${header} - cat "${in_lz}" > int.lz || framework_failure + cp "${in_lz}" int.lz || framework_failure printf "${header}${body}" >> int.lz || framework_failure "${LZIP}" -tq int.lz # trailing data [ $? = 2 ] || test_failed $LINENO ${header} @@ -385,6 +411,9 @@ else fi rm -f int.lz || framework_failure +"${LZIP}" -tq "${fnz_lz}" +[ $? = 2 ] || test_failed $LINENO + for i in fox_v2.lz fox_s11.lz fox_de20.lz \ fox_bcrc.lz fox_crc0.lz fox_das46.lz fox_mes81.lz ; do "${LZIP}" -tq "${testdir}"/$i @@ -400,9 +429,9 @@ rm -f fox out || framework_failure cat "${in_lz}" "${in_lz}" > in2.lz || framework_failure cat "${in_lz}" "${in_lz}" "${in_lz}" > in3.lz || framework_failure -if dd if=in3.lz of=trunc.lz bs=14752 count=1 2> /dev/null && +if dd if=in3.lz of=trunc.lz bs=14682 count=1 2> /dev/null && [ -e trunc.lz ] && cmp in2.lz trunc.lz > /dev/null 2>&1 ; then - for i in 6 20 14734 14753 14754 14755 14756 14757 14758 ; do + for i in 6 20 14664 14683 14684 14685 14686 14687 14688 ; do dd if=in3.lz of=trunc.lz bs=$i count=1 2> /dev/null "${LZIP}" -tq trunc.lz [ $? = 2 ] || test_failed $LINENO $i @@ -418,7 +447,7 @@ else fi rm -f in2.lz in3.lz trunc.lz || framework_failure -cat "${in_lz}" > ingin.lz || framework_failure +cp "${in_lz}" ingin.lz || framework_failure printf "g" >> ingin.lz || framework_failure cat "${in_lz}" >> ingin.lz || framework_failure "${LZIP}" -atq ingin.lz @@ -431,13 +460,15 @@ cat "${in_lz}" >> ingin.lz || framework_failure [ $? = 2 ] || test_failed $LINENO "${LZIP}" -t ingin.lz || test_failed $LINENO "${LZIP}" -t < ingin.lz || test_failed $LINENO +"${LZIP}" -dk ingin.lz || test_failed $LINENO +cmp in ingin || test_failed $LINENO "${LZIP}" -cd ingin.lz > out || test_failed $LINENO cmp in out || test_failed $LINENO "${LZIP}" -d < ingin.lz > out || test_failed $LINENO cmp in out || test_failed $LINENO "${FFEXAMPLE}" -d ingin.lz | cmp in - || test_failed $LINENO "${FFEXAMPLE}" -r ingin.lz | cmp in2 - || test_failed $LINENO -rm -f in2 out ingin.lz || framework_failure +rm -f in2 out ingin ingin.lz || framework_failure echo if [ ${fail} = 0 ] ; then diff --git a/testsuite/fox_nz.lz b/testsuite/fox_nz.lz new file mode 100644 index 0000000000000000000000000000000000000000..44a4b58b881d207627f6081d8ad04708c25400dc GIT binary patch literal 80 zcmeZ?@(f_)Nz{_!Sj4QF_R+iI=pxqtde3fNQjl6}^5c>03rDkGci1v_+dL64QRjTU cIqmVA>95u)|NqywfFbKlz-wIw2nc}E0AJQ0O8@`> literal 0 HcmV?d00001 diff --git a/testsuite/test.txt b/testsuite/test.txt index 9196a3a..423f0c0 100644 --- a/testsuite/test.txt +++ b/testsuite/test.txt @@ -1,8 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -339,8 +338,7 @@ Public License instead of this License. GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/testsuite/test.txt.lz b/testsuite/test.txt.lz index 22cea6e4d2a58b4dcb006541dcdb8defabba0cbb..5dc169f7fb6e952f17e7a21ce3691eeaac2fb3aa 100644 GIT binary patch delta 7294 zcmV-^9D(D|IjuR6Zhys3yJ(c8peBW%f-elXuLG8+YcW?HC;m#{D%pU^WiRDBah9%H zoNKDm$X*ivN}frZPJV^dtsX$0%Z^SSxrOZEO@c$q7owY! z`W;W~c7VLKKJvfUJ)mGF=tySp{PxY$8`#(o1p?=vxoYM*hkx#@T($B}rE}wqiNbai zPkS|>8W_N@+GNU=i-?`g4gP^bKc=(O|BTS>tf}Y}sWaDOa9)@f3Z>pC@4M?MqsMyf z$l9a4FCJZ;`)tQ5Wbrs^K<$Gkx9@N*`^#x7IXK%ex=T%-ID=$T@CGUn*XOjK7%aI^ z{P$K|lLRk7DSwY<;3s2ge)hV`mKFEf_=bs$Oa|MsKB4EOEq5 zbi#35GkG6xskoc^ai7hojVayH{;Ap%0D7qkn{2{=+J9YtzU8rM;x_SA8&KAYW1k_h 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 I000000MqzJBme*a diff --git a/testsuite/test_em.txt.lz b/testsuite/test_em.txt.lz deleted file mode 100644 index 7e96250d9ec70bc7d8cb173f438c76be447e6b6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14024 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 Gt^OBPlQ$#) diff --git a/testsuite/test_sync.lz b/testsuite/test_sync.lz index db680c3791f8739a100267383905301d0b0f5d13..2a6218bc7804f7c0e5ad14535c26a93acfb1f77b 100644 GIT binary patch delta 7329 zcmV;S9A4v)JI6T&Oj=1$0q>CpXn(~|yJ(c8peBW%f-elXuLG8+YcW?HC;m#{D%pU^ zWiRDBah9%HoNKDm$X*ivN}frZPJV^dtsX$0%Z^SSxrOZEO@c$q7owY!`W;W~c7VLKKJvfUJ)mGF=tySp{PxY$8`#(o1p?=vxoYM*hkx#@T($B} zrE}wqiNbaiPkS|>8W_N@+GNU=i-?`g4gP^bKc=(O|BTS>tf}Y}sWaDOa9)@f3Z>pC z@4M?MqsMyf$l9a4FCJZ;`)tQ5Wbrs^K<$Gkx9@N*`^#x7IXK%ex=T%-ID=$T@CGUn z*XOjK7%aI^{P$K|lLRk7DSwY<;3s2ge)hV`mKFEf_=bs$Oa| zMsKB4EOEq5bi#35GkG6xskoc^ai7hojVayH{;Ap%0D7qkn{2{=+J9YtzU8rM;x_SA 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 H00000T2*2% delta 7531 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