diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2009-03-08 18:12:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-08 20:36:09 (GMT) |
| commit | b5ce3a54302cb6e29a02cd8fe4ea55eacea0a86e (patch) | |
| tree | 8b645fabe497f906af064488b8f7d2c8d171800d /parse-options.c | |
| parent | 934f788981de941814e821217f32451a5c715d5d (diff) | |
| download | git-b5ce3a54302cb6e29a02cd8fe4ea55eacea0a86e.zip git-b5ce3a54302cb6e29a02cd8fe4ea55eacea0a86e.tar.gz git-b5ce3a54302cb6e29a02cd8fe4ea55eacea0a86e.tar.bz2 | |
parseopt: add PARSE_OPT_KEEP_UNKNOWN
Add a parseopt flag, PARSE_OPT_KEEP_UNKNOWN, that can be used to keep
unknown options in argv, similar to the existing KEEP flags.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/parse-options.c b/parse-options.c index 4c5d09d..39808ae 100644 --- a/parse-options.c +++ b/parse-options.c @@ -274,7 +274,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, case -1: return parse_options_usage(usagestr, options); case -2: - return PARSE_OPT_UNKNOWN; + goto unknown; } if (ctx->opt) check_typos(arg + 1, options); @@ -292,7 +292,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, */ ctx->argv[0] = xstrdup(ctx->opt - 1); *(char *)ctx->argv[0] = '-'; - return PARSE_OPT_UNKNOWN; + goto unknown; } } continue; @@ -314,8 +314,14 @@ int parse_options_step(struct parse_opt_ctx_t *ctx, case -1: return parse_options_usage(usagestr, options); case -2: - return PARSE_OPT_UNKNOWN; + goto unknown; } + continue; +unknown: + if (!(ctx->flags & PARSE_OPT_KEEP_UNKNOWN)) + return PARSE_OPT_UNKNOWN; + ctx->out[ctx->cpidx++] = ctx->argv[0]; + ctx->opt = NULL; } return PARSE_OPT_DONE; } |