From 68e0e5c64ebe512f6b2e48893763ab38879ed84e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 16:35:56 +0100 Subject: Merging upstream version 1.1. Signed-off-by: Daniel Baumann --- main.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'main.cc') diff --git a/main.cc b/main.cc index 3fdf9da..4998633 100644 --- a/main.cc +++ b/main.cc @@ -84,8 +84,8 @@ struct { const char * from; const char * to; } const known_extensions[] = { struct Lzma_options { - int dictionary_size; // 4KiB..512MiB - 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 }; @@ -115,7 +115,7 @@ void show_help( const long num_online ) " -n, --threads= set number of (de)compression threads [%ld]\n" " -o, --output= if reading stdin, place the output into \n" " -q, --quiet suppress all messages\n" - " -s, --dictionary-size= set dictionary size limit in bytes [8MiB]\n" + " -s, --dictionary-size= set dictionary size limit in bytes [8 MiB]\n" " -t, --test test compressed file integrity\n" " -v, --verbose be verbose (a 2nd -v gives more)\n" " -1 .. -9 set compression level [default 6]\n" @@ -132,7 +132,8 @@ void show_help( const long num_online ) "The bidimensional parameter space of LZMA can't be mapped to a linear\n" "scale optimal for all files. If your files are large, very repetitive,\n" "etc, you may need to use the --match-length and --dictionary-size\n" - "options directly to achieve optimal performance.\n" + "options directly to achieve optimal performance. For example, -9m64\n" + "usually compresses executables more (and faster) than -9.\n" "\nExit status: 0 for a normal exit, 1 for environmental problems (file\n" "not found, invalid flags, I/O errors, etc), 2 to indicate a corrupt or\n" "invalid input file, 3 for an internal consistency error (eg, bug) which\n" @@ -260,7 +261,7 @@ int open_instream( const char * const name, struct stat * const in_statsp, const bool can_read = ( i == 0 && ( S_ISBLK( mode ) || S_ISCHR( mode ) || S_ISFIFO( mode ) || S_ISSOCK( mode ) ) ); - const bool no_ofile = to_stdout || ( program_mode == m_test ); + const bool no_ofile = to_stdout || program_mode == m_test; if( i != 0 || ( !S_ISREG( mode ) && ( !can_read || !no_ofile ) ) ) { if( verbosity >= 0 ) -- cgit v1.2.3