diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 09:44:03 +0300 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-24 09:44:03 +0300 |
commit | 9f93d621925966c22ee51fdcb5def8e131596f9b (patch) | |
tree | c1024fa92d6f422df6cf0991d5c9c8a4977b8625 /coreutils/df.c | |
parent | 5da9f96ad85a2d9119d92c7a3d89deca7d904210 (diff) |
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 'coreutils/df.c')
-rw-r--r-- | coreutils/df.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/df.c b/coreutils/df.c index bcde78393..ae68f0831 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -178,7 +178,7 @@ int df_main(int argc UNUSED_PARAM, char **argv) #endif #if ENABLE_FEATURE_ASSUME_UNICODE - dev_len = bb_mbstrlen(device); + dev_len = unicode_strlen(device); if (dev_len > 20) { printf("%s\n%20s", device, ""); } else { |