Merging upstream version 1.14.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
a5f6fd65d6
commit
981b7e2738
29 changed files with 744 additions and 652 deletions
10
ffexample.c
10
ffexample.c
|
@ -1,5 +1,5 @@
|
|||
/* File to file example - Test program for the library lzlib
|
||||
Copyright (C) 2010-2022 Antonio Diaz Diaz.
|
||||
Copyright (C) 2010-2024 Antonio Diaz Diaz.
|
||||
|
||||
This program is free software: you have unlimited permission
|
||||
to copy, distribute, and modify it.
|
||||
|
@ -245,7 +245,7 @@ int ffrsdecompress( struct LZ_Decoder * const decoder,
|
|||
if( LZ_decompress_errno( decoder ) == LZ_header_error ||
|
||||
LZ_decompress_errno( decoder ) == LZ_data_error )
|
||||
{ LZ_decompress_sync_to_member( decoder ); continue; }
|
||||
else break;
|
||||
break;
|
||||
}
|
||||
len = fwrite( buffer, 1, ret, outfile );
|
||||
if( len < ret ) break;
|
||||
|
@ -277,10 +277,10 @@ int main( const int argc, const char * const argv[] )
|
|||
{ fputs( "ffexample: Not enough memory.\n", stderr );
|
||||
LZ_compress_close( encoder ); LZ_decompress_close( decoder ); return 1; }
|
||||
if( !infile )
|
||||
{ fprintf( stderr, "ffexample: Can't open input file '%s': %s\n",
|
||||
{ fprintf( stderr, "ffexample: %s: Can't open input file: %s\n",
|
||||
argv[2], strerror( errno ) ); return 1; }
|
||||
if( !outfile )
|
||||
{ fprintf( stderr, "ffexample: Can't open output file '%s': %s\n",
|
||||
{ fprintf( stderr, "ffexample: %s: Can't open output file: %s\n",
|
||||
argv[3], strerror( errno ) ); return 1; }
|
||||
|
||||
switch( argv[1][1] )
|
||||
|
@ -291,7 +291,7 @@ int main( const int argc, const char * const argv[] )
|
|||
case 'm': retval = ffmmcompress( infile, outfile ); break;
|
||||
case 'l': retval = fflfcompress( encoder, infile, outfile ); break;
|
||||
case 'r': retval = ffrsdecompress( decoder, infile, outfile ); break;
|
||||
default: show_help(); return ( argv[1][1] != 'h' );
|
||||
default: show_help(); return argv[1][1] != 'h';
|
||||
}
|
||||
|
||||
if( LZ_decompress_close( decoder ) < 0 || LZ_compress_close( encoder ) < 0 ||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue