From 8a9391e9440028c03345afa9f21459237a529592 Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Fri, 30 Jan 2009 04:41:28 -0500 Subject: [PATCH] utf8: add utf8_strwidth() I'm about to use this pattern more than once, so make it a common function. Signed-off-by: Geoffrey Thomas Signed-off-by: Junio C Hamano --- utf8.c | 19 +++++++++++++++++++ utf8.h | 1 + 2 files changed, 20 insertions(+) diff --git a/utf8.c b/utf8.c index dc3735364f..ddfdc5e2b8 100644 --- a/utf8.c +++ b/utf8.c @@ -246,6 +246,25 @@ int utf8_width(const char **start, size_t *remainder_p) return git_wcwidth(ch); } +/* + * Returns the total number of columns required by a null-terminated + * string, assuming that the string is utf8. Returns strlen() instead + * if the string does not look like a valid utf8 string. + */ +int utf8_strwidth(const char *string) +{ + int width = 0; + const char *orig = string; + + while (1) { + if (!string) + return strlen(orig); + if (!*string) + return width; + width += utf8_width(&string, NULL); + } +} + int is_utf8(const char *text) { while (*text) { diff --git a/utf8.h b/utf8.h index 98cce1b038..2f1b14ff49 100644 --- a/utf8.h +++ b/utf8.h @@ -5,6 +5,7 @@ typedef unsigned int ucs_char_t; /* assuming 32bit int */ ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p); int utf8_width(const char **start, size_t *remainder_p); +int utf8_strwidth(const char *string); int is_utf8(const char *text); int is_encoding_utf8(const char *name);