diff options
| -rw-r--r-- | parse-options.c | 24 | ||||
| -rw-r--r-- | parse-options.h | 9 |
2 files changed, 26 insertions, 7 deletions
diff --git a/parse-options.c b/parse-options.c index 9964877edf..007b78eb24 100644 --- a/parse-options.c +++ b/parse-options.c @@ -257,8 +257,8 @@ int parse_options_end(struct parse_opt_ctx_t *ctx) return ctx->cpidx + ctx->argc; } -static NORETURN void usage_with_options_internal(const char * const *, - const struct option *, int); +static int usage_with_options_internal(const char * const *, + const struct option *, int, int); int parse_options(int argc, const char **argv, const struct option *options, const char * const usagestr[], int flags) @@ -302,7 +302,7 @@ int parse_options(int argc, const char **argv, const struct option *options, } if (!strcmp(arg + 2, "help-all")) - usage_with_options_internal(usagestr, options, 1); + usage_with_options_internal(usagestr, options, 1, 1); if (!strcmp(arg + 2, "help")) usage_with_options(usagestr, options); if (parse_long_opt(&ctx, arg + 2, options)) @@ -315,8 +315,8 @@ int parse_options(int argc, const char **argv, const struct option *options, #define USAGE_OPTS_WIDTH 24 #define USAGE_GAP 2 -void usage_with_options_internal(const char * const *usagestr, - const struct option *opts, int full) +int usage_with_options_internal(const char * const *usagestr, + const struct option *opts, int full, int do_exit) { fprintf(stderr, "usage: %s\n", *usagestr++); while (*usagestr && **usagestr) @@ -401,15 +401,25 @@ void usage_with_options_internal(const char * const *usagestr, } fputc('\n', stderr); - exit(129); + if (do_exit) + exit(129); + return PARSE_OPT_HELP; } void usage_with_options(const char * const *usagestr, const struct option *opts) { - usage_with_options_internal(usagestr, opts, 0); + usage_with_options_internal(usagestr, opts, 0, 1); + exit(129); /* make gcc happy */ } +int parse_options_usage(const char * const *usagestr, + const struct option *opts) +{ + return usage_with_options_internal(usagestr, opts, 0, 0); +} + + /*----- some often used options -----*/ #include "cache.h" diff --git a/parse-options.h b/parse-options.h index 72027f3c66..f66ca352dc 100644 --- a/parse-options.h +++ b/parse-options.h @@ -113,6 +113,12 @@ extern NORETURN void usage_with_options(const char * const *usagestr, /*----- incremantal advanced APIs -----*/ +enum { + PARSE_OPT_HELP = -1, + PARSE_OPT_DONE, + PARSE_OPT_UNKNOWN, +}; + struct parse_opt_ctx_t { const char **argv; const char **out; @@ -121,6 +127,9 @@ struct parse_opt_ctx_t { int flags; }; +extern int parse_options_usage(const char * const *usagestr, + const struct option *opts); + extern void parse_options_start(struct parse_opt_ctx_t *ctx, int argc, const char **argv, int flags); |