Adding upstream version 1.14~rc3.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
378b7b036f
commit
204cd23cae
17 changed files with 152 additions and 74 deletions
4
merge.cc
4
merge.cc
|
@ -135,7 +135,7 @@ int open_input_files( const std::vector< std::string > & filenames,
|
|||
else if( st_ino0 == in_stats.st_ino && st_dev0 == in_stats.st_dev )
|
||||
{ identical = true; break; }
|
||||
}
|
||||
if( identical ) { show_error( "Two input files are the same." ); return 1; }
|
||||
if( identical ) { show_error( "Two input files are the same." ); return 2; }
|
||||
|
||||
isize = 0;
|
||||
for( unsigned i = 0; i < filenames.size(); ++i )
|
||||
|
@ -154,7 +154,7 @@ int open_input_files( const std::vector< std::string > & filenames,
|
|||
{ show_error( "Input file is too short." ); return 2; }
|
||||
}
|
||||
else if( isize != tmp )
|
||||
{ show_error( "Sizes of input files are different." ); return 1; }
|
||||
{ show_error( "Sizes of input files are different." ); return 2; }
|
||||
}
|
||||
|
||||
for( unsigned i = 0; i < filenames.size(); ++i )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue