mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse-options: allow ll_callback with OPTION_CALLBACK

Browse Source 
OPTION_CALLBACK is much simpler/safer to use, but parse_opt_cb does
not allow access to parse_opt_ctx_t, which sometimes is useful
(e.g. to obtain the prefix).

Extending parse_opt_cb to take parse_opt_cb could result in a lot of
changes. Instead let's just allow ll_callback to be used with
OPTION_CALLBACK. The user will have to be careful, not to change
anything in ctx, or return wrong result code. But that's the price for
ll_callback.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2019-01-27 07:35:28 +07:00
committed by Junio C Hamano
parent f41179f16b
commit 3ebbe28989
5 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -114,11 +114,13 @@ static int option_parse_message(const struct option *opt,
static enum parse_opt_result option_read_message(struct parse_opt_ctx_t *ctx, static enum parse_opt_result option_read_message(struct parse_opt_ctx_t *ctx,
const struct option *opt, const struct option *opt,
const char *arg_not_used,
int unset) int unset)
{ {
struct strbuf *buf = opt->value; struct strbuf *buf = opt->value;
const char *arg; const char *arg;
BUG_ON_OPT_ARG(arg_not_used);
if (unset) if (unset)
BUG("-F cannot be negated"); BUG("-F cannot be negated");

20
builtin/update-index.c
View File

@ -848,13 +848,15 @@ static int parse_new_style_cacheinfo(const char *arg,
} }
static enum parse_opt_result cacheinfo_callback( static enum parse_opt_result cacheinfo_callback(
struct parse_opt_ctx_t *ctx, const struct option *opt, int unset) struct parse_opt_ctx_t *ctx, const struct option *opt,
const char *arg, int unset)
{ {
struct object_id oid; struct object_id oid;
unsigned int mode; unsigned int mode;
const char *path; const char *path;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) { if (!parse_new_style_cacheinfo(ctx->argv[1], &mode, &oid, &path)) {
if (add_cacheinfo(mode, &oid, path, 0)) if (add_cacheinfo(mode, &oid, path, 0))
@ -874,11 +876,13 @@ static enum parse_opt_result cacheinfo_callback(
} }
static enum parse_opt_result stdin_cacheinfo_callback( static enum parse_opt_result stdin_cacheinfo_callback(
struct parse_opt_ctx_t *ctx, const struct option *opt, int unset) struct parse_opt_ctx_t *ctx, const struct option *opt,
const char *arg, int unset)
{ {
int *nul_term_line = opt->value; int *nul_term_line = opt->value;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
if (ctx->argc != 1) if (ctx->argc != 1)
return error("option '%s' must be the last argument", opt->long_name); return error("option '%s' must be the last argument", opt->long_name);
@ -888,11 +892,13 @@ static enum parse_opt_result stdin_cacheinfo_callback(
} }
static enum parse_opt_result stdin_callback( static enum parse_opt_result stdin_callback(
struct parse_opt_ctx_t *ctx, const struct option *opt, int unset) struct parse_opt_ctx_t *ctx, const struct option *opt,
const char *arg, int unset)
{ {
int *read_from_stdin = opt->value; int *read_from_stdin = opt->value;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
if (ctx->argc != 1) if (ctx->argc != 1)
return error("option '%s' must be the last argument", opt->long_name); return error("option '%s' must be the last argument", opt->long_name);
@ -901,12 +907,14 @@ static enum parse_opt_result stdin_callback(
} }
static enum parse_opt_result unresolve_callback( static enum parse_opt_result unresolve_callback(
struct parse_opt_ctx_t *ctx, const struct option *opt, int unset) struct parse_opt_ctx_t *ctx, const struct option *opt,
const char *arg, int unset)
{ {
int *has_errors = opt->value; int *has_errors = opt->value;
const char *prefix = startup_info->prefix; const char *prefix = startup_info->prefix;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
/* consume remaining arguments. */ /* consume remaining arguments. */
*has_errors = do_unresolve(ctx->argc, ctx->argv, *has_errors = do_unresolve(ctx->argc, ctx->argv,
@ -920,12 +928,14 @@ static enum parse_opt_result unresolve_callback(
} }
static enum parse_opt_result reupdate_callback( static enum parse_opt_result reupdate_callback(
struct parse_opt_ctx_t *ctx, const struct option *opt, int unset) struct parse_opt_ctx_t *ctx, const struct option *opt,
const char *arg, int unset)
{ {
int *has_errors = opt->value; int *has_errors = opt->value;
const char *prefix = startup_info->prefix; const char *prefix = startup_info->prefix;
BUG_ON_OPT_NEG(unset); BUG_ON_OPT_NEG(unset);
BUG_ON_OPT_ARG(arg);
/* consume remaining arguments. */ /* consume remaining arguments. */
setup_work_tree(); setup_work_tree();

4
parse-options-cb.c
View File

@ -171,8 +171,10 @@ int parse_opt_noop_cb(const struct option *opt, const char *arg, int unset)
* parse_options(). * parse_options().
*/ */
enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, enum parse_opt_result parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx,
const struct option *opt, int unset) const struct option *opt,
const char *arg, int unset)
{ {
BUG_ON_OPT_ARG(arg);
return PARSE_OPT_UNKNOWN; return PARSE_OPT_UNKNOWN;
} }

42
parse-options.c
View File

@ -95,7 +95,7 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
switch (opt->type) { switch (opt->type) {
case OPTION_LOWLEVEL_CALLBACK: case OPTION_LOWLEVEL_CALLBACK:
return opt->ll_callback(p, opt, unset); return opt->ll_callback(p, opt, NULL, unset);
case OPTION_BIT: case OPTION_BIT:
if (unset) if (unset)
@ -161,16 +161,27 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
return err; return err;
case OPTION_CALLBACK: case OPTION_CALLBACK:
if (unset) {
return (*opt->callback)(opt, NULL, 1) ? (-1) : 0; const char *p_arg = NULL;
if (opt->flags & PARSE_OPT_NOARG) int p_unset;
return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
return (*opt->callback)(opt, NULL, 0) ? (-1) : 0;
if (get_arg(p, opt, flags, &arg))
return -1;
return (*opt->callback)(opt, arg, 0) ? (-1) : 0;
if (unset)
p_unset = 1;
else if (opt->flags & PARSE_OPT_NOARG)
p_unset = 0;
else if (opt->flags & PARSE_OPT_OPTARG && !p->opt)
p_unset = 0;
else if (get_arg(p, opt, flags, &arg))
return -1;
else {
p_unset = 0;
p_arg = arg;
}
if (opt->callback)
return (*opt->callback)(opt, p_arg, p_unset) ? (-1) : 0;
else
return (*opt->ll_callback)(p, opt, p_arg, p_unset);
}
case OPTION_INTEGER: case OPTION_INTEGER:
if (unset) { if (unset) {
*(int *)opt->value = 0; *(int *)opt->value = 0;
@ -238,7 +249,10 @@ static enum parse_opt_result parse_short_opt(struct parse_opt_ctx_t *p,
len++; len++;
arg = xmemdupz(p->opt, len); arg = xmemdupz(p->opt, len);
p->opt = p->opt[len] ? p->opt + len : NULL; p->opt = p->opt[len] ? p->opt + len : NULL;
if (numopt->callback)
rc = (*numopt->callback)(numopt, arg, 0) ? (-1) : 0; rc = (*numopt->callback)(numopt, arg, 0) ? (-1) : 0;
else
rc = (*numopt->ll_callback)(p, numopt, arg, 0);
free(arg); free(arg);
return rc; return rc;
} }
@ -414,10 +428,10 @@ static void parse_options_check(const struct option *opts)
err |= optbug(opts, "should not accept an argument"); err |= optbug(opts, "should not accept an argument");
break; break;
case OPTION_CALLBACK: case OPTION_CALLBACK:
if (!opts->callback) if (!opts->callback && !opts->ll_callback)
BUG("OPTION_CALLBACK needs a callback"); BUG("OPTION_CALLBACK needs one callback");
if (opts->ll_callback) if (opts->callback && opts->ll_callback)
BUG("OPTION_CALLBACK needs no ll_callback"); BUG("OPTION_CALLBACK can't have two callbacks");
break; break;
case OPTION_LOWLEVEL_CALLBACK: case OPTION_LOWLEVEL_CALLBACK:
if (!opts->ll_callback) if (!opts->ll_callback)

5
parse-options.h
View File

@ -50,7 +50,8 @@ typedef int parse_opt_cb(const struct option *, const char *arg, int unset);
struct parse_opt_ctx_t; struct parse_opt_ctx_t;
typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx, typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
const struct option *opt, int unset); const struct option *opt,
const char *arg, int unset);
/* /*
* `type`:: * `type`::
@ -267,7 +268,7 @@ int parse_opt_commits(const struct option *, const char *, int);
int parse_opt_tertiary(const struct option *, const char *, int); int parse_opt_tertiary(const struct option *, const char *, int);
int parse_opt_string_list(const struct option *, const char *, int); int parse_opt_string_list(const struct option *, const char *, int);
int parse_opt_noop_cb(const struct option *, const char *, int); int parse_opt_noop_cb(const struct option *, const char *, int);
int parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, const struct option *, int); int parse_opt_unknown_cb(struct parse_opt_ctx_t *ctx, const struct option *, const char *, int);
int parse_opt_passthru(const struct option *, const char *, int); int parse_opt_passthru(const struct option *, const char *, int);
int parse_opt_passthru_argv(const struct option *, const char *, int); int parse_opt_passthru_argv(const struct option *, const char *, int);