Changeset 10575 for branches

Timestamp:

May 1, 2010, 4:12:15 AM (12 years ago)

Author:

charles

Message:

(1.9x libT) backport r10502 for #3136 "slashes magnet names break magnet downloads"

Location:

branches/1.9x/libtransmission

Files:

• metainfo.c (modified) (1 diff)
• metainfo.h (modified) (1 diff)
• resume.c (modified) (2 diffs)
• torrent-magnet.c (modified) (1 diff)

branches/1.9x/libtransmission/metainfo.c

@@ -35 +35 @@
 ***/
 
+char*
+tr_metainfoGetBasename( const tr_info * inf )
+{
+    char *ret, *pch, *name;
+
+    name = tr_strdup( inf->name );
+    for( pch=name; pch && *pch; ++pch )
+        if( *pch == '/' )
+            *pch = '_';
+   
+    ret = tr_strdup_printf( "%s.%16.16s", name, inf->hashString );
+
+    tr_free( name );
+    return ret;
+}
+
 static char*
 getTorrentFilename( const tr_session * session,
                     const tr_info *   inf )
 {
-    return tr_strdup_printf( "%s%c%s.%16.16s.torrent",
-                             tr_getTorrentDir( session ),
-                             TR_PATH_DELIMITER,
-                             inf->name,
-                             inf->hashString );
+    char * base = tr_metainfoGetBasename( inf );
+    char * filename = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s.torrent",
+                                        tr_getTorrentDir( session ), base );
+    tr_free( base );
+    return filename;
 }
 

branches/1.9x/libtransmission/metainfo.h

@@ -35 +35 @@
                          tr_info    * inf );
 
+char* tr_metainfoGetBasename( const tr_info * );
+
 
 #endif

branches/1.9x/libtransmission/resume.c

@@ -18 +18 @@
 #include "bencode.h"
 #include "completion.h"
+#include "metainfo.h" /* tr_metainfoGetBasename() */
 #include "peer-mgr.h" /* pex */
-#include "platform.h" /* tr_getResumeDir */
+#include "platform.h" /* tr_getResumeDir() */
 #include "resume.h"
 #include "session.h"
@@ -67 +68 @@
 getResumeFilename( const tr_torrent * tor )
 {
-    return tr_strdup_printf( "%s%c%s.%16.16s.resume",
-                             tr_getResumeDir( tor->session ),
-                             TR_PATH_DELIMITER,
-                             tr_torrentName( tor ),
-                             tor->info.hashString );
+    char * base = tr_metainfoGetBasename( tr_torrentInfo( tor ) );
+    char * filename = tr_strdup_printf( "%s" TR_PATH_DELIMITER_STR "%s.resume",
+                                        tr_getResumeDir( tor->session ), base );
+    tr_free( base );
+    return filename;
 }
 

branches/1.9x/libtransmission/torrent-magnet.c

@@ -76 +76 @@
             int i;
             struct tr_incomplete_metadata * m;
-            int n = ( size + ( METADATA_PIECE_SIZE - 1 ) ) / METADATA_PIECE_SIZE;
-            dbgmsg( tor, "there are %d pieces", n );
+            const int n = ( size + ( METADATA_PIECE_SIZE - 1 ) ) / METADATA_PIECE_SIZE;
+            dbgmsg( tor, "metadata is %d bytes in %d pieces", size, n );
 
             m = tr_new( struct tr_incomplete_metadata, 1 );