Changeset 11576

Timestamp:

Dec 22, 2010, 7:07:18 AM (12 years ago)

Author:

charles

Message:

(2.1x) backport r11574 from #3844 "Error popup when adding a relative path"

Location:

branches/2.1x

Files:

• NEWS (modified) (1 diff)
• gtk/add-dialog.c (modified) (3 diffs)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/utils.c (modified) (1 diff)
• libtransmission/utils.h (modified) (1 diff)

branches/2.1x/NEWS

@@ -8 +8 @@
   * backport r11545 from #3834 "'Origin' field in Torrent Properties dialog should be ellipsized"
   * backport r11511 from #3719 "handle API changes to libnotify"
+  * backport r11574 from #3844 "Error popup when adding a relative path"
 
 === Transmission 2.13 (2010/12/09) ===

branches/2.1x/gtk/add-dialog.c

@@ -16 +16 @@
 #include <string.h>
 
+#include <libtransmission/transmission.h>
+#include <libtransmission/utils.h> /* tr_is_same_file() */
+
 #include "add-dialog.h"
 #include "conf.h"
@@ -188 +191 @@
         tr_torrent * torrent;
 
-        if( filename && ( !data->filename || strcmp( filename, data->filename ) ) )
+        if( filename && ( !data->filename || !tr_is_same_file( filename, data->filename ) ) )
         {
             g_free( data->filename );
@@ -222 +225 @@
     char * fname = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( b ) );
 
-    if( fname && ( !data->downloadDir || strcmp( fname, data->downloadDir ) ) )
+    if( fname && ( !data->downloadDir || !tr_is_same_file( fname, data->downloadDir ) ) )
     {
         g_free( data->downloadDir );

branches/2.1x/libtransmission/torrent.c

@@ -2695 +2695 @@
 };
 
-static tr_bool
-isSameLocation( const char * path1, const char * path2 )
-{
-    struct stat s1, s2;
-    const int err1 = stat( path1, &s1 );
-    const int err2 = stat( path2, &s2 );
-
-    if( !err1 && !err2 ) {
-        tr_dbg( "path1 dev:inode is %"PRIu64":%"PRIu64"; "
-                "path2 dev:inode is %"PRIu64":%"PRIu64,
-                (uint64_t)s1.st_dev, (uint64_t)s1.st_ino,
-                (uint64_t)s2.st_dev, (uint64_t)s2.st_ino );
-        return ( s1.st_dev == s2.st_dev )
-            && ( s1.st_ino == s2.st_ino );
-    }
-
-    /* either one, or the other, or both don't exist... */
-    tr_dbg( "stat(%s) returned %d\n", path1, err1 );
-    tr_dbg( "stat(%s) returned %d\n", path2, err2 );
-    return FALSE;
-}
-
 static void
 setLocation( void * vdata )
@@ -2735 +2713 @@
     tr_mkdirp( location, 0777 );
 
-    if( !isSameLocation( location, tor->currentDir ) )
+    if( !tr_is_same_file( location, tor->currentDir ) )
     {
         tr_file_index_t i;

branches/2.1x/libtransmission/utils.c

@@ -1579 +1579 @@
 }
 
+tr_bool
+tr_is_same_file( const char * filename1, const char * filename2 )
+{
+    struct stat sb1, sb2;
+
+    return !stat( filename1, &sb1 )
+        && !stat( filename2, &sb2 )
+        && ( sb1.st_dev == sb2.st_dev )
+        && ( sb1.st_ino == sb2.st_ino );
+}
+
 /***
 ****

branches/2.1x/libtransmission/utils.h

@@ -507 +507 @@
                  tr_bool * renamed ) TR_GNUC_NONNULL(1,2);
 
+/** @brief Test to see if the two filenames point to the same file. */
+tr_bool tr_is_same_file( const char * filename1, const char * filename2 );
+
 /** @brief convenience function to remove an item from an array */
 void tr_removeElementFromArray( void         * array,