PERFORCE change 146523 for review

[Gabor Kovesdan]

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

Change 146523 by gabor at gabor_server on 2008/08/03 14:02:14

	- Don't implement features as noop, it is not a good idea.
	
	Prodded by:	kris

Affected files ...

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

Differences ...

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

@@ -66,7 +66,7 @@
 	NOOP_OPT
 };
 
-#define	OPTIONS	"0123456789abC:cdD:eF:fhI:iL:lnNPpqrS:sTtU:uvwW:X:x:y"
+#define	OPTIONS	"0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:"
 static struct option longopts[] = {
 	{ "ignore-file-name-case",	no_argument,		NULL,	FCASE_IGNORE_OPT },
 	{ "no-ignore-file-name-case",	no_argument,		NULL,	FCASE_SENSITIVE_OPT },
@@ -109,13 +109,15 @@
 	{ "ignore-all-space",		no_argument,		NULL,	'w' },
 	{ "exclude-from",		required_argument,	NULL,	'X' },
 	{ "exclude",			required_argument,	NULL,	'x' },
-/* Compatibility options, which are noop.  We only pretend to support them. */
+	{ "speed-large-files",          no_argument,            NULL,   NOOP_OPT },
+/* XXX: the following are not very well documented and rarely used. If we need
+        them at all, we will need to dig into the code to see what do they do
+        actually.
 	{ "horizon-lines",		required_argument,	NULL,	NOOP_OPT },
 	{ "left-column",		no_argument,		NULL,	NOOP_OPT },
 	{ "line-format",                required_argument,      NULL,   NOOP_OPT },
 	{ "show-function-line",		required_argument,	NULL,	'F' },
 	{ "side-by-side",		no_argument,		NULL,	'y' },
-	{ "speed-large-files",		no_argument,		NULL,	NOOP_OPT },
 	{ "suppress-common-lines",	no_argument,		NULL,	NOOP_OPT },
 	{ "width",			optional_argument,	NULL,	'W' },
 	{ "unchanged-group-format",	required_argument,	NULL,	NOOP_OPT },
@@ -124,7 +126,8 @@
 	{ "changed-group-format",	required_argument,	NULL,	NOOP_OPT },
 	{ "unchanged-line-format",	required_argument,	NULL,	NOOP_OPT },
 	{ "old-line-format",		required_argument,	NULL,	NOOP_OPT },
-	{ "new-line-format",		required_argument,	NULL,	NOOP_OPT },	
+	{ "new-line-format",		required_argument,	NULL,	NOOP_OPT },
+*/
 	{ NULL,				0,			NULL,	'\0'}
 };