From owner-p4-projects@FreeBSD.ORG  Wed Jun  9 17:59:20 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8B7B1065676; Wed,  9 Jun 2010 17:59:20 +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 8D68F1065670
	for <perforce@FreeBSD.org>; Wed,  9 Jun 2010 17:59:20 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B7308FC08
	for <perforce@FreeBSD.org>; Wed,  9 Jun 2010 17:59:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o59HxK83025782
	for <perforce@FreeBSD.org>; Wed, 9 Jun 2010 17:59:20 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o59HxK1v025780
	for perforce@freebsd.org; Wed, 9 Jun 2010 17:59:20 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Wed, 9 Jun 2010 17:59:20 GMT
Message-Id: <201006091759.o59HxK1v025780@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179367 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 09 Jun 2010 17:59:21 -0000

http://p4web.freebsd.org/@@179367?ac=10

Change 179367 by bfiedler@freebsd-home on 2010/06/09 17:58:44

	Fix --help options

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/diff/diff.c#3 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/diff/diff.c#3 (text+ko) ====

@@ -139,13 +139,15 @@
 	{ NULL,				0,			NULL,	'\0'}
 };
 
-static const char* help_msg[] = { 
+static const char *help_msg[] = { 
 "-a --text  treat files as ASCII text",
 "-B --ignore-blank-lines  Ignore blank newlines in the comparison",
 "-b --ignore-space-change  Ignore all changes due to whitespace",
 "-C NUM --context=[NUM]  Show NUM lines before and after change (default 3)",
 "-D --ifdef=NAME",
-NULL };
+NULL,
+};
+char **help_strs = (char **)help_msg;
 
 
 void usage(void);
@@ -293,6 +295,12 @@
 			ignore_file_case = 0;
 			break; 
 		case OPT_HELP:
+			for(;*help_strs;help_strs++) 
+			{
+				printf("%s\n", *help_strs);
+			}
+			exit(2);
+			break;
 		default:
 			usage();
 			break;