Changeset 7253

Timestamp:

Dec 3, 2008, 5:28:09 AM (14 years ago)

Author:

charles

Message:

(libT) #1552: Blocklists fail when Windows newlines are present

File:

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

trunk/libtransmission/blocklist.c

@@ -199 +199 @@
 
 int
-_tr_blocklistHasAddress( tr_blocklist            * b,
-                         const struct tr_address * addr )
+_tr_blocklistHasAddress( tr_blocklist     * b,
+                         const tr_address * addr )
 {
     uint32_t                   needle;
@@ -258 +258 @@
     while( !fggets( &line, in ) )
     {
-        char *             rangeBegin;
-        char *             rangeEnd;
-        struct tr_address  addr;
+        char * rangeBegin;
+        char * rangeEnd;
+        char * crpos;
+        tr_address  addr;
         struct tr_ip_range range;
 
@@ -270 +271 @@
         if( !rangeEnd ){ free( line ); continue; }
         *rangeEnd++ = '\0';
+        if(( crpos = strchr( rangeEnd, '\r' )))
+            *crpos = '\0';
 
         if( !tr_pton( rangeBegin, &addr ) )