[PATCH] Get correct column with for options in command usage
- From
Jiang Xin <worldhello.net@gmail.com>
- Date
- Feb 5, 2013, 07:40 UTC
- Message-ID
- <0b035132df6de2cac56ac59d66b04f30e90ad760.1360049671.git.worldhello.net@gmail.com>
Command usage would not align well if command options are translated, especially to CJK. Call utf8_strwidth in function usage_argh, so that the caller will get correct column width.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- parse-options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/parse-options.c b/parse-options.c index 67e98..ca0e6 100644 --- a/parse-options.c +++ b/parse-options.c @@ -473,7 +473,7 @@ int parse_options(int argc, const char **argv, const char *prefix, static int usage_argh(const struct option *opts, FILE *outfile) { - const char *s; + const char *s, *p; int literal = (opts->flags & PARSE_OPT_LITERAL_ARGHELP) || !opts->argh; if (opts->flags & PARSE_OPT_OPTARG) if (opts->long_name) @@ -482,7 +482,9 @@ static int usage_argh(const struct option *opts, FILE *outfile) s = literal ? "[%s]" : "[<%s>]"; else s = literal ? " %s" : " <%s>"; - return fprintf(outfile, s, opts->argh ? _(opts->argh) : _("...")); + p = opts->argh ? _(opts->argh) : _("..."); + fprintf(outfile, s, p); + return utf8_strwidth(p) + strlen(s) - 2; } #define USAGE_OPTS_WIDTH 24
-- 1.8.1.1.367.g57acac9.dirty