Merging upstream version 1.25~rc1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
1d67e88e3c
commit
b8e73cb85f
39 changed files with 978 additions and 742 deletions
|
@ -45,7 +45,7 @@ bool test_full_name( const std::string & full_name, const struct stat * stp,
|
|||
if( !S_ISDIR( st.st_mode ) ) return false;
|
||||
|
||||
std::string prev_dir( full_name );
|
||||
bool loop = ( stp && st.st_ino == stp->st_ino && st.st_dev == stp->st_dev );
|
||||
bool loop = stp && st.st_ino == stp->st_ino && st.st_dev == stp->st_dev;
|
||||
if( !loop )
|
||||
for( unsigned i = prev_dir.size(); i > 1; )
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue