summaryrefslogtreecommitdiff
path: root/coreutils/expand.c
diff options
context:
space:
mode:
authorDenys Vlasenko2010-01-24 07:44:03 +0100
committerDenys Vlasenko2010-01-24 07:44:03 +0100
commit9f93d621925966c22ee51fdcb5def8e131596f9b (patch)
treec1024fa92d6f422df6cf0991d5c9c8a4977b8625 /coreutils/expand.c
parent5da9f96ad85a2d9119d92c7a3d89deca7d904210 (diff)
downloadbusybox-9f93d621925966c22ee51fdcb5def8e131596f9b.zip
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 'coreutils/expand.c')
-rw-r--r--coreutils/expand.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 649b4c1..2f6a708 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -49,7 +49,7 @@ static void expand(FILE *file, unsigned tab_size, unsigned opt)
unsigned len;
*ptr = '\0';
# if ENABLE_FEATURE_ASSUME_UNICODE
- len = bb_mbstrlen(ptr_strbeg);
+ len = unicode_strlen(ptr_strbeg);
# else
len = ptr - ptr_strbeg;
# endif
@@ -105,7 +105,7 @@ static void unexpand(FILE *file, unsigned tab_size, unsigned opt)
char c;
c = ptr[n];
ptr[n] = '\0';
- len = bb_mbstrlen(ptr);
+ len = unicode_strlen(ptr);
ptr[n] = c;
}
# else