Re: [PATCH] help: Add a missing OPT_END().

Re: [PATCH] help: Add a missing OPT_END().

[Jeff King]

On Wed, Apr 02, 2008 at 05:47:41AM +0200, Christian Couder wrote:

> 	Some comments in "parse-options.h" say it is needed,
> 	though I did not see a crash without it.

There was no particular reason I didn't put it in; I just didn't know
about it. So ack from me, assuming it is supposed to be there.

-Peff

[PATCH] help: Add a missing OPT_END().

[Christian Couder]

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 help.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

	Some comments in "parse-options.h" say it is needed,
	though I did not see a crash without it.

diff --git a/help.c b/help.c
index ecaca77..10298fb 100644
--- a/help.c
+++ b/help.c
@@ -30,6 +30,7 @@ static struct option builtin_help_options[] = {
 			HELP_FORMAT_WEB),
 	OPT_SET_INT('i', "info", &help_format, "show info page",
 			HELP_FORMAT_INFO),
+	OPT_END(),
 };
 
 static const char * const builtin_help_usage[] = {
-- 
1.5.5.rc2.6.gf58d

Re: [PATCH] help: Add a missing OPT_END().

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> On Wed, Apr 02, 2008 at 05:47:41AM +0200, Christian Couder wrote:
>
>> 	Some comments in "parse-options.h" say it is needed,
>> 	though I did not see a crash without it.
>
> There was no particular reason I didn't put it in; I just didn't know
> about it. So ack from me, assuming it is supposed to be there.

parse-options.c::parse_short_opt() and parse_long_opt() has this loop:

	for (; options->type != OPTION_END; options++) {
		...
	}

So whatever happens to come after builtin_help_options[] may be read from
by this loop when you do not have OPTION_END.