undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/column-use-utf8-strnwidth'

Browse Source 
Code cleanup.

* rs/column-use-utf8-strnwidth:
  column: use utf8_strnwidth() to strip out ANSI color escapes
This commit is contained in:
Junio C Hamano 2019-10-18 11:40:49 +09:00
commit 3def8ae9a4
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
column.c
View File

@ -23,18 +23,7 @@ struct column_data {
/* return length of 's' in letters, ANSI escapes stripped */ /* return length of 's' in letters, ANSI escapes stripped */
static int item_length(const char *s) static int item_length(const char *s)
{ {
int len, i = 0; return utf8_strnwidth(s, -1, 1);
struct strbuf str = STRBUF_INIT;
strbuf_addstr(&str, s);
while ((s = strstr(str.buf + i, "\033[")) != NULL) {
int len = strspn(s + 2, "0123456789;");
i = s - str.buf;
strbuf_remove(&str, i, len + 3); /* \033[<len><func char> */
}
len = utf8_strwidth(str.buf);
strbuf_release(&str);
return len;
} }
/* /*