Merging upstream version 1.7~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
cb8306f68b
commit
f559c459b4
17 changed files with 120 additions and 123 deletions
10
main.c
10
main.c
|
@ -289,11 +289,15 @@ static unsigned long long getnum( const char * const ptr,
|
|||
static int get_dict_size( const char * const arg )
|
||||
{
|
||||
char * tail;
|
||||
int bits = strtol( arg, &tail, 0 );
|
||||
int dictionary_size;
|
||||
const int bits = strtol( arg, &tail, 0 );
|
||||
if( bits >= LZ_min_dictionary_bits() &&
|
||||
bits <= LZ_max_dictionary_bits() && *tail == 0 )
|
||||
return ( 1 << bits );
|
||||
return getnum( arg, LZ_min_dictionary_size(), LZ_max_dictionary_size() );
|
||||
dictionary_size = getnum( arg, LZ_min_dictionary_size(),
|
||||
LZ_max_dictionary_size() );
|
||||
if( dictionary_size == 65535 ) ++dictionary_size;
|
||||
return dictionary_size;
|
||||
}
|
||||
|
||||
|
||||
|
@ -836,7 +840,7 @@ int main( const int argc, const char * const argv[] )
|
|||
{ 3 << 23, 132 }, /* -8 */
|
||||
{ 1 << 25, 273 } }; /* -9 */
|
||||
struct Lzma_options encoder_options = option_mapping[6]; /* default = "-6" */
|
||||
const unsigned long long max_member_size = 0x0100000000000000ULL;
|
||||
const unsigned long long max_member_size = 0x0008000000000000ULL;
|
||||
const unsigned long long max_volume_size = 0x4000000000000000ULL;
|
||||
unsigned long long member_size = max_member_size;
|
||||
unsigned long long volume_size = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue