From owner-p4-projects@FreeBSD.ORG  Mon Aug  4 16:32:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3268B1065676; Mon,  4 Aug 2008 16:32:22 +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 EA8771065672
	for <perforce@freebsd.org>; Mon,  4 Aug 2008 16:32:21 +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 C39B98FC17
	for <perforce@freebsd.org>; Mon,  4 Aug 2008 16:32:21 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m74GWLxm074566
	for <perforce@freebsd.org>; Mon, 4 Aug 2008 16:32:21 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m74GWLkq074564
	for perforce@freebsd.org; Mon, 4 Aug 2008 16:32:21 GMT
	(envelope-from gabor@freebsd.org)
Date: Mon, 4 Aug 2008 16:32:21 GMT
Message-Id: <200808041632.m74GWLkq074564@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 146637 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: Mon, 04 Aug 2008 16:32:22 -0000

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

Change 146637 by gabor@gabor_server on 2008/08/04 16:31:29

	- Fix an if

Affected files ...

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

Differences ...

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

@@ -766,7 +766,7 @@
 			ixnew[j] = ctnew += skipline(f2);
 			j++;
 		}
-		if (bflag || wflag || iflag) {
+		if (bflag || wflag || iflag || strip_cr) {
 			for (;;) {
 				c = getc(f1);
 				d = getc(f2);