From owner-p4-projects@FreeBSD.ORG  Wed Jun 16 00:29:32 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E5231065679; Wed, 16 Jun 2010 00:29:31 +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 62AF9106564A
	for <perforce@FreeBSD.org>; Wed, 16 Jun 2010 00:29:31 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 502798FC1C
	for <perforce@FreeBSD.org>; Wed, 16 Jun 2010 00:29:31 +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 o5G0TVvw000381
	for <perforce@FreeBSD.org>; Wed, 16 Jun 2010 00:29:31 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5G0TVmK000379
	for perforce@freebsd.org; Wed, 16 Jun 2010 00:29:31 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Wed, 16 Jun 2010 00:29:31 GMT
Message-Id: <201006160029.o5G0TVmK000379@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179668 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jun 2010 00:29:32 -0000

http://p4web.freebsd.org/@@179668?ac=10

Change 179668 by bfiedler@freebsd-7803 on 2010/06/16 00:28:45

	Change implementation of 'B' flag again. It is still not 100% working

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/diff/diffreg.c#5 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/diff/diffreg.c#5 (text+ko) ====

@@ -801,22 +801,29 @@
 						d = getc(f2);
 						ctnew++;
 					}
+
 				} else if (Bflag) {
-					while( c == '\n' && d != '\n' ) {
-						c = getc(f1);
-				                ixold[i] = ctold;
-						ixnew[j] = ctnew;
-               					j++; i++;
-						if( i == len[0] || j == len[1] ) { break; }
+					if( c == '\n' && d != '\n') {
+
+						do {
+							if (c == '\n') {
+							      ixold[i] = ctold; 
+							      i++;
+							}
+
+						} while ((c = getc(f1)) == '\n' && i <= len[0]);
 					}
+
+					if( d == '\n' && c != '\n') {
+						do {
+							if (d == '\n') {
+								ixnew[j] = ctnew;
+								j++;
+							}
+						} while ((d = getc(f2)) == '\n' && j <= len[1]);
 		
-					while( d == '\n' && c != '\n') {
-						d = getc(f2);
-						ixold[i] = ctold;
-                                                ixnew[j] = ctnew;
-						j++; i++;
-						if( i == len[0] || j == len[1] ) { break; }
 					}
+			
 					break;
 				}
 				if (chrtran[c] != chrtran[d]) {