Merging upstream version 1.3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f0916a610f
commit
29882c9a9e
28 changed files with 75 additions and 83 deletions
5
rc.cc
5
rc.cc
|
@ -1,5 +1,5 @@
|
|||
/* Zutils - Utilities dealing with compressed files
|
||||
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
|
||||
|
@ -227,7 +227,8 @@ void parse_compressor( const std::string & arg, const int format_index,
|
|||
const char * get_compressor_name( const int format_index )
|
||||
{
|
||||
if( format_index >= 0 && format_index < num_formats &&
|
||||
compressor_names[format_index].size() )
|
||||
compressor_names[format_index].size() &&
|
||||
compressor_names[format_index][0] != '-' )
|
||||
return compressor_names[format_index].c_str();
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue