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

parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION

Browse Source 
Introduce a PARSE_OPT_NON_OPTION state, so parse_option_step()
callers can easily distinguish between non-options and other
reasons for option parsing termination (like "--").

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-12-01 17:32:55 -06:00 committed by Junio C Hamano
parent b0b3a8b666
commit 979240fee3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
parse-options.c
View File

@ -373,7 +373,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
if (parse_nodash_opt(ctx, arg, options) == 0) if (parse_nodash_opt(ctx, arg, options) == 0)
continue; continue;
if (ctx->flags & PARSE_OPT_STOP_AT_NON_OPTION) if (ctx->flags & PARSE_OPT_STOP_AT_NON_OPTION)
break; return PARSE_OPT_NON_OPTION;
ctx->out[ctx->cpidx++] = ctx->argv[0]; ctx->out[ctx->cpidx++] = ctx->argv[0];
continue; continue;
} }
@ -455,6 +455,7 @@ int parse_options(int argc, const char **argv, const char *prefix,
switch (parse_options_step(&ctx, options, usagestr)) { switch (parse_options_step(&ctx, options, usagestr)) {
case PARSE_OPT_HELP: case PARSE_OPT_HELP:
exit(129); exit(129);
case PARSE_OPT_NON_OPTION:
case PARSE_OPT_DONE: case PARSE_OPT_DONE:
break; break;
default: /* PARSE_OPT_UNKNOWN */ default: /* PARSE_OPT_UNKNOWN */

1
parse-options.h
View File

@ -167,6 +167,7 @@ extern NORETURN void usage_msg_opt(const char *msg,
enum { enum {
PARSE_OPT_HELP = -1, PARSE_OPT_HELP = -1,
PARSE_OPT_DONE, PARSE_OPT_DONE,
PARSE_OPT_NON_OPTION,
PARSE_OPT_UNKNOWN PARSE_OPT_UNKNOWN
}; };