Merging upstream version 1.6.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 4 insertions, 2 deletions

diff --git a/main.c b/main.c
index c5f8cff..7972e7d 100644
--- a/main.c
+++ b/main.c
@@ -98,6 +98,8 @@ static void show_help( void )
   {
   printf( "%s - A \"public domain\" version of the lzip data compressor\n", Program_name );
   printf( "also able to decompress legacy lzma-alone (.lzma) files.\n"
+          "Lzma-alone is a very bad format. If you keep any lzma-alone files, it is\n"
+          "advisable to recompress them to lzip format.\n"
           "\nUsage: %s [options] [files]\n", invocation_name );
   printf( "\nOptions:\n"
           "  -h, --help                     display this help and exit\n"
@@ -105,7 +107,7 @@ static void show_help( void )
           "  -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"
           "  -o, --output=<file>            if reading stdin, place the output into <file>\n"
@@ -221,7 +223,7 @@ static unsigned long getnum( const char * const ptr,
 static int get_dict_size( const char * const arg )
   {
   char * tail;
-  int bits = strtol( arg, &tail, 0 );
+  const int bits = strtol( arg, &tail, 0 );
   if( bits >= min_dictionary_bits &&
       bits <= max_dictionary_bits && *tail == 0 )
     return ( 1 << bits );