Adding upstream version 1.17.upstream/1.17

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

1 files changed, 32 insertions, 35 deletions

diff --git a/main.cc b/main.cc
index 27cc156..ac07852 100644
--- a/main.cc
+++ b/main.cc
@@ -83,8 +83,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 };
@@ -108,7 +108,7 @@ void show_help()
                "  -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"
@@ -265,7 +265,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
@@ -282,7 +282,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;
         }
@@ -314,7 +314,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() );
   }
 
@@ -331,7 +331,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 );
@@ -371,14 +371,14 @@ void cleanup_and_fail( const int retval )
   }
 
 
-     /* 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
@@ -440,7 +440,7 @@ int compress( const unsigned long long member_size,
       }
 
     unsigned long long in_size = 0, out_size = 0, partial_volume_size = 0;
-    while( true )		/* encode one member per iteration */
+    while( true )		// encode one member per iteration
       {
       const unsigned long long size = ( volume_size > 0 ) ?
         std::min( member_size, volume_size - partial_volume_size ) : member_size;
@@ -472,7 +472,7 @@ int compress( const unsigned long long member_size,
     if( retval == 0 && verbosity >= 1 )
       {
       if( in_size == 0 || out_size == 0 )
-        std::fprintf( stderr, " no data compressed.\n" );
+        std::fputs( " no data compressed.\n", stderr );
       else
         std::fprintf( stderr, "%6.3f:1, %6.3f bits/byte, "
                               "%5.2f%% saved, %llu in, %llu out.\n",
@@ -582,23 +582,20 @@ int decompress( const int infd, const Pretty_print & pp, const bool testing )
         if( verbosity >= 0 && result <= 2 )
           {
           pp();
-          if( result == 2 )
-            std::fprintf( stderr, "File ends unexpectedly at pos %llu.\n",
-                          partial_file_pos );
-          else
-            std::fprintf( stderr, "Decoder error at pos %llu.\n",
-                          partial_file_pos );
+          std::fprintf( stderr, "%s at pos %llu\n", ( result == 2 ) ?
+                        "File ends unexpectedly" : "Decoder error",
+                        partial_file_pos );
           }
         retval = 2; break;
         }
       if( verbosity >= 2 )
-        { std::fprintf( stderr, testing ? "ok\n" : "done\n" ); pp.reset(); }
+        { std::fputs( testing ? "ok\n" : "done\n", stderr ); pp.reset(); }
       }
     }
   catch( std::bad_alloc ) { pp( "Not enough memory." ); retval = 1; }
   catch( Error e ) { pp(); show_error( e.msg, errno ); retval = 1; }
   if( verbosity == 1 && retval == 0 )
-    std::fprintf( stderr, testing ? "ok\n" : "done\n" );
+    std::fputs( testing ? "ok\n" : "done\n", stderr );
   return retval;
   }
 
@@ -631,8 +628,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",
@@ -654,14 +651,14 @@ void show_progress( const unsigned long long partial_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 psize = 0;
   static const Matchfinder_base * mb = 0;
   static const Pretty_print * pp = 0;
 
   if( verbosity >= 2 )
     {
-    if( m )					/* initialize static vars */
+    if( m )					// initialize static vars
       { csize = cfile_size; psize = partial_size; mb = m; pp = p; }
     if( mb && pp )
       {
@@ -681,16 +678,16 @@ int main( const int argc, const char * const argv[] )
      to the corresponding LZMA compression modes. */
   const Lzma_options option_mapping[] =
     {
-    { 1 << 16,  16 },		/* -0 entry values not used */
-    { 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 */
+    { 1 << 16,  16 },		// -0 entry values not used
+    { 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"
   const unsigned long long max_member_size = 0x0008000000000000ULL;
   const unsigned long long max_volume_size = 0x4000000000000000ULL;
@@ -746,7 +743,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 )
       {
@@ -777,7 +774,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 );