From owner-p4-projects@FreeBSD.ORG  Wed Jul  2 15:10:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC1DB1065674; Wed,  2 Jul 2008 15:10:49 +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 3B35E106564A
	for <perforce@freebsd.org>; Wed,  2 Jul 2008 15:10:49 +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 29CA98FC19
	for <perforce@freebsd.org>; Wed,  2 Jul 2008 15:10:49 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m62FAnGU049051
	for <perforce@freebsd.org>; Wed, 2 Jul 2008 15:10:49 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m62FAn3S049049
	for perforce@freebsd.org; Wed, 2 Jul 2008 15:10:49 GMT
	(envelope-from gabor@freebsd.org)
Date: Wed, 2 Jul 2008 15:10:49 GMT
Message-Id: <200807021510.m62FAn3S049049@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 144491 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: Wed, 02 Jul 2008 15:10:49 -0000

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

Change 144491 by gabor@gabor_server on 2008/07/02 15:10:37

	- Add --normal

Affected files ...

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

Differences ...

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

@@ -54,7 +54,8 @@
 regex_t	 ignore_re;
 
 enum {
-	HELP_OPT = CHAR_MAX + 1
+	HELP_OPT = CHAR_MAX + 1,
+	NORMAL_OPT
 };
 
 #define	OPTIONS	"0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:"
@@ -62,8 +63,9 @@
 /* XXX: UNIMPLEMENTED
 	{ "ignore-file-name-case",	no_argument,		NULL,	OPT_IGN_FN_CASE },
 	{ "no-ignore-file-name-case",	no_argument,		NULL,	OPT_NIGN_FN_CASE },
-	{ "strip-trailing-cr",		no_argument,		NULL,	OPT_STRIPCR },
-	{ "normal",			no_argument,		NULL,	OPT_NORMAL },
+	{ "strip-trailing-cr",		no_argument,		NULL,	OPT_STRIPCR }, */
+	{ "normal",			no_argument,		NULL,	NORMAL_OPT },
+/* XXX: UNIMPLEMENTED
 	{ "left-column",		no_argument,		NULL,	OPT_LEFTC },
 	{ "suppress-common-lines",	no_argument,		NULL,	OT_SUPCL },
 	{ "GTYPE-group-format",		required_argument,	NULL,	OPT_GTYPE },
@@ -247,6 +249,9 @@
 		case 'x':
 			push_excludes(optarg);
 			break;
+		case NORMAL_OPT:
+			/* compatibility, this is the default */
+			break;
 		case HELP_OPT:
 		default:
 			usage();