diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-02-13 07:06:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-02-13 07:06:25 +0000 |
commit | aeab49c877a93051065ab41625d9b13a6017c1d6 (patch) | |
tree | cd8f68d5ee0caebf508f6d4f1595d8656f0bff55 /list.cc | |
parent | Releasing debian version 1.6-5. (diff) | |
download | plzip-aeab49c877a93051065ab41625d9b13a6017c1d6.tar.xz plzip-aeab49c877a93051065ab41625d9b13a6017c1d6.zip |
Merging upstream version 1.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'list.cc')
-rw-r--r-- | list.cc | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* Plzip - Parallel compressor compatible with lzip - Copyright (C) 2009-2017 Antonio Diaz Diaz. + Copyright (C) 2009-2018 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 @@ -21,6 +21,7 @@ #include <cstring> #include <string> #include <vector> +#include <pthread.h> #include <stdint.h> #include <unistd.h> #include <sys/stat.h> @@ -37,7 +38,7 @@ void list_line( const unsigned long long uncomp_size, { if( uncomp_size > 0 ) std::printf( "%15llu %15llu %6.2f%% %s\n", uncomp_size, comp_size, - 100.0 * ( 1.0 - ( (double)comp_size / uncomp_size ) ), + 100.0 - ( ( 100.0 * comp_size ) / uncomp_size ), input_filename ); else std::printf( "%15llu %15llu -INF%% %s\n", uncomp_size, comp_size, @@ -48,7 +49,7 @@ void list_line( const unsigned long long uncomp_size, int list_files( const std::vector< std::string > & filenames, - const bool ignore_trailing ) + const bool ignore_trailing, const bool loose_trailing ) { unsigned long long total_comp = 0, total_uncomp = 0; int files = 0, retval = 0; @@ -61,11 +62,11 @@ int list_files( const std::vector< std::string > & filenames, const char * const input_filename = from_stdin ? "(stdin)" : filenames[i].c_str(); struct stat in_stats; // not used - const int infd = from_stdin ? STDIN_FILENO : + const int infd = from_stdin ? STDIN_FILENO : open_instream( input_filename, &in_stats, true, true ); if( infd < 0 ) { if( retval < 1 ) retval = 1; continue; } - const File_index file_index( infd, ignore_trailing ); + const File_index file_index( infd, ignore_trailing, loose_trailing ); close( infd ); if( file_index.retval() != 0 ) { |