From 12275ccc10a550c399f8b14f15b64903a7a61dd5 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Fri, 30 Apr 2010 22:58:03 +0000
Subject: [PATCH] #3041 remove the code to skip lines with unreadable
 characters (this was skipping valid lines); add temporary extra debugging

---
 libtransmission/blocklist.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c
index 6f61c6ec7..f1ec42865 100644
--- a/libtransmission/blocklist.c
+++ b/libtransmission/blocklist.c
@@ -264,7 +264,6 @@ _tr_blocklistSetContent( tr_blocklist * b,
 
     while( !fggets( &line, in ) )
     {
-        const char * pch;
         char * rangeBegin;
         char * rangeEnd;
         char * crpos;
@@ -273,15 +272,6 @@ _tr_blocklistSetContent( tr_blocklist * b,
 
         ++inCount;
 
-        for( pch=line; pch && *pch; ++pch )
-            if( !isprint( *pch ) && ( *pch != '\r' ) && ( *pch != '\n' ) )
-                break;
-        if( !pch || *pch ) {
-            tr_err( "skipping line #%d which contains nonprintable characters\n", inCount );
-            free( line );
-            continue;
-        }
-
         rangeBegin = strrchr( line, ':' );
         if( !rangeBegin ){ free( line ); continue; }
         ++rangeBegin;
@@ -293,15 +283,23 @@ _tr_blocklistSetContent( tr_blocklist * b,
             *crpos = '\0';
 
         if( !tr_pton( rangeBegin, &addr ) )
-            tr_err( "blocklist skipped invalid address [%s]\n", rangeBegin );
+        {
+            printf( "error rangeBegin: %s", line );
+            tr_err( _( "blocklist skipped invalid address at line %d" ), inCount );
+            free( line );
+            continue;
+        }
         range.begin = ntohl( addr.addr.addr4.s_addr );
 
         if( !tr_pton( rangeEnd, &addr ) )
-            tr_err( "blocklist skipped invalid address [%s]\n", rangeEnd );
+        {
+            printf( "error rangeEnd: %s", line );
+            tr_err( _( "blocklist skipped invalid address at line %d" ), inCount );
+            free( line );
+            continue;
+        }
         range.end = ntohl( addr.addr.addr4.s_addr );
 
-        free( line );
-
         if( fwrite( &range, sizeof( struct tr_ip_range ), 1, out ) != 1 )
         {
             tr_err( _(
@@ -319,7 +317,6 @@ _tr_blocklistSetContent( tr_blocklist * b,
         tr_free( base );
     }
 
-
     fclose( out );
     fclose( in );