undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parseopt: add PARSE_OPT_NO_INTERNAL_HELP

Browse Source 
Add a parseopt flag, PARSE_OPT_NO_INTERNAL_HELP, that turns off internal
handling of -h, --help and --help-all.  This allows the implementation
of custom help option handlers or incremental parsers.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2009-03-08 19:15:08 +01:00 committed by Junio C Hamano
parent b5ce3a5430
commit b92891f978
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parse-options.c
View File

@ -253,6 +253,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
const struct option *options, const struct option *options,
const char * const usagestr[]) const char * const usagestr[])
{ {
int internal_help = !(ctx->flags & PARSE_OPT_NO_INTERNAL_HELP);
/* we must reset ->opt, unknown short option leave it dangling */ /* we must reset ->opt, unknown short option leave it dangling */
ctx->opt = NULL; ctx->opt = NULL;
@ -268,7 +270,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
if (arg[1] != '-') { if (arg[1] != '-') {
ctx->opt = arg + 1; ctx->opt = arg + 1;
if (*ctx->opt == 'h') if (internal_help && *ctx->opt == 'h')
return parse_options_usage(usagestr, options); return parse_options_usage(usagestr, options);
switch (parse_short_opt(ctx, options)) { switch (parse_short_opt(ctx, options)) {
case -1: case -1:
@ -279,7 +281,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
if (ctx->opt) if (ctx->opt)
check_typos(arg + 1, options); check_typos(arg + 1, options);
while (ctx->opt) { while (ctx->opt) {
if (*ctx->opt == 'h') if (internal_help && *ctx->opt == 'h')
return parse_options_usage(usagestr, options); return parse_options_usage(usagestr, options);
switch (parse_short_opt(ctx, options)) { switch (parse_short_opt(ctx, options)) {
case -1: case -1:
@ -306,9 +308,9 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
break; break;
} }
if (!strcmp(arg + 2, "help-all")) if (internal_help && !strcmp(arg + 2, "help-all"))
return usage_with_options_internal(usagestr, options, 1); return usage_with_options_internal(usagestr, options, 1);
if (!strcmp(arg + 2, "help")) if (internal_help && !strcmp(arg + 2, "help"))
return parse_options_usage(usagestr, options); return parse_options_usage(usagestr, options);
switch (parse_long_opt(ctx, arg + 2, options)) { switch (parse_long_opt(ctx, arg + 2, options)) {
case -1: case -1:

1
parse-options.h
View File

@ -22,6 +22,7 @@ enum parse_opt_flags {
PARSE_OPT_STOP_AT_NON_OPTION = 2, PARSE_OPT_STOP_AT_NON_OPTION = 2,
PARSE_OPT_KEEP_ARGV0 = 4, PARSE_OPT_KEEP_ARGV0 = 4,
PARSE_OPT_KEEP_UNKNOWN = 8, PARSE_OPT_KEEP_UNKNOWN = 8,
PARSE_OPT_NO_INTERNAL_HELP = 16,
}; };
enum parse_opt_option_flags { enum parse_opt_option_flags {