summaryrefslogtreecommitdiff
path: root/libc/misc/wchar/wchar.c
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2008-12-02 17:14:47 +0000
committerCarmelo Amoroso <carmelo.amoroso@st.com>2008-12-02 17:14:47 +0000
commit8596cf884602b7cb682a771a9518b02de2cd27a4 (patch)
treecf3c8dad2136e2e30b94f275446b2059e0b19746 /libc/misc/wchar/wchar.c
parentb0a365f74a0ac43fcbd53738844e577b2d9ec391 (diff)
Fix wcswidth function when LOCALE support is disabled
while keeping WCHAR support enabled. This solves two testcases: tst_wcwidth and tst_wcswidth. Fix dat_iswctype.c fiinput file: character 0x80 is not a control character: it fixes tst_iswctype test. Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono@st.com>
Diffstat (limited to 'libc/misc/wchar/wchar.c')
-rw-r--r--libc/misc/wchar/wchar.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 23638ea8f..a28cd8f94 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1143,6 +1143,13 @@ int wcswidth(const wchar_t *pwcs, size_t n)
{
int count;
wchar_t wc;
+ size_t i;
+
+ for (i = 0 ; (i < n) && pwcs[i] ; i++) {
+ if (pwcs[i] != (pwcs[i] & 0x7f)) {
+ return -1;
+ }
+ }
for (count = 0 ; n && (wc = *pwcs++) ; n--) {
if (wc <= 0xff) {