(trunk libT) improve the is_same_file() test in deleteLocalData() to handle nonexistent directories too.

This commit is contained in:
Jordan Lee 2011-08-20 18:41:45 +00:00
parent 2efb69dda3
commit 56e47e96d0
1 changed files with 2 additions and 3 deletions

View File

@ -2838,11 +2838,10 @@ deleteLocalData( tr_torrent * tor, tr_fileFunc func )
filename = tr_buildPath( top, tor->info.files[f].name, NULL );
dir = tr_dirname( filename );
tr_free( filename );
if( !tr_is_same_file( top, dir ) ) {
if( !tr_is_same_file( top, dir ) && strcmp( top, dir ) ) {
for( ;; ) {
char * parent = tr_dirname( dir );
if( tr_is_same_file( top, parent ) ) {
if( tr_is_same_file( top, parent ) || !strcmp( top, parent ) ) {
if( tr_ptrArrayFindSorted( &folders, dir, vstrcmp ) == NULL ) {
tr_ptrArrayInsertSorted( &folders, tr_strdup( dir ), vstrcmp );
}