Skip to content

Commit

Permalink
Merge branch 'jx/utf8-printf-width' into maint
Browse files Browse the repository at this point in the history
* jx/utf8-printf-width:
  Add utf8_fprintf helper that returns correct number of columns
  • Loading branch information
Junio C Hamano committed Feb 25, 2013
2 parents d08d259 + c082196 commit 75288cc
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
5 changes: 3 additions & 2 deletions parse-options.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "cache.h"
#include "commit.h"
#include "color.h"
#include "utf8.h"

static int parse_options_usage(struct parse_opt_ctx_t *ctx,
const char * const *usagestr,
Expand Down Expand Up @@ -491,7 +492,7 @@ 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) : _("..."));
return utf8_fprintf(outfile, s, opts->argh ? _(opts->argh) : _("..."));
}

#define USAGE_OPTS_WIDTH 24
Expand Down Expand Up @@ -550,7 +551,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
if (opts->long_name)
pos += fprintf(outfile, "--%s", opts->long_name);
if (opts->type == OPTION_NUMBER)
pos += fprintf(outfile, "-NUM");
pos += utf8_fprintf(outfile, _("-NUM"));

if ((opts->flags & PARSE_OPT_LITERAL_ARGHELP) ||
!(opts->flags & PARSE_OPT_NOARG))
Expand Down
21 changes: 21 additions & 0 deletions utf8.c
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,27 @@ int same_encoding(const char *src, const char *dst)
return !strcasecmp(src, dst);
}

/*
* Wrapper for fprintf and returns the total number of columns required
* for the printed string, assuming that the string is utf8.
*/
int utf8_fprintf(FILE *stream, const char *format, ...)
{
struct strbuf buf = STRBUF_INIT;
va_list arg;
int columns;

va_start(arg, format);
strbuf_vaddf(&buf, format, arg);
va_end(arg);

columns = fputs(buf.buf, stream);
if (0 <= columns) /* keep the error from the I/O */
columns = utf8_strwidth(buf.buf);
strbuf_release(&buf);
return columns;
}

/*
* Given a buffer and its encoding, return it re-encoded
* with iconv. If the conversion fails, returns NULL.
Expand Down
1 change: 1 addition & 0 deletions utf8.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ int utf8_strwidth(const char *string);
int is_utf8(const char *text);
int is_encoding_utf8(const char *name);
int same_encoding(const char *, const char *);
int utf8_fprintf(FILE *, const char *, ...);

void strbuf_add_wrapped_text(struct strbuf *buf,
const char *text, int indent, int indent2, int width);
Expand Down

0 comments on commit 75288cc

Please sign in to comment.