From owner-cvs-all Tue Oct 29 13:40:24 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD1FA37B401; Tue, 29 Oct 2002 13:40:23 -0800 (PST) Received: from InterJet.elischer.org (12-232-206-8.client.attbi.com [12.232.206.8]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AAFE43E42; Tue, 29 Oct 2002 13:40:23 -0800 (PST) (envelope-from julian@elischer.org) Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id NAA31472; Tue, 29 Oct 2002 13:30:25 -0800 (PST) Date: Tue, 29 Oct 2002 13:30:24 -0800 (PST) From: Julian Elischer To: "David O'Brien" Cc: Bill Fenner , cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org Subject: Re: cvs commit: src/lib/libfetch common.c In-Reply-To: <20021029204043.GB43281@dragon.nuxi.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 29 Oct 2002, David O'Brien wrote: > On Tue, Oct 29, 2002 at 09:58:41AM -0800, Bill Fenner wrote: > > > > Backing out revs 1.34 and 1.37 but leaving 1.35, 1.36 and 1.38, > > result in a working libfetch for me. With 1.34 and 1.37 I was > > getting core dumps in stdio while using a proxy, _fetch_read() > > was confusing stdio. I haven't tracked it down further. > > Since > > cvs diff -kk -r 1.36 -r 1.37 common.c | patch -R > cvs diff -kk -r 1.33 -r 1.34 common.c | patch -R > > results in rejects, I don't supose you've already done this and could > work with me by sending me the file so I can maybe reduce the amount of > additional time I spend on this to maybe just an hour? > try: cvs up -kk -j 1.37 -j 1.36 common.c cvs up -kk -j 1.35 -j 1.34 common.c and fix the single collision <<<<<<< common.c total = 0; while (iovcnt > 0) { ======= while (len > 0) { >>>>>>> 1.34 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message