diff options
Diffstat (limited to '')
| -rw-r--r-- | main.c | 356 |
1 files changed, 185 insertions, 171 deletions
@@ -1,4 +1,4 @@ -/* Clzip - A data compressor based on the LZMA algorithm +/* Clzip - Data compressor based on the LZMA algorithm Copyright (C) 2010 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify @@ -35,6 +35,20 @@ #include <unistd.h> #include <utime.h> #include <sys/stat.h> +#if defined(__MSVCRT__) +#include <io.h> +#define fchmod(x,y) 0 +#define fchown(x,y,z) 0 +#define SIGHUP SIGTERM +#define S_ISSOCK(x) 0 +#define S_IRGRP 0 +#define S_IWGRP 0 +#define S_IROTH 0 +#define S_IWOTH 0 +#endif +#if defined(__OS2__) +#include <io.h> +#endif #include "carg_parser.h" #include "clzip.h" @@ -55,11 +69,13 @@ #define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL #endif +long long int llabs( long long int number ); + +const char * const Program_name = "Clzip"; +const char * const program_name = "clzip"; +const char * const program_year = "2010"; const char * invocation_name = 0; -const char * const Program_name = "Clzip"; -const char * const program_name = "clzip"; -const char * const program_year = "2010"; #ifdef O_BINARY const int o_binary = O_BINARY; @@ -74,19 +90,20 @@ 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; /* 4KiB..512MiB */ + int match_len_limit; /* 5..273 */ }; -enum Mode { m_compress = 0, m_decompress, m_test }; +enum Mode { m_compress, m_decompress, m_test }; char * output_filename = 0; int outfd = -1; +int verbosity = 0; mode_t outfd_mode = S_IRUSR | S_IWUSR; bool delete_output_on_interrupt = false; -// assure at least a minimum size for buffer `buf' +/* assure at least a minimum size for buffer `buf' */ inline void * resize_buffer( void * buf, const int min_size ) { if( buf ) buf = realloc( buf, min_size ); @@ -97,7 +114,7 @@ inline void * resize_buffer( void * buf, const int min_size ) static void show_help() { - printf( "%s - A data compressor based on the LZMA algorithm.\n", Program_name ); + printf( "%s - Data compressor based on the LZMA algorithm.\n", Program_name ); printf( "\nUsage: %s [options] [files]\n", invocation_name ); printf( "\nOptions:\n" ); printf( " -h, --help display this help and exit\n" ); @@ -136,39 +153,33 @@ static void show_version() } -static const char * format_num( long long num, long long limit, - const int set_prefix ) +static const char * format_num( long long num ) { - const char * const si_prefix[8] = - { "k", "M", "G", "T", "P", "E", "Z", "Y" }; - const char * const binary_prefix[8] = + const char * const prefix[8] = { "Ki", "Mi", "Gi", "Ti", "Pi", "Ei", "Zi", "Yi" }; - static bool si = false; - static char buf[16]; - - if( set_prefix ) si = ( set_prefix > 0 ); - const int factor = ( si ) ? 1000 : 1024; - const char * const *prefix = ( si ) ? si_prefix : binary_prefix; + enum { buf_size = 16, factor = 1024 }; + static char buf[buf_size]; const char *p = ""; - limit = max( 999LL, min( 999999LL, limit ) ); + int i; - for( int i = 0; i < 8 && ( llabs( num ) > limit || + for( i = 0; i < 8 && ( llabs( num ) > 9999 || ( llabs( num ) >= factor && num % factor == 0 ) ); ++i ) { num /= factor; p = prefix[i]; } - snprintf( buf, sizeof buf, "%lld %s", num, p ); + snprintf( buf, buf_size, "%lld %s", num, p ); return buf; } -static long long getnum( const char * const ptr, const int bs, +static long long getnum( const char * const ptr, const long long llimit, const long long ulimit ) { - errno = 0; + long long result; char *tail; - long long result = strtoll( ptr, &tail, 0 ); + errno = 0; + result = strtoll( ptr, &tail, 0 ); if( tail == ptr ) { - show_error( "bad or missing numerical argument", 0, true ); + show_error( "Bad or missing numerical argument.", 0, true ); exit( 1 ); } @@ -176,13 +187,11 @@ static long long getnum( const char * const ptr, const int bs, { int factor = ( tail[1] == 'i' ) ? 1024 : 1000; int exponent = 0; + int i; bool bad_multiplier = false; switch( tail[0] ) { case ' ': break; - case 'b': if( bs > 0 ) { factor = bs; exponent = 1; } - else bad_multiplier = true; - break; case 'Y': exponent = 8; break; case 'Z': exponent = 7; break; case 'E': exponent = 6; break; @@ -198,10 +207,10 @@ static long long getnum( const char * const ptr, const int bs, } if( bad_multiplier ) { - show_error( "bad multiplier in numerical argument", 0, true ); + show_error( "Bad multiplier in numerical argument.", 0, true ); exit( 1 ); } - for( int i = 0; i < exponent; ++i ) + for( i = 0; i < exponent; ++i ) { if( LLONG_MAX / factor >= llabs( result ) ) result *= factor; else { errno = ERANGE; break; } @@ -210,7 +219,7 @@ static long long getnum( const char * const ptr, const int bs, if( !errno && ( result < llimit || result > ulimit ) ) errno = ERANGE; if( errno ) { - show_error( "numerical argument out of limits", 0, false ); + show_error( "Numerical argument out of limits.", 0, false ); exit( 1 ); } return result; @@ -224,13 +233,14 @@ static int get_dict_size( const char * const arg ) if( bits >= min_dictionary_bits && bits <= max_dictionary_bits && *tail == 0 ) return ( 1 << bits ); - return getnum( arg, 0, min_dictionary_size, max_dictionary_size ); + return getnum( arg, min_dictionary_size, max_dictionary_size ); } static int extension_index( const char * const name ) { - for( int i = 0; known_extensions[i].from; ++i ) + int i; + for( i = 0; known_extensions[i].from; ++i ) { const char * const ext = known_extensions[i].from; if( strlen( name ) > strlen( ext ) && @@ -249,7 +259,7 @@ static int open_instream( const char * const name, struct stat * const in_statsp if( program_mode == m_compress && !force && eindex >= 0 ) { if( verbosity >= 0 ) - fprintf( stderr, "%s: input file `%s' already has `%s' suffix.\n", + fprintf( stderr, "%s: Input file `%s' already has `%s' suffix.\n", program_name, name, known_extensions[eindex].from ); } else @@ -265,14 +275,16 @@ static int open_instream( const char * const name, struct stat * const in_statsp { const int i = fstat( infd, in_statsp ); const mode_t mode = in_statsp->st_mode; - if( i < 0 || !( S_ISREG( mode ) || ( to_stdout && - ( S_ISFIFO( mode ) || S_ISSOCK( mode ) || - S_ISBLK( mode ) || S_ISCHR( mode ) ) ) ) ) + const bool can_read = ( i == 0 && + ( S_ISBLK( mode ) || S_ISCHR( mode ) || + S_ISFIFO( mode ) || S_ISSOCK( mode ) ) ); + if( i != 0 || ( !S_ISREG( mode ) && ( !to_stdout || !can_read ) ) ) { if( verbosity >= 0 ) - fprintf( stderr, "%s: input file `%s' is not a regular file%s.\n", + fprintf( stderr, "%s: Input file `%s' is not a regular file%s.\n", program_name, name, - to_stdout ? "" : " and `--stdout' was not specified" ); + ( can_read && !to_stdout ) ? + " and `--stdout' was not specified" : "" ); close( infd ); infd = -1; } @@ -311,7 +323,7 @@ static void set_d_outname( const char * const name, const int i ) strcpy( output_filename, name ); strcat( output_filename, ".out" ); if( verbosity >= 0 ) - fprintf( stderr, "%s: can't guess original name for `%s' -- using `%s'.\n", + fprintf( stderr, "%s: Can't guess original name for `%s' -- using `%s'.\n", program_name, name, output_filename ); } @@ -322,18 +334,14 @@ static bool open_outstream( const bool force ) if( force ) flags |= O_TRUNC; else flags |= O_EXCL; outfd = open( output_filename, flags, outfd_mode ); - if( outfd < 0 ) + if( outfd < 0 && verbosity >= 0 ) { - if( errno == EEXIST ) outfd = -2; else outfd = -1; - if( verbosity >= 0 ) - { - if( outfd == -2 ) - fprintf( stderr, "%s: Output file %s already exists, skipping.\n", - program_name, output_filename ); - else - fprintf( stderr, "%s: Can't create output file `%s': %s.\n", - program_name, output_filename, strerror( errno ) ); - } + if( errno == EEXIST ) + fprintf( stderr, "%s: Output file %s already exists, skipping.\n", + program_name, output_filename ); + else + fprintf( stderr, "%s: Can't create output file `%s': %s.\n", + program_name, output_filename, strerror( errno ) ); } return ( outfd >= 0 ); } @@ -341,7 +349,7 @@ static bool open_outstream( const bool force ) static bool check_tty( const int infd, const enum Mode program_mode ) { - if( program_mode == m_compress && isatty( outfd ) ) + if( program_mode == m_compress && outfd >= 0 && isatty( outfd ) ) { show_error( "I won't write compressed data to a terminal.", 0, true ); return false; @@ -356,15 +364,32 @@ static bool check_tty( const int infd, const enum Mode program_mode ) } - // Set permissions, owner and times. +void cleanup_and_fail( const int retval ) + { + if( delete_output_on_interrupt ) + { + delete_output_on_interrupt = false; + if( verbosity >= 0 ) + fprintf( stderr, "%s: Deleting output file `%s', if it exists.\n", + program_name, output_filename ); + if( outfd >= 0 ) { close( outfd ); outfd = -1; } + if( remove( output_filename ) != 0 ) + show_error( "WARNING: deletion of output file (apparently) failed.", 0, false ); + } + exit( retval ); + } + + + /* Set permissions, owner and times. */ static void close_and_set_permissions( const struct stat * const in_statsp ) { bool error = false; if( in_statsp ) { - if( fchmod( outfd, in_statsp->st_mode ) != 0 ) error = true; - else (void)fchown( outfd, in_statsp->st_uid, in_statsp->st_gid ); - // fchown will in many cases return with EPERM, which can be safely ignored. + if( fchmod( outfd, in_statsp->st_mode ) != 0 || + ( fchown( outfd, in_statsp->st_uid, in_statsp->st_gid ) != 0 && + errno != EPERM ) ) error = true; + /* fchown will in many cases return with EPERM, which can be safely ignored. */ } if( close( outfd ) == 0 ) outfd = -1; else cleanup_and_fail( 1 ); @@ -379,7 +404,7 @@ static void close_and_set_permissions( const struct stat * const in_statsp ) } if( error ) { - show_error( "I can't change output file attributes.", 0, false ); + show_error( "Can't change output file attributes.", 0, false ); cleanup_and_fail( 1 ); } } @@ -388,8 +413,10 @@ static void close_and_set_permissions( const struct stat * const in_statsp ) static bool next_filename() { const unsigned int len = strlen( known_extensions[0].from ); - if( strlen( output_filename ) >= len + 5 ) // "*00001.lz" - for( int i = strlen( output_filename ) - len - 1, j = 0; j < 5; --i, ++j ) + int i, j; + + if( strlen( output_filename ) >= len + 5 ) /* "*00001.lz" */ + for( i = strlen( output_filename ) - len - 1, j = 0; j < 5; --i, ++j ) { if( output_filename[i] < '9' ) { ++output_filename[i]; return true; } else output_filename[i] = '0'; @@ -403,29 +430,30 @@ static int compress( const long long member_size, const long long volume_size, const int infd, struct Pretty_print * const pp, const struct stat * const in_statsp ) { - if( verbosity >= 1 ) Pp_show_msg( pp, 0 ); + long long in_size = 0, out_size = 0, partial_volume_size = 0; + int retval = 0; File_header header; + struct Matchfinder matchfinder; + + if( verbosity >= 1 ) Pp_show_msg( pp, 0 ); Fh_set_magic( header ); if( !Fh_set_dictionary_size( header, encoder_options->dictionary_size ) || encoder_options->match_len_limit < min_match_len_limit || encoder_options->match_len_limit > max_match_len ) internal_error( "invalid argument to encoder" ); - struct Matchfinder matchfinder; Mf_init( &matchfinder, Fh_get_dictionary_size( header ), encoder_options->match_len_limit, infd ); Fh_set_dictionary_size( header, Mf_dictionary_size( &matchfinder ) ); - long long in_size = 0, out_size = 0, partial_volume_size = 0; - int retval = 0; - while( true ) // encode one member per iteration + while( true ) /* encode one member per iteration */ { struct LZ_encoder encoder; - LZe_init( &encoder, &matchfinder, header, outfd ); const long long size = min( member_size, volume_size - partial_volume_size ); + LZe_init( &encoder, &matchfinder, header, outfd ); if( !LZe_encode_member( &encoder, size ) ) - { Pp_show_msg( pp, "encoder error" ); retval = 1; break; } + { Pp_show_msg( pp, "Encoder error" ); retval = 1; break; } in_size += Mf_data_position( &matchfinder ); out_size += LZe_member_position( &encoder ); partial_volume_size += LZe_member_position( &encoder ); @@ -438,21 +466,18 @@ static int compress( const long long member_size, const long long volume_size, { close_and_set_permissions( in_statsp ); if( !next_filename() ) - { Pp_show_msg( pp, "too many volume files" ); retval = 1; break; } + { Pp_show_msg( pp, "Too many volume files" ); retval = 1; break; } if( !open_outstream( true ) ) { retval = 1; break; } delete_output_on_interrupt = true; } } - if( !Mf_reset( &matchfinder ) ) - { Pp_show_msg( pp, 0 ); - show_error( "can't reset matchfinder", errno, false ); - retval = 1; break; } + Mf_reset( &matchfinder ); } if( retval == 0 && verbosity >= 1 ) { if( in_size <= 0 || out_size <= 0 ) - fprintf( stderr, "no data compressed.\n" ); + fprintf( stderr, "No data compressed.\n" ); else fprintf( stderr, "%6.3f:1, %6.3f bits/byte, " "%5.2f%% saved, %lld in, %lld out.\n", @@ -469,40 +494,42 @@ static int compress( const long long member_size, const long long volume_size, static int decompress( const int infd, struct Pretty_print * const pp, const bool testing ) { + long long partial_file_pos = 0; struct Range_decoder rdec; + int retval = 0, i, result; + bool first_member; Rd_init( &rdec, infd ); - long long partial_file_pos = 0; - int retval = 0; - for( bool first_member = true; ; first_member = false, Pp_reset( pp ) ) + for( first_member = true; ; first_member = false, Pp_reset( pp ) ) { File_header header; + struct LZ_decoder decoder; Rd_reset_member_position( &rdec ); - for( int i = 0; i < Fh_size; ++i ) + for( i = 0; i < Fh_size; ++i ) header[i] = Rd_get_byte( &rdec ); - if( Rd_finished( &rdec ) ) // End Of File + if( Rd_finished( &rdec ) ) /* End Of File */ { if( first_member ) - { Pp_show_msg( pp, "error reading member header" ); retval = 1; } + { Pp_show_msg( pp, "Error reading member header" ); retval = 1; } break; } if( !Fh_verify_magic( header ) ) { - if( !first_member ) break; // trailing garbage - Pp_show_msg( pp, "bad magic number (file not in lzip format)" ); + if( !first_member ) break; /* trailing garbage */ + Pp_show_msg( pp, "Bad magic number (file not in lzip format)" ); retval = 2; break; } if( !Fh_verify_version( header ) ) { if( verbosity >= 0 ) { Pp_show_msg( pp, 0 ); - fprintf( stderr, "version %d member format not supported, newer %s needed.\n", - Fh_version( header ), program_name ); } + fprintf( stderr, "Version %d member format not supported.\n", + Fh_version( header ) ); } retval = 2; break; } if( Fh_get_dictionary_size( header ) < min_dictionary_size || Fh_get_dictionary_size( header ) > max_dictionary_size ) - { Pp_show_msg( pp, "invalid dictionary size in member header" ); + { Pp_show_msg( pp, "Invalid dictionary size in member header" ); retval = 2; break; } if( verbosity >= 1 ) @@ -511,12 +538,11 @@ static int decompress( const int infd, struct Pretty_print * const pp, if( verbosity >= 2 ) fprintf( stderr, "version %d, dictionary size %7sB. ", Fh_version( header ), - format_num( Fh_get_dictionary_size( header ), 9999, 0 ) ); + format_num( Fh_get_dictionary_size( header ) ) ); } - struct LZ_decoder decoder; LZd_init( &decoder, header, &rdec, outfd ); - const int result = LZd_decode_member( &decoder, pp ); + result = LZd_decode_member( &decoder, pp ); partial_file_pos += Rd_member_position( &rdec ); LZd_free( &decoder ); if( result != 0 ) @@ -525,10 +551,10 @@ static int decompress( const int infd, struct Pretty_print * const pp, { Pp_show_msg( pp, 0 ); if( result == 2 ) - fprintf( stderr, "file ends unexpectedly at pos %lld\n", + fprintf( stderr, "File ends unexpectedly at pos %lld\n", partial_file_pos ); else - fprintf( stderr, "decoder error at pos %lld\n", partial_file_pos ); + fprintf( stderr, "Decoder error at pos %lld\n", partial_file_pos ); } retval = 2; break; } @@ -543,7 +569,7 @@ static int decompress( const int infd, struct Pretty_print * const pp, void signal_handler( int sig ) { - sig = 0; // keep compiler happy + sig = 0; /* keep compiler happy */ show_error( "Control-C or similar caught, quitting.", 0, false ); cleanup_and_fail( 1 ); } @@ -557,19 +583,19 @@ static void set_signals() } -int verbosity = 0; - - void Pp_init( struct Pretty_print * const pp, const char * const filenames[], - const int num_filenames ) + const int num_filenames, const int v ) { + unsigned int stdin_name_len; + int i; pp->name_ = 0; pp->stdin_name = "(stdin)"; pp->longest_name = 0; + pp->verbosity = v; pp->first_post = false; - unsigned int stdin_name_len = strlen( pp->stdin_name ); + stdin_name_len = strlen( pp->stdin_name ); - for( int i = 0; i < num_filenames; ++i ) + for( i = 0; i < num_filenames; ++i ) { const char * const s = filenames[i]; const int len = ( !strcmp( s, "-" ) ? stdin_name_len : strlen( s ) ); @@ -585,10 +611,11 @@ void Pp_show_msg( struct Pretty_print * const pp, const char * const msg ) { if( pp->first_post ) { + int i, len; pp->first_post = false; fprintf( stderr, " %s: ", pp->name_ ); - const int len = pp->longest_name - strlen( pp->name_ ); - for( int i = 0; i < len; ++i ) fprintf( stderr, " " ); + len = pp->longest_name - strlen( pp->name_ ); + for( i = 0; i < len; ++i ) fprintf( stderr, " " ); if( !msg ) fflush( stderr ); } if( msg ) fprintf( stderr, "%s.\n", msg ); @@ -596,33 +623,17 @@ void Pp_show_msg( struct Pretty_print * const pp, const char * const msg ) } -void cleanup_and_fail( const int retval ) - { - if( delete_output_on_interrupt ) - { - delete_output_on_interrupt = false; - if( verbosity >= 0 ) - fprintf( stderr, "%s: Deleting output file `%s', if it exists.\n", - program_name, output_filename ); - if( outfd >= 0 ) { close( outfd ); outfd = -1; } - if( remove( output_filename ) != 0 ) - show_error( "WARNING: deletion of output file (apparently) failed.", 0, false ); - } - exit( retval ); - } - - void show_error( const char * const msg, const int errcode, const bool help ) { if( verbosity >= 0 ) { - if( msg && msg[0] != 0 ) + if( msg && msg[0] ) { fprintf( stderr, "%s: %s", program_name, msg ); if( errcode > 0 ) fprintf( stderr, ": %s", strerror( errcode ) ); fprintf( stderr, "\n" ); } - if( help && invocation_name && invocation_name[0] != 0 ) + if( help && invocation_name && invocation_name[0] ) fprintf( stderr, "Try `%s --help' for more information.\n", invocation_name ); } } @@ -630,27 +641,24 @@ void show_error( const char * const msg, const int errcode, const bool help ) void internal_error( const char * const msg ) { - const char * const e = "internal error: "; - char * s = resize_buffer( 0, strlen( e ) + strlen( msg ) + 1 ); - strcpy( s, e ); - strcat( s, msg ); - show_error( s, 0, false ); - free( s ); + if( verbosity >= 0 ) + fprintf( stderr, "%s: internal error: %s.\n", program_name, msg ); exit( 3 ); } -// Returns the number of bytes really read. -// If (returned value < size) and (errno == 0), means EOF was reached. -// +/* Returns the number of bytes really read. + If (returned value < size) and (errno == 0), means EOF was reached. +*/ int readblock( const int fd, uint8_t * const buf, const int size ) { int rest = size; errno = 0; while( rest > 0 ) { + int n; errno = 0; - const int n = read( fd, buf + size - rest, rest ); + n = read( fd, buf + size - rest, rest ); if( n > 0 ) rest -= n; else if( n == 0 ) break; else if( errno != EINTR && errno != EAGAIN ) break; @@ -659,17 +667,18 @@ int readblock( const int fd, uint8_t * const buf, const int size ) } -// Returns the number of bytes really written. -// If (returned value < size), it is always an error. -// +/* Returns the number of bytes really written. + If (returned value < size), it is always an error. +*/ int writeblock( const int fd, const uint8_t * const buf, const int size ) { int rest = size; errno = 0; while( rest > 0 ) { + int n; errno = 0; - const int n = write( fd, buf + size - rest, rest ); + n = write( fd, buf + size - rest, rest ); if( n > 0 ) rest -= n; else if( errno && errno != EINTR && errno != EAGAIN ) break; } @@ -677,29 +686,31 @@ int writeblock( const int fd, const uint8_t * const buf, const int size ) } -CRC32 crc32; - int main( const int argc, const char * const argv[] ) { - // Mapping from gzip/bzip2 style 1..9 compression modes - // to the corresponding LZMA compression modes. + /* Mapping from gzip/bzip2 style 1..9 compression modes + to the corresponding LZMA compression modes. */ const struct Lzma_options option_mapping[] = { - { 1 << 16, 5 }, // -0 - { 1 << 20, 10 }, // -1 - { 3 << 19, 12 }, // -2 - { 1 << 21, 17 }, // -3 - { 3 << 20, 26 }, // -4 - { 1 << 22, 44 }, // -5 - { 1 << 23, 80 }, // -6 - { 1 << 24, 108 }, // -7 - { 3 << 23, 163 }, // -8 - { 1 << 25, 273 } }; // -9 - struct Lzma_options encoder_options = option_mapping[6]; // default = "-6" + { 1 << 20, 5 }, /* -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 */ + struct Lzma_options encoder_options = option_mapping[6]; /* default = "-6" */ long long member_size = LLONG_MAX; long long volume_size = LLONG_MAX; int infd = -1; enum Mode program_mode = m_compress; + int argind = 0; + int retval = 0; + int i; + bool filenames_given = false; bool force = false; bool keep_input_files = false; bool to_stdout = false; @@ -707,13 +718,12 @@ int main( const int argc, const char * const argv[] ) const char * default_output_filename = ""; const char ** filenames = 0; int num_filenames = 0; - invocation_name = argv[0]; - CRC32_init(); + struct Pretty_print pp; const struct ap_Option options[] = { - { '0', 0, ap_no }, - { '1', "fast", ap_no }, + { '0', "fast", ap_no }, + { '1', 0, ap_no }, { '2', 0, ap_no }, { '3', 0, ap_no }, { '4', 0, ap_no }, @@ -740,44 +750,51 @@ int main( const int argc, const char * const argv[] ) { 0 , 0, ap_no } }; struct Arg_parser parser; + + invocation_name = argv[0]; + CRC32_init(); if( !ap_init( &parser, argc, argv, options, 0 ) ) - { show_error( "memory exhausted", 0, false ); return 1; } - if( ap_error( &parser ) ) // bad option + { show_error( "Memory exhausted.", 0, false ); return 1; } + if( ap_error( &parser ) ) /* bad option */ { show_error( ap_error( &parser ), 0, true ); return 1; } - int argind = 0; for( ; argind < ap_arguments( &parser ); ++argind ) { const int code = ap_code( &parser, argind ); const char * const arg = ap_argument( &parser, argind ); - if( !code ) break; // no more options + if( !code ) break; /* no more options */ switch( code ) { - case '0': case '1': case '2': case '3': case '4': + case '0': + case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': encoder_options = option_mapping[code-'0']; break; - case 'b': member_size = getnum( arg, 0, 100000, LLONG_MAX / 2 ); break; + case 'b': member_size = getnum( arg, 100000, LLONG_MAX / 2 ); break; case 'c': to_stdout = true; break; case 'd': program_mode = m_decompress; break; - case 'e': break; // ignored by now + case 'e': break; /* ignored by now */ case 'f': force = true; break; case 'h': show_help(); return 0; case 'k': keep_input_files = true; break; case 'm': encoder_options.match_len_limit = - getnum( arg, 0, min_match_len_limit, max_match_len ); break; + getnum( arg, min_match_len_limit, max_match_len ); break; case 'o': default_output_filename = arg; break; case 'q': verbosity = -1; break; case 's': encoder_options.dictionary_size = get_dict_size( arg ); break; - case 'S': volume_size = getnum( arg, 0, 100000, LLONG_MAX / 2 ); break; + case 'S': volume_size = getnum( arg, 100000, LLONG_MAX / 2 ); break; case 't': program_mode = m_test; break; case 'v': if( verbosity < 4 ) ++verbosity; break; case 'V': show_version(); return 0; default : internal_error( "uncaught option" ); } - } + } /* end process options */ + +#if defined(__MSVCRT__) || defined(__OS2__) + _setmode( STDIN_FILENO, O_BINARY ); + _setmode( STDOUT_FILENO, O_BINARY ); +#endif - bool filenames_given = false; for( ; argind < ap_arguments( &parser ); ++argind ) { if( strcmp( ap_argument( &parser, argind ), "-" ) ) @@ -797,8 +814,7 @@ int main( const int argc, const char * const argv[] ) ( filenames_given || default_output_filename[0] ) ) set_signals(); - struct Pretty_print pp; - Pp_init( &pp, filenames, num_filenames ); + Pp_init( &pp, filenames, num_filenames, verbosity ); if( program_mode == m_test ) outfd = -1; else if( program_mode == m_compress ) @@ -808,10 +824,11 @@ int main( const int argc, const char * const argv[] ) } output_filename = resize_buffer( output_filename, 1 ); - int retval = 0; - for( int i = 0; i < num_filenames; ++i ) + for( i = 0; i < num_filenames; ++i ) { + int tmp; struct stat in_stats; + const struct stat * in_statsp; output_filename[0] = 0; if( !filenames[i][0] || !strcmp( filenames[i], "-" ) ) @@ -844,8 +861,8 @@ int main( const int argc, const char * const argv[] ) } else { + const int eindex = extension_index( filenames[i] ); input_filename = filenames[i]; - const int eindex = extension_index( input_filename ); infd = open_instream( input_filename, &in_stats, program_mode, eindex, force, to_stdout ); if( infd < 0 ) { if( retval < 1 ) retval = 1; continue; } @@ -872,9 +889,8 @@ int main( const int argc, const char * const argv[] ) if( output_filename[0] && !to_stdout && program_mode != m_test ) delete_output_on_interrupt = true; - const struct stat * const in_statsp = input_filename[0] ? &in_stats : 0; + in_statsp = input_filename[0] ? &in_stats : 0; Pp_set_name( &pp, input_filename ); - int tmp = 0; if( program_mode == m_compress ) tmp = compress( member_size, volume_size, &encoder_options, infd, &pp, in_statsp ); @@ -894,9 +910,7 @@ int main( const int argc, const char * const argv[] ) } if( outfd >= 0 && close( outfd ) != 0 ) { - if( verbosity >= 0 ) - fprintf( stderr, "%s: Can't close stdout: %s.\n", - program_name, strerror( errno ) ); + show_error( "Can't close stdout", errno, false ); if( retval < 1 ) retval = 1; } free( output_filename ); |