mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

#3041 remove the code to skip lines with unreadable characters (this was skipping valid lines); add temporary extra debugging

This commit is contained in:
Mitchell Livingston 2010-04-30 22:58:03 +00:00
parent 3d0e329364
commit 12275ccc10
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libtransmission/blocklist.c
View File

@ -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 );