Changeset 7254

Timestamp:

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

Author:

charles

Message:

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

File:

• branches/1.4x/libtransmission/blocklist.c (modified) (3 diffs)

branches/1.4x/libtransmission/blocklist.c

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