Changeset 9971

Timestamp:

Jan 20, 2010, 6:15:09 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #2771 "Unable to add magnet URI from Mininova via web interface" -- fixed for 1.80

File:

• trunk/libtransmission/rpcimpl.c (modified) (3 diffs)

trunk/libtransmission/rpcimpl.c

@@ -1005 +1005 @@
         return FALSE;
 
-    return ( strstr( filename, "ftp://" ) != NULL )
-        || ( strstr( filename, "http://" ) != NULL )
-        || ( strstr( filename, "https://" ) != NULL );
+    return !memcmp( filename, "ftp://", 6 ) ||
+           !memcmp( filename, "http://", 7 ) ||
+           !memcmp( filename, "https://", 8 );
 }
 
@@ -1105 +1105 @@
         else
         {
-            if( filename == NULL )
+            char * fname = tr_strstrip( tr_strdup( filename ) );
+
+            if( fname == NULL )
             {
                 int len;
@@ -1112 +1114 @@
                 tr_free( metainfo );
             }
-            else if( !strncmp( filename, "magnet:?", 8 ) )
+            else if( !strncmp( fname, "magnet:?", 8 ) )
             {
-                tr_ctorSetMagnet( ctor, filename );
+                tr_ctorSetMagnet( ctor, fname );
             }
             else
             {
-                tr_ctorSetMetainfoFromFile( ctor, filename );
+                tr_ctorSetMetainfoFromFile( ctor, fname );
             }
 
             addTorrentImpl( idle_data, ctor );
+
+            tr_free( fname );
         }