From owner-p4-projects@FreeBSD.ORG  Sun Jan 25 23:29:47 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B1A42106567F; Sun, 25 Jan 2009 23:29:46 +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 6B8D3106567A
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 23:29:46 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 59A1B8FC13
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 23:29:46 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0PNTkZZ094496
	for <perforce@freebsd.org>; Sun, 25 Jan 2009 23:29:46 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0PNTkl2094494
	for perforce@freebsd.org; Sun, 25 Jan 2009 23:29:46 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 25 Jan 2009 23:29:46 GMT
Message-Id: <200901252329.n0PNTkl2094494@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156668 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sun, 25 Jan 2009 23:29:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=156668

Change 156668 by gabor@gabor_server on 2009/01/25 23:28:52

	- Implement --strip-trailing-cr
	- Remove debug line

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/diff/diffreg.c#8 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/diff/diffreg.c#8 (text+ko) ====

@@ -779,15 +779,11 @@
 				    (c == '\n' && d == EOF))) {
 					break;
 				}
-				if ((strip_cr) &&
-				    ((c == EOF && d == '\r') ||
-				    (c == '\r' && d == EOF)))
-					break;
 				ctold++;
 				ctnew++;
-				while ((strip_cr) && (c == '\r'))
+				while ((strip_cr) && (c == '\r') && (d == '\n'))
 					c = getc(f1);
-				while ((strip_cr) && (d == '\r'))
+				while ((strip_cr) && (d == '\r') && (c == '\n'))
 					d = getc(f2);
 				if (bflag && isspace(c) && isspace(d)) {
 					do {
@@ -1288,7 +1284,6 @@
 	 * There is a remote possibility that we end up with a zero sum.
 	 * Zero is used as an EOF marker, so return 1 instead.
 	 */
-	printf("HASH: %d\n", (sum == 0 ? 1 : sum));
 	return (sum == 0 ? 1 : sum);
 }