From 745a5c64486e2c306b98dc5a1dec127bd3ce6d37 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 16:38:58 +0100 Subject: Merging upstream version 1.2. Signed-off-by: Daniel Baumann --- main.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'main.cc') diff --git a/main.cc b/main.cc index c4eeb50..df5e28e 100644 --- a/main.cc +++ b/main.cc @@ -1,6 +1,6 @@ /* Plzip - Parallel compressor compatible with lzip Copyright (C) 2009 Laszlo Ersek. - Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz. + Copyright (C) 2009-2014 Antonio Diaz Diaz. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,7 +103,7 @@ void show_help( const long num_online ) std::printf( "\nOptions:\n" " -h, --help display this help and exit\n" " -V, --version output version information and exit\n" - " -B, --data-size= set input data block size in bytes\n" + " -B, --data-size= set size of input data blocks, in bytes\n" " -c, --stdout send output to standard output\n" " -d, --decompress decompress\n" " -f, --force overwrite existing output files\n" @@ -688,9 +688,8 @@ int main( const int argc, const char * const argv[] ) int tmp; if( program_mode == m_compress ) { - if( verbosity >= 2 ) - show_progress( 0, &pp, ( in_statsp && S_ISREG( in_statsp->st_mode ) ) ? - in_statsp->st_size / 100 : 0 ); // init + if( verbosity >= 2 ) // init + show_progress( 0, &pp, infd_isreg ? in_statsp->st_size / 100 : 0 ); tmp = compress( data_size, encoder_options.dictionary_size, encoder_options.match_len_limit, num_workers, infd, outfd, pp, debug_level ); -- cgit v1.2.3