head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.24
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.20
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.18
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.16
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.14
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.12
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.10
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.8
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.6
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.4
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.1.0.10
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.8
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.6
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.4
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.2
	pkgsrc-2006Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.05.22.12.17.55;	author spz;	state dead;
branches;
next	1.1;

1.1
date	2006.02.15.20.07.40;	author spz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@new version, new patches: upstream adopted a bunch of ours, but gcc found
new things to bitch about
@
text
@$NetBSD: patch-ck,v 1.1 2006/02/15 20:07:40 spz Exp $

--- src/irr/birdwhoisc.cc.orig	2004-07-30 12:58:11.000000000 +0200
+++ src/irr/birdwhoisc.cc
@@@@ -112,10 +112,13 @@@@ static void stripRipeComments(Buffer &bu
 	 if (eol == NULL)
 	    // no EOL, no comment to strip (yet)
 	    goto out;
-	 assert(*(eol+1) == '\n' || *(eol+1) == '%');
 	 size -= (eol-cont)+1;
 	 cont = eol + 1;
 	 removedLines = true;
+     if (*(cont) != '\n' && *(cont) != '%') 
+        // next line starts not with a comment, so assume comments have
+        // ended the APNIC way
+        goto out;
       }
       if (*cont == '\n') {
 	 size--;
@@@@ -197,6 +200,8 @@@@ bool BirdWhoisClient::getResponse(char *
       << "]"
       << endl;
 
+   text = result->contents;
+   len  = result->size;
    return true;
 }
 
@


1.1
log
@two changes:
- fix a hairy bug in BirdWhoisClient::getResponse (how did that ever work?)
- make stripRipeComments more lenient against an APNIC comment style problem
@
text
@d1 1
a1 1
$NetBSD$
@