From owner-p4-projects@FreeBSD.ORG Tue Jul 29 16:01:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56A111065678; Tue, 29 Jul 2008 16:01:16 +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 1A7BE1065676 for ; Tue, 29 Jul 2008 16:01:16 +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 077B98FC12 for ; Tue, 29 Jul 2008 16:01:16 +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 m6TG1Fi7039195 for ; Tue, 29 Jul 2008 16:01:15 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6TG1FXh039193 for perforce@freebsd.org; Tue, 29 Jul 2008 16:01:15 GMT (envelope-from gabor@freebsd.org) Date: Tue, 29 Jul 2008 16:01:15 GMT Message-Id: <200807291601.m6TG1FXh039193@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 146209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jul 2008 16:01:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=146209 Change 146209 by gabor@gabor_server on 2008/07/29 16:01:05 - Just handle some command line options as noop. They seem to be rarely used based on the resources describing them. From now on let's concentrate on the really practical features instead of these ones. Affected files ... .. //depot/projects/soc2008/gabor_textproc/diff/diff.c#15 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/diff/diff.c#15 (text+ko) ==== @@ -63,10 +63,10 @@ FROMFILE_OPT, TOFILE_OPT, UNIDIR_OPT, - SPEEDLF_OPT + NOOP_OPT }; -#define OPTIONS "0123456789abC:cdD:efhI:iL:lnNPpqrS:sTtU:uvwX:x:" +#define OPTIONS "0123456789abC:cdD:eF:fhI:iL:lnNPpqrS:sTtU:uvwW:X:x:y" 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 }, @@ -74,18 +74,10 @@ { "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 }, - { "line-format", required_argument, NULL, OPT_LF }, - { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, { "tabsize", optional_argument, NULL, OPT_TSIZE }, */ { "unidirectional-new-file", no_argument, NULL, UNIDIR_OPT }, { "from-file", required_argument, NULL, FROMFILE_OPT }, { "to-file", required_argument, NULL, TOFILE_OPT }, -/* XXX: UNIMPLEMENTED - { "horizon-lines", required_argument, NULL, OPT_HLINES }, */ - { "speed-large-files", no_argument, NULL, SPEEDLF_OPT }, { "help", no_argument, NULL, HELP_OPT }, { "text", no_argument, NULL, 'a' }, /* XXX: UNIMPLEMENTED @@ -97,8 +89,6 @@ /* XXX: UNIMPLEMENTED { "ignore-tab-expansion", no_argument, NULL, 'E' }, */ { "ed", no_argument, NULL, 'e' }, -/* XXX: UNIMPLEMENTED - { "show-function-line", required_argument, NULL, 'F' }, */ { "forward-ed", no_argument, NULL, 'f' }, { "ignore-matching-lines", required_argument, NULL, 'I' }, { "ignore-case", no_argument, NULL, 'i' }, @@ -116,13 +106,25 @@ { "expand-tabs", no_argument, NULL, 't' }, { "unified", optional_argument, NULL, 'U' }, { "version", no_argument, NULL, 'v' }, -/* XXX: UNIMPLEMENTED - { "width", optional_argument, NULL, 'W' }, */ { "ignore-all-space", no_argument, NULL, 'w' }, { "exclude-from", required_argument, NULL, 'X' }, { "exclude", required_argument, NULL, 'x' }, -/* XXX: UNIMPLEMENTED - { "side-by-side", no_argument, NULL, 'y' }, */ +/* Compatibility options, which are noop. We only pretend to support them. */ + { "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 }, + { "old-group-format", required_argument, NULL, NOOP_OPT }, + { "new-group-format", required_argument, NULL, NOOP_OPT }, + { "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 }, { NULL, 0, NULL, '\0'} }; @@ -279,7 +281,10 @@ case FCASE_IGNORE_OPT: fcase_behave = FCASE_IGNORE; break; - case SPEEDLF_OPT: + case 'F': + case 'y': + case 'W': + case NOOP_OPT: /* noop, compatibility */ break; case NORMAL_OPT: