Merging upstream version 1.10.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
6e0e1539c4
commit
15bdbbe06a
24 changed files with 811 additions and 454 deletions
8
list.c
8
list.c
|
@ -1,5 +1,5 @@
|
|||
/* Clzip - LZMA lossless data compressor
|
||||
Copyright (C) 2010-2017 Antonio Diaz Diaz.
|
||||
Copyright (C) 2010-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
|
||||
|
@ -34,7 +34,7 @@ static void list_line( const unsigned long long uncomp_size,
|
|||
{
|
||||
if( uncomp_size > 0 )
|
||||
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
|
||||
printf( "%15llu %15llu -INF%% %s\n", uncomp_size, comp_size,
|
||||
|
@ -43,7 +43,7 @@ static void list_line( const unsigned long long uncomp_size,
|
|||
|
||||
|
||||
int list_files( const char * const filenames[], const int num_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;
|
||||
|
@ -63,7 +63,7 @@ int list_files( const char * const filenames[], const int num_filenames,
|
|||
open_instream( input_filename, &in_stats, true, true );
|
||||
if( infd < 0 ) { if( retval < 1 ) retval = 1; continue; }
|
||||
|
||||
Fi_init( &file_index, infd, ignore_trailing );
|
||||
Fi_init( &file_index, infd, ignore_trailing, loose_trailing );
|
||||
close( infd );
|
||||
if( file_index.retval != 0 )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue