diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | doc/pdlzip.1 | 9 | ||||
| -rw-r--r-- | main.c | 10 | ||||
| -rwxr-xr-x | testsuite/check.sh | 6 |
6 files changed, 19 insertions, 28 deletions
@@ -1,18 +1,8 @@ -2010-03-14 Antonio Diaz Diaz <ant_diaz@teleline.es> +2010-04-05 Antonio Diaz Diaz <ant_diaz@teleline.es> - * Version 1.0-rc3 released. - * Remove some sizeofs and make other small changes. - -2010-02-27 Antonio Diaz Diaz <ant_diaz@teleline.es> - - * Version 1.0-rc2 released. - * Added support for files larger than 2GiB. - -2010-02-25 Antonio Diaz Diaz <ant_diaz@teleline.es> - - * Version 1.0-rc1 released. + * Version 1.0 released. * Initial release. - * Using LZMA SDK 9.10 from Igor Pavlov. + * Using LZMA SDK 9.10 (public domain) from Igor Pavlov. Copyright (C) 2010 Antonio Diaz Diaz. @@ -8,7 +8,7 @@ and data archiving. Pdlzip is a public domain version of the lzip data compressor, intended for those who can't (or do not want) distribute GPL licensed Free -Software. +Software. Pdlzip is written in C. Pdlzip uses public domain compression code from the LZMA SDK written by Igor Pavlov. @@ -5,12 +5,12 @@ # This configure script is free software: you have unlimited permission # to copy, distribute and modify it. # -# Date of this version: 2010-03-14 +# Date of this version: 2010-04-05 args= no_create= pkgname=pdlzip -pkgversion=1.0-rc3 +pkgversion=1.0 progname=pdlzip srctrigger=pdlzip.h diff --git a/doc/pdlzip.1 b/doc/pdlzip.1 index 2101880..c4a785e 100644 --- a/doc/pdlzip.1 +++ b/doc/pdlzip.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. -.TH PDLZIP "1" "March 2010" "Pdlzip 1.0-rc3" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.37.1. +.TH PDLZIP "1" "April 2010" "Pdlzip 1.0" "User Commands" .SH NAME Pdlzip \- data compressor based on the LZMA algorithm .SH SYNOPSIS @@ -51,8 +51,9 @@ Numbers may be followed by a multiplier: k = kB = 10^3 = 1000, Ki = KiB = 2^10 = 1024, M = 10^6, Mi = 2^20, G = 10^9, Gi = 2^30, etc... .SH "REPORTING BUGS" Report bugs to lzip\-bug@nongnu.org -.PP +.SH COPYRIGHT +Copyright \(co 2010 Antonio Diaz Diaz. Public Domain 2009 Igor Pavlov. -Copyright (C) 2010 Antonio Diaz Diaz. +.br This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -98,8 +98,8 @@ static void show_help() static void show_version()
{
printf( "%s %s\n", Program_name, PROGVERSION );
- printf( "Public Domain 2009 Igor Pavlov.\n" );
printf( "Copyright (C) %s Antonio Diaz Diaz.\n", program_year );
+ printf( "Public Domain 2009 Igor Pavlov.\n" );
printf( "This is free software: you are free to change and redistribute it.\n" );
printf( "There is NO WARRANTY, to the extent permitted by law.\n" );
}
@@ -205,7 +205,8 @@ static bool read_inbuf( ISeqInStream * const inStream, Byte inBuf[], static int Decode2( CLzmaDec *state, ISeqOutStream *outStream,
ISeqInStream *inStream, Byte inBuf[], size_t * const inPos,
- size_t * const inSize, const int version, const bool testing )
+ size_t * const inSize, const int member_version,
+ const bool testing )
{
long long total_in = Fh_size, total_out = 0;
Byte outBuf[OUT_BUF_SIZE];
@@ -246,7 +247,7 @@ static int Decode2( CLzmaDec *state, ISeqOutStream *outStream, { show_error( "data error", 0, false ); return 1; }
bool error = false;
File_trailer trailer;
- const size_t trailer_size = Ft_versioned_size( version );
+ const size_t trailer_size = Ft_versioned_size( member_version );
if( *inSize - *inPos < trailer_size &&
!read_inbuf( inStream, inBuf, inPos, inSize ) ) return 1;
if( *inSize - *inPos < trailer_size )
@@ -261,7 +262,7 @@ static int Decode2( CLzmaDec *state, ISeqOutStream *outStream, for( size_t i = 0; i < trailer_size; ++i )
trailer[i] = inBuf[(*inPos)++];
total_in += trailer_size;
- if( version == 0 ) Ft_set_member_size( trailer, total_in );
+ if( member_version == 0 ) Ft_set_member_size( trailer, total_in );
if( Ft_get_data_crc( trailer ) != ( crc ^ 0xFFFFFFFFU ) )
{
error = true;
@@ -563,7 +564,6 @@ int main( const int argc, const char * const argv[] ) case 'k': keep_input_files = true; break;
case 'm': encoder_options.match_len_limit =
getnum( arg, 0, min_match_len_limit, max_match_len ); break;
-// case 'o': default_output_filename = arg; break;
case 'q': verbosity = -1; break;
case 's': encoder_options.dictionary_size = get_dict_size( arg );
break;
diff --git a/testsuite/check.sh b/testsuite/check.sh index d179a3c..24e44df 100755 --- a/testsuite/check.sh +++ b/testsuite/check.sh @@ -28,7 +28,7 @@ fail=0 "${LZIP}" -cd "${testdir}"/test1.lz > copy || fail=1 cmp in copy || fail=1 -for i in s4Ki 0 1 2 3 4 5 6 7 ; do +for i in s4Ki 0 1 2 3 4 5 6 7 8s16 9s16 ; do "${LZIP}" -k -$i in || fail=1 mv -f in.lz copy.lz || fail=1 printf "garbage" >> copy.lz || fail=1 @@ -37,7 +37,7 @@ for i in s4Ki 0 1 2 3 4 5 6 7 ; do printf . done -for i in s4Ki 0 1 2 3 4 5 6 7 ; do +for i in s4Ki 0 1 2 3 4 5 6 7 8s16 9s16 ; do "${LZIP}" -c -$i in > out || fail=1 printf "g" >> out || fail=1 "${LZIP}" -cd out > copy || fail=1 @@ -45,7 +45,7 @@ for i in s4Ki 0 1 2 3 4 5 6 7 ; do printf . done -for i in s4Ki 0 1 2 3 4 5 6 7 ; do +for i in s4Ki 0 1 2 3 4 5 6 7 8s16 9s16 ; do "${LZIP}" -$i < in > out || fail=1 "${LZIP}" -d < out > copy || fail=1 cmp in copy || fail=1 |