Merging upstream version 1.6.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
489fb83ee3
commit
3f953bab74
15 changed files with 910 additions and 1249 deletions
7
main.c
7
main.c
|
@ -3,7 +3,7 @@
|
|||
|
||||
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
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
|
@ -126,7 +126,7 @@ static void show_version( void )
|
|||
{
|
||||
printf( "%s %s\n", program_name, PROGVERSION );
|
||||
printf( "Copyright (C) %s Antonio Diaz Diaz.\n", program_year );
|
||||
printf( "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
|
||||
printf( "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"
|
||||
"This is free software: you are free to change and redistribute it.\n"
|
||||
"There is NO WARRANTY, to the extent permitted by law.\n" );
|
||||
}
|
||||
|
@ -233,8 +233,7 @@ static int extension_index( const char * const name )
|
|||
static int open_instream( const char * const name, struct stat * const in_statsp,
|
||||
const bool no_ofile )
|
||||
{
|
||||
int infd;
|
||||
infd = open( name, O_RDONLY | O_BINARY );
|
||||
int infd = open( name, O_RDONLY | O_BINARY );
|
||||
if( infd < 0 )
|
||||
{
|
||||
if( verbosity >= 0 )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue