[PATCH 1/4] parseopt: add PARSE_OPT_KEEP_UNKNOWN
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Mar 8, 2009, 18:12 UTC
- Message-ID
- <49B40A9F.7050408@lsrfire.ath.cx>
- In-Reply-To
- <49B2C784.90800@lsrfire.ath.cx>
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> --- parse-options.c | 12 +++++++++--- parse-options.h | 1 + 2 files changed, 10 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; } diff --git a/parse-options.h b/parse-options.h index 9122905..b7d08b1 100644 --- a/parse-options.h +++ b/parse-options.h @@ -21,6 +21,7 @@ enum parse_opt_flags { PARSE_OPT_KEEP_DASHDASH = 1, PARSE_OPT_STOP_AT_NON_OPTION = 2, PARSE_OPT_KEEP_ARGV0 = 4, + PARSE_OPT_KEEP_UNKNOWN = 8, }; enum parse_opt_option_flags {
-- 1.6.2