Changeset 9689 for trunk/libtransmission/torrent.c

Timestamp:

Dec 9, 2009, 3:00:20 AM (12 years ago)

Author:

charles

Message:

(trunk libT) the deleteFunc passed in as the second argument to tr_torrentDeleteLocalData() should /not/ be called unless the file being passed to it actually exists. Reported by livings124

File:

• trunk/libtransmission/torrent.c (modified) (4 diffs)

trunk/libtransmission/torrent.c

@@ -2317 +2317 @@
 
 static void
+deleteLocalFile( const char * filename, tr_fileFunc fileFunc )
+{
+    struct stat sb;
+    if( !stat( filename, &sb ) ) /* if file exists... */
+        fileFunc( filename );
+}
+
+static void
 deleteLocalData( tr_torrent * tor, tr_fileFunc fileFunc )
 {
@@ -2345 +2353 @@
     for( i=0; i<n; ++i )
         if( tr_ptrArrayFindSorted( &dirtyFolders, s[i], vstrcmp ) == NULL )
-            fileFunc( s[i] );
+            deleteLocalFile( s[i], fileFunc );
 
     /* now blow away any remaining torrent files, such as torrent files in dirty folders */
     for( f=0; f<tor->info.fileCount; ++f ) {
         char * path = tr_buildPath( tor->currentDir, tor->info.files[f].name, NULL );
-        fileFunc( path );
+        deleteLocalFile( path, fileFunc );
         tr_free( path );
     }
@@ -2367 +2375 @@
 #ifdef SYS_DARWIN
             char * dsStore = tr_buildPath( s[i], ".DS_Store", NULL );
-            fileFunc( dsStore );
+            deleteLocalFile( dsStore, fileFunc );
             tr_free( dsStore );
 #endif
-            fileFunc( s[i] );
+            deleteLocalFile( s[i], fileFunc );
         }
         tr_ptrArrayDestruct( &cleanFolders, NULL );
@@ -2404 +2412 @@
         /* torrent only has one file */
         char * path = tr_buildPath( tor->currentDir, tor->info.files[0].name, NULL );
-        fileFunc( path );
+        deleteLocalFile( path, fileFunc );
         tr_free( path );
 
         tmp = tr_torrentBuildPartial( tor, 0 );
         path = tr_buildPath( tor->currentDir, tmp, NULL );
-        fileFunc( path );
+        deleteLocalFile( path, fileFunc );
         tr_free( path );
         tr_free( tmp );