diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-07-18 22:54:04 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-07-19 23:30:06 (GMT) |
commit | 448abbba63471153df6ba520a5621595557ce3c8 (patch) | |
tree | 49e2f80c40ec5cdf9163d6f6387122fe139676f2 /parse-options.c | |
parent | fb7d80edcae482f4fa5d4be0227dc3054734e5f3 (diff) | |
download | git-448abbba63471153df6ba520a5621595557ce3c8.zip git-448abbba63471153df6ba520a5621595557ce3c8.tar.gz git-448abbba63471153df6ba520a5621595557ce3c8.tar.bz2 |
short help: allow multi-line opthelp
When "-h" triggers the short-help in a command that implements its
option parsing using the parse-options API, the option help text is
shown with a single fprintf() as a long line. When the text is
multi-line, the second and subsequent lines are not left padded,
that breaks the alignment across options.
Borrowing the idea from the advice API where its hint strings are
shown with (localized) "hint:" prefix, let's internally split the
(localized) help text into lines, and showing the first line, pad
the remaining lines to align.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
-rw-r--r-- | parse-options.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index f8a155e..817416d 100644 --- a/parse-options.c +++ b/parse-options.c @@ -1109,6 +1109,7 @@ static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t for (; opts->type != OPTION_END; opts++) { size_t pos; int pad; + const char *cp, *np; if (opts->type == OPTION_SUBCOMMAND) continue; @@ -1157,7 +1158,16 @@ static enum parse_opt_result usage_with_options_internal(struct parse_opt_ctx_t (const char *)opts->value); continue; } - fprintf(outfile, "%*s%s\n", pad + USAGE_GAP, "", _(opts->help)); + + for (cp = _(opts->help); *cp; cp = np) { + np = strchrnul(cp, '\n'); + fprintf(outfile, + "%*s%.*s\n", pad + USAGE_GAP, "", + (int)(np - cp), cp); + if (*np) + np++; + pad = USAGE_OPTS_WIDTH; + } } fputc('\n', outfile); |