diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 07:44:03 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 07:44:03 +0100 |
| commit | 9f93d621925966c22ee51fdcb5def8e131596f9b (patch) | |
| tree | c1024fa92d6f422df6cf0991d5c9c8a4977b8625 /libbb/lineedit.c | |
| parent | 5da9f96ad85a2d9119d92c7a3d89deca7d904210 (diff) | |
| download | busybox-9f93d621925966c22ee51fdcb5def8e131596f9b.tar.gz | |
libbb: better unicode width support. Hopefully fixes bug 839.
Also opens up a possibility to make other unicode stuff smaller
and more correct later. but:
function old new delta
static.combining - 516 +516
bb_wcwidth - 328 +328
unicode_cut_nchars - 141 +141
mbstowc_internal - 93 +93
in_table - 78 +78
cal_main 899 961 +62
static.combining0x10000 - 40 +40
unicode_strlen - 31 +31
bb_mbstrlen 31 - -31
bb_mbstowcs 173 102 -71
------------------------------------------------------------------------------
(add/remove: 7/1 grow/shrink: 1/1 up/down: 1289/-102) Total: 1187 bytes
Uses code of Markus Kuhn, which is in public domain:
http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
"Permission to use, copy, modify, and distribute this software
for any purpose and without fee is hereby granted. The author
disclaims all warranties with regard to this software."
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/lineedit.c')
| -rw-r--r-- | libbb/lineedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index b73f1d6da..c50b31d67 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -878,7 +878,7 @@ static void showfiles(void) /* find the longest file name - use that as the column width */ for (row = 0; row < nrows; row++) { - l = bb_mbstrlen(matches[row]); + l = unicode_strlen(matches[row]); if (column_width < l) column_width = l; } @@ -898,7 +898,7 @@ static void showfiles(void) for (nc = 1; nc < ncols && n+nrows < nfiles; n += nrows, nc++) { printf("%s%-*s", matches[n], - (int)(column_width - bb_mbstrlen(matches[n])), "" + (int)(column_width - unicode_strlen(matches[n])), "" ); } puts(matches[n]); |