From ce564eb1bd541a87152e3546fb7d7a2b460df7ed Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 5 Sep 2016 11:44:52 +0200 Subject: parse-options: add parse_opt_unknown_cb() Add a new callback function, parse_opt_unknown_cb(), which returns -2 to indicate that the corresponding option is unknown. This can be used to add "-h" documentation for an option that will be handled externally to parse_options(). Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- parse-options-cb.c | 12 ++++++++++++ parse-options.h | 1 + 2 files changed, 13 insertions(+) diff --git a/parse-options-cb.c b/parse-options-cb.c index ba5acf311..9f2f9b3df 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -153,6 +153,18 @@ int parse_opt_noop_cb(const struct option *opt, const char *arg, int unset) return 0; } +/** + * Report that the option is unknown, so that other code can handle + * it. This can be used as a callback together with + * OPTION_LOWLEVEL_CALLBACK to allow an option to be documented in the + * "-h" output even if it's not being handled directly by + * parse_options(). + */ +int parse_opt_unknown_cb(const struct option *opt, const char *arg, int unset) +{ + return -2; +} + /** * Recreates the command-line option in the strbuf. */ diff --git a/parse-options.h b/parse-options.h index ea4af92a5..b2cc6a557 100644 --- a/parse-options.h +++ b/parse-options.h @@ -228,6 +228,7 @@ extern int parse_opt_commits(const struct option *, const char *, int); extern int parse_opt_tertiary(const struct option *, const char *, int); extern int parse_opt_string_list(const struct option *, const char *, int); extern int parse_opt_noop_cb(const struct option *, const char *, int); +extern int parse_opt_unknown_cb(const struct option *, const char *, int); extern int parse_opt_passthru(const struct option *, const char *, int); extern int parse_opt_passthru_argv(const struct option *, const char *, int); -- cgit v1.2.1