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

parseopt: add PARSE_OPT_KEEP_UNKNOWN

Browse Source 
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>
This commit is contained in:
René Scharfe 2009-03-08 19:12:47 +01:00 committed by Junio C Hamano
parent 934f788981
commit b5ce3a5430
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parse-options.c
View File

@ -274,7 +274,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
case -1: case -1:
return parse_options_usage(usagestr, options); return parse_options_usage(usagestr, options);
case -2: case -2:
return PARSE_OPT_UNKNOWN; goto unknown;
} }
if (ctx->opt) if (ctx->opt)
check_typos(arg + 1, options); 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); ctx->argv[0] = xstrdup(ctx->opt - 1);
*(char *)ctx->argv[0] = '-'; *(char *)ctx->argv[0] = '-';
return PARSE_OPT_UNKNOWN; goto unknown;
} }
} }
continue; continue;
@ -314,8 +314,14 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
case -1: case -1:
return parse_options_usage(usagestr, options); return parse_options_usage(usagestr, options);
case -2: 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; return PARSE_OPT_DONE;
} }

1
parse-options.h
View File

@ -21,6 +21,7 @@ enum parse_opt_flags {
PARSE_OPT_KEEP_DASHDASH = 1, PARSE_OPT_KEEP_DASHDASH = 1,
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,
}; };
enum parse_opt_option_flags { enum parse_opt_option_flags {