Merging upstream version 1.4.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
e627412516
commit
8b0a7cb0e8
GPG key ID:
FBB4F0E80A80222F
16 changed files with 182 additions and 181 deletions
76
main.cc
76
main.cc
|
|
@ -82,8 +82,8 @@ struct { const char * from; const char * to; } const known_extensions[] = {
|
|||
|
||||
struct Lzma_options
|
||||
{
|
||||
int dictionary_size; /* 4 KiB .. 512 MiB */
|
||||
int match_len_limit; /* 5 .. 273 */
|
||||
int dictionary_size; // 4 KiB .. 512 MiB
|
||||
int match_len_limit; // 5 .. 273
|
||||
};
|
||||
|
||||
enum Mode { m_compress, m_decompress, m_test };
|
||||
|
|
@ -107,7 +107,7 @@ void show_help( const long num_online )
|
|||
" -c, --stdout send output to standard output\n"
|
||||
" -d, --decompress decompress\n"
|
||||
" -f, --force overwrite existing output files\n"
|
||||
" -F, --recompress force recompression of compressed files\n"
|
||||
" -F, --recompress force re-compression of compressed files\n"
|
||||
" -k, --keep keep (don't delete) input files\n"
|
||||
" -m, --match-length=<bytes> set match length limit in bytes [36]\n"
|
||||
" -n, --threads=<n> set number of (de)compression threads [%ld]\n"
|
||||
|
|
@ -145,7 +145,7 @@ void show_version()
|
|||
std::printf( "%s %s\n", program_name, PROGVERSION );
|
||||
std::printf( "Copyright (C) 2009 Laszlo Ersek.\n"
|
||||
"Copyright (C) %s Antonio Diaz Diaz.\n", program_year );
|
||||
std::printf( "Using Lzlib %s\n", LZ_version() );
|
||||
std::printf( "Using lzlib %s\n", LZ_version() );
|
||||
std::printf( "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
|
||||
"This is free software: you are free to change and redistribute it.\n"
|
||||
"There is NO WARRANTY, to the extent permitted by law.\n" );
|
||||
|
|
@ -189,7 +189,7 @@ unsigned long long getnum( const char * const ptr,
|
|||
|
||||
if( !errno && tail[0] )
|
||||
{
|
||||
int factor = ( tail[1] == 'i' ) ? 1024 : 1000;
|
||||
const int factor = ( tail[1] == 'i' ) ? 1024 : 1000;
|
||||
int exponent = 0;
|
||||
bool bad_multiplier = false;
|
||||
switch( tail[0] )
|
||||
|
|
@ -273,7 +273,7 @@ int open_instream( const char * const name, struct stat * const in_statsp,
|
|||
if( infd < 0 )
|
||||
{
|
||||
if( verbosity >= 0 )
|
||||
std::fprintf( stderr, "%s: Can't open input file '%s': %s.\n",
|
||||
std::fprintf( stderr, "%s: Can't open input file '%s': %s\n",
|
||||
program_name, name, std::strerror( errno ) );
|
||||
}
|
||||
else
|
||||
|
|
@ -290,7 +290,7 @@ int open_instream( const char * const name, struct stat * const in_statsp,
|
|||
std::fprintf( stderr, "%s: Input file '%s' is not a regular file%s.\n",
|
||||
program_name, name,
|
||||
( can_read && !no_ofile ) ?
|
||||
" and '--stdout' was not specified" : "" );
|
||||
",\n and '--stdout' was not specified" : "" );
|
||||
close( infd );
|
||||
infd = -1;
|
||||
}
|
||||
|
|
@ -321,7 +321,7 @@ void set_d_outname( const std::string & name, const int i )
|
|||
}
|
||||
output_filename = name; output_filename += ".out";
|
||||
if( verbosity >= 1 )
|
||||
std::fprintf( stderr, "%s: Can't guess original name for '%s' -- using '%s'.\n",
|
||||
std::fprintf( stderr, "%s: Can't guess original name for '%s' -- using '%s'\n",
|
||||
program_name, name.c_str(), output_filename.c_str() );
|
||||
}
|
||||
|
||||
|
|
@ -338,7 +338,7 @@ bool open_outstream( const bool force )
|
|||
std::fprintf( stderr, "%s: Output file '%s' already exists, skipping.\n",
|
||||
program_name, output_filename.c_str() );
|
||||
else
|
||||
std::fprintf( stderr, "%s: Can't create output file '%s': %s.\n",
|
||||
std::fprintf( stderr, "%s: Can't create output file '%s': %s\n",
|
||||
program_name, output_filename.c_str(), std::strerror( errno ) );
|
||||
}
|
||||
return ( outfd >= 0 );
|
||||
|
|
@ -388,14 +388,14 @@ void cleanup_and_fail( const int retval )
|
|||
|
||||
namespace {
|
||||
|
||||
/* Set permissions, owner and times. */
|
||||
// Set permissions, owner and times.
|
||||
void close_and_set_permissions( const struct stat * const in_statsp )
|
||||
{
|
||||
bool warning = false;
|
||||
if( in_statsp )
|
||||
{
|
||||
const mode_t mode = in_statsp->st_mode;
|
||||
/* fchown will in many cases return with EPERM, which can be safely ignored. */
|
||||
// fchown will in many cases return with EPERM, which can be safely ignored.
|
||||
if( fchown( outfd, in_statsp->st_uid, in_statsp->st_gid ) == 0 )
|
||||
{ if( fchmod( outfd, mode ) != 0 ) warning = true; }
|
||||
else
|
||||
|
|
@ -438,23 +438,6 @@ void set_signals()
|
|||
int verbosity = 0;
|
||||
|
||||
|
||||
void Pretty_print::operator()( const char * const msg ) const
|
||||
{
|
||||
if( verbosity >= 0 )
|
||||
{
|
||||
if( first_post )
|
||||
{
|
||||
first_post = false;
|
||||
std::fprintf( stderr, " %s: ", name_.c_str() );
|
||||
for( unsigned i = 0; i < longest_name - name_.size(); ++i )
|
||||
std::fprintf( stderr, " " );
|
||||
if( !msg ) std::fflush( stderr );
|
||||
}
|
||||
if( msg ) std::fprintf( stderr, "%s\n", msg );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void show_error( const char * const msg, const int errcode, const bool help )
|
||||
{
|
||||
if( verbosity >= 0 )
|
||||
|
|
@ -463,8 +446,8 @@ void show_error( const char * const msg, const int errcode, const bool help )
|
|||
{
|
||||
std::fprintf( stderr, "%s: %s", program_name, msg );
|
||||
if( errcode > 0 )
|
||||
std::fprintf( stderr, ": %s.", std::strerror( errcode ) );
|
||||
std::fprintf( stderr, "\n" );
|
||||
std::fprintf( stderr, ": %s", std::strerror( errcode ) );
|
||||
std::fputc( '\n', stderr );
|
||||
}
|
||||
if( help )
|
||||
std::fprintf( stderr, "Try '%s --help' for more information.\n",
|
||||
|
|
@ -485,7 +468,7 @@ void show_progress( const int packet_size,
|
|||
const Pretty_print * const p,
|
||||
const unsigned long long cfile_size )
|
||||
{
|
||||
static unsigned long long csize = 0; /* file_size / 100 */
|
||||
static unsigned long long csize = 0; // file_size / 100
|
||||
static unsigned long long pos = 0;
|
||||
static const Pretty_print * pp = 0;
|
||||
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
|
|
@ -514,16 +497,16 @@ int main( const int argc, const char * const argv[] )
|
|||
to the corresponding LZMA compression modes. */
|
||||
const Lzma_options option_mapping[] =
|
||||
{
|
||||
{ 65535, 16 }, /* -0 */
|
||||
{ 1 << 20, 5 }, /* -1 */
|
||||
{ 3 << 19, 6 }, /* -2 */
|
||||
{ 1 << 21, 8 }, /* -3 */
|
||||
{ 3 << 20, 12 }, /* -4 */
|
||||
{ 1 << 22, 20 }, /* -5 */
|
||||
{ 1 << 23, 36 }, /* -6 */
|
||||
{ 1 << 24, 68 }, /* -7 */
|
||||
{ 3 << 23, 132 }, /* -8 */
|
||||
{ 1 << 25, 273 } }; /* -9 */
|
||||
{ 65535, 16 }, // -0
|
||||
{ 1 << 20, 5 }, // -1
|
||||
{ 3 << 19, 6 }, // -2
|
||||
{ 1 << 21, 8 }, // -3
|
||||
{ 3 << 20, 12 }, // -4
|
||||
{ 1 << 22, 20 }, // -5
|
||||
{ 1 << 23, 36 }, // -6
|
||||
{ 1 << 24, 68 }, // -7
|
||||
{ 3 << 23, 132 }, // -8
|
||||
{ 1 << 25, 273 } }; // -9
|
||||
Lzma_options encoder_options = option_mapping[6]; // default = "-6"
|
||||
std::string input_filename;
|
||||
std::string default_output_filename;
|
||||
|
|
@ -587,7 +570,7 @@ int main( const int argc, const char * const argv[] )
|
|||
for( ; argind < parser.arguments(); ++argind )
|
||||
{
|
||||
const int code = parser.code( argind );
|
||||
if( !code ) break; /* no more options */
|
||||
if( !code ) break; // no more options
|
||||
const std::string & arg = parser.argument( argind );
|
||||
switch( code )
|
||||
{
|
||||
|
|
@ -618,7 +601,7 @@ int main( const int argc, const char * const argv[] )
|
|||
case 'V': show_version(); return 0;
|
||||
default : internal_error( "uncaught option." );
|
||||
}
|
||||
} /* end process options */
|
||||
} // end process options
|
||||
|
||||
#if defined(__MSVCRT__) || defined(__OS2__)
|
||||
setmode( STDIN_FILENO, O_BINARY );
|
||||
|
|
@ -628,13 +611,14 @@ int main( const int argc, const char * const argv[] )
|
|||
if( program_mode == m_test )
|
||||
outfd = -1;
|
||||
|
||||
const bool fast = encoder_options.dictionary_size == 65535 &&
|
||||
encoder_options.match_len_limit == 16;
|
||||
if( data_size <= 0 )
|
||||
{
|
||||
if( encoder_options.dictionary_size == 65535 &&
|
||||
encoder_options.match_len_limit == 16 ) data_size = 1 << 20;
|
||||
if( fast ) data_size = 1 << 20;
|
||||
else data_size = 2 * std::max( 65536, encoder_options.dictionary_size );
|
||||
}
|
||||
else if( data_size < encoder_options.dictionary_size )
|
||||
else if( !fast && data_size < encoder_options.dictionary_size )
|
||||
encoder_options.dictionary_size =
|
||||
std::max( data_size, LZ_min_dictionary_size() );
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue