PERFORCE change 144491 for review

[Gabor Kovesdan]

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

Change 144491 by gabor at 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();