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

parse-opt: have parse_options_{start,end}.

Browse Source 
Make the struct optparse_t public under the better name parse_opt_ctx_t.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pierre Habouzit 2008-06-23 21:59:37 +02:00 committed by Junio C Hamano
parent 112db553b0
commit 7e7bbcb4b3
2 changed files with 55 additions and 30 deletions

69
parse-options.c

@ -4,14 +4,7 @@
#define OPT_SHORT 1 #define OPT_SHORT 1
#define OPT_UNSET 2 #define OPT_UNSET 2
struct optparse_t { static inline const char *get_arg(struct parse_opt_ctx_t *p)
const char **argv;
const char **out;
int argc, cpidx;
const char *opt;
};
static inline const char *get_arg(struct optparse_t *p)
{ {
if (p->opt) { if (p->opt) {
const char *res = p->opt; const char *res = p->opt;
@ -37,7 +30,7 @@ static int opterror(const struct option *opt, const char *reason, int flags)
return error("option `%s' %s", opt->long_name, reason); return error("option `%s' %s", opt->long_name, reason);
} }
static int get_value(struct optparse_t *p, static int get_value(struct parse_opt_ctx_t *p,
const struct option *opt, int flags) const struct option *opt, int flags)
{ {
const char *s, *arg; const char *s, *arg;
@ -131,7 +124,7 @@ static int get_value(struct optparse_t *p,
} }
} }
static int parse_short_opt(struct optparse_t *p, const struct option *options) static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *options)
{ {
for (; options->type != OPTION_END; options++) { for (; options->type != OPTION_END; options++) {
if (options->short_name == *p->opt) { if (options->short_name == *p->opt) {
@ -142,7 +135,7 @@ static int parse_short_opt(struct optparse_t *p, const struct option *options)
return error("unknown switch `%c'", *p->opt); return error("unknown switch `%c'", *p->opt);
} }
static int parse_long_opt(struct optparse_t *p, const char *arg, static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
const struct option *options) const struct option *options)
{ {
const char *arg_end = strchr(arg, '='); const char *arg_end = strchr(arg, '=');
@ -247,45 +240,63 @@ void check_typos(const char *arg, const struct option *options)
} }
} }
void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, int flags)
{
memset(ctx, 0, sizeof(*ctx));
ctx->argc = argc - 1;
ctx->argv = argv + 1;
ctx->out = argv;
ctx->flags = flags;
}
int parse_options_end(struct parse_opt_ctx_t *ctx)
{
memmove(ctx->out + ctx->cpidx, ctx->argv, ctx->argc * sizeof(*ctx->out));
ctx->out[ctx->cpidx + ctx->argc] = NULL;
return ctx->cpidx + ctx->argc;
}
static NORETURN void usage_with_options_internal(const char * const *, static NORETURN void usage_with_options_internal(const char * const *,
const struct option *, int); const struct option *, int);
int parse_options(int argc, const char **argv, const struct option *options, int parse_options(int argc, const char **argv, const struct option *options,
const char * const usagestr[], int flags) const char * const usagestr[], int flags)
{ {
struct optparse_t args = { argv + 1, argv, argc - 1, 0, NULL }; struct parse_opt_ctx_t ctx;
for (; args.argc; args.argc--, args.argv++) { parse_options_start(&ctx, argc, argv, flags);
const char *arg = args.argv[0]; for (; ctx.argc; ctx.argc--, ctx.argv++) {
const char *arg = ctx.argv[0];
if (*arg != '-' || !arg[1]) { if (*arg != '-' || !arg[1]) {
if (flags & PARSE_OPT_STOP_AT_NON_OPTION) if (ctx.flags & PARSE_OPT_STOP_AT_NON_OPTION)
break; break;
args.out[args.cpidx++] = args.argv[0]; ctx.out[ctx.cpidx++] = ctx.argv[0];
continue; continue;
} }
if (arg[1] != '-') { if (arg[1] != '-') {
args.opt = arg + 1; ctx.opt = arg + 1;
if (*args.opt == 'h') if (*ctx.opt == 'h')
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
if (parse_short_opt(&args, options) < 0) if (parse_short_opt(&ctx, options) < 0)
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
if (args.opt) if (ctx.opt)
check_typos(arg + 1, options); check_typos(arg + 1, options);
while (args.opt) { while (ctx.opt) {
if (*args.opt == 'h') if (*ctx.opt == 'h')
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
if (parse_short_opt(&args, options) < 0) if (parse_short_opt(&ctx, options) < 0)
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
} }
continue; continue;
} }
if (!arg[2]) { /* "--" */ if (!arg[2]) { /* "--" */
if (!(flags & PARSE_OPT_KEEP_DASHDASH)) { if (!(ctx.flags & PARSE_OPT_KEEP_DASHDASH)) {
args.argc--; ctx.argc--;
args.argv++; ctx.argv++;
} }
break; break;
} }
@ -294,13 +305,11 @@ int parse_options(int argc, const char **argv, const struct option *options,
usage_with_options_internal(usagestr, options, 1); usage_with_options_internal(usagestr, options, 1);
if (!strcmp(arg + 2, "help")) if (!strcmp(arg + 2, "help"))
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
if (parse_long_opt(&args, arg + 2, options)) if (parse_long_opt(&ctx, arg + 2, options))
usage_with_options(usagestr, options); usage_with_options(usagestr, options);
} }
memmove(args.out + args.cpidx, args.argv, args.argc * sizeof(*args.out)); return parse_options_end(&ctx);
args.out[args.cpidx + args.argc] = NULL;
return args.cpidx + args.argc;
} }
#define USAGE_OPTS_WIDTH 24 #define USAGE_OPTS_WIDTH 24

16
parse-options.h

@ -111,6 +111,22 @@ extern int parse_options(int argc, const char **argv,
extern NORETURN void usage_with_options(const char * const *usagestr, extern NORETURN void usage_with_options(const char * const *usagestr,
const struct option *options); const struct option *options);
/*----- incremantal advanced APIs -----*/
struct parse_opt_ctx_t {
const char **argv;
const char **out;
int argc, cpidx;
const char *opt;
int flags;
};
extern void parse_options_start(struct parse_opt_ctx_t *ctx,
int argc, const char **argv, int flags);
extern int parse_options_end(struct parse_opt_ctx_t *ctx);
/*----- some often used options -----*/ /*----- some often used options -----*/
extern int parse_opt_abbrev_cb(const struct option *, const char *, int); extern int parse_opt_abbrev_cb(const struct option *, const char *, int);
extern int parse_opt_approxidate_cb(const struct option *, const char *, int); extern int parse_opt_approxidate_cb(const struct option *, const char *, int);