From owner-p4-projects@FreeBSD.ORG Fri Jun 11 01:14:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4A871065679; Fri, 11 Jun 2010 01:14:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9945E106566C for ; Fri, 11 Jun 2010 01:14:53 +0000 (UTC) (envelope-from bfiedler@FreeBSD.org) Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8767E8FC15 for ; Fri, 11 Jun 2010 01:14:53 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5B1ErkU012668 for ; Fri, 11 Jun 2010 01:14:53 GMT (envelope-from bfiedler@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5B1Er4U012666 for perforce@freebsd.org; Fri, 11 Jun 2010 01:14:53 GMT (envelope-from bfiedler@FreeBSD.org) Date: Fri, 11 Jun 2010 01:14:53 GMT Message-Id: <201006110114.o5B1Er4U012666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bfiedler@FreeBSD.org using -f From: Benjamin Fiedler To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 179447 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jun 2010 01:14:54 -0000 http://p4web.freebsd.org/@@179447?ac=10 Change 179447 by bfiedler@freebsd-7803 on 2010/06/11 01:14:46 Attempting to implement 'B' flag Affected files ... .. //depot/projects/soc2010/bsdtextproc/diff/diffreg.c#3 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/diff/diffreg.c#3 (text+ko) ==== @@ -570,7 +570,11 @@ sz = sz * 3 / 2; p = erealloc(p, (sz + 3) * sizeof(struct line)); } - p[++j].value = h; + + /* ignore blank lines (also EOF)*/ + if( !(Bflag && h == 1) ) { + p[++j].value = h; + } } len[i] = j; file[i] = p;