Changeset 9362 for branches/1.7x/libtransmission/torrent.c

Timestamp:

Oct 22, 2009, 2:40:22 AM (13 years ago)

Author:

charles

Message:

(1.7x) backports for 1.76: r9251 #2393 possible dataloss when trying to move torrents to the directory they're already in :/

File:

• branches/1.7x/libtransmission/torrent.c (modified) (3 diffs)

branches/1.7x/libtransmission/torrent.c

@@ -2307 +2307 @@
 setLocation( void * vdata )
 {
-    int err = 0;
+    tr_bool err = FALSE;
+    tr_bool verify_needed = FALSE;
     struct LocationData * data = vdata;
     tr_torrent * tor = data->tor;
@@ -2345 +2346 @@
                 errno = 0;
                 tr_torinf( tor, "moving \"%s\" to \"%s\"", oldpath, newpath );
-                if( tr_moveFile( oldpath, newpath ) ) {
-                    err = 1;
-                    tr_torerr( tor, "error moving \"%s\" to \"%s\": %s",
-                                    oldpath, newpath, tr_strerror( errno ) );
+                if( rename( oldpath, newpath ) )
+                {
+                    verify_needed = TRUE;
+                    if( tr_moveFile( oldpath, newpath ) )
+                    {
+                        err = TRUE;
+                        tr_torerr( tor, "error moving \"%s\" to \"%s\": %s",
+                                        oldpath, newpath, tr_strerror( errno ) );
+                    }
                 }
             }
@@ -2369 +2375 @@
         {
             /* blow away the leftover subdirectories in the old location */
-            if( do_move )
+            if( do_move && verify_needed )
                 tr_torrentDeleteLocalData( tor, remove );
 
             /* set the new location and reverify */
             tr_torrentSetDownloadDir( tor, location );
-            tr_torrentVerify( tor );
+            if( verify_needed )
+                tr_torrentVerify( tor );
         }
     }