Merging upstream version 1.12~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
411f37263d
commit
d5110769e8
29 changed files with 1120 additions and 662 deletions
|
@ -79,7 +79,7 @@ bool next_filename( std::list< std::string > & filenames,
|
|||
i > 1 && input_filename[i-1] == '/'; --i )
|
||||
input_filename.resize( i - 1 ); // remove trailing slashes
|
||||
struct stat stdot, *stdotp = 0;
|
||||
if( input_filename[0] != '/' ) // relative path
|
||||
if( input_filename[0] != '/' ) // relative file name
|
||||
{
|
||||
if( input_filename == "." ) input_filename.clear();
|
||||
if( stat( ".", &stdot ) == 0 && S_ISDIR( stdot.st_mode ) )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue