unistr/u8-mbsnlen: Fix return value for incomplete character.

diff --git a/ChangeLog b/ChangeLog
index bc9107f..38dfa1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-10  Bruno Haible  <bruno@clisp.org>
 
+       unistr/u8-mbsnlen: Fix return value for incomplete character.
+       * lib/unistr/u8-mbsnlen.c (u8_mbsnlen): Use u8_mbtoucr instead of
+       u8_mblen.
+       * modules/unistr/u8-mbsnlen (Depends-on): Add unistr/u8-mbtoucr.
+       Remove unistr/u8-mblen.
+       * lib/unistr/u16-mbsnlen.c (u16_mbsnlen): Use u16_mbtoucr instead of
+       u16_mblen.
+       * modules/unistr/u16-mbsnlen (Depends-on): Add unistr/u16-mbtoucr.
+       Remove unistr/u16-mblen.
+
+2010-01-10  Bruno Haible  <bruno@clisp.org>
+
        wchar: Fix compilation error when <wchar.h> is used from coreutils.
        * lib/wchar.in.h: Treat __need_wint_t like __need_mbstate_t.
        Reported by Brian Gough <bjg@gnu.org> and

diff --git a/lib/unistr/u16-mbsnlen.c b/lib/unistr/u16-mbsnlen.c
index 1bc9969..601d81d 100644 (file)
--- a/lib/unistr/u16-mbsnlen.c
+++ b/lib/unistr/u16-mbsnlen.c
@@ -28,12 +28,15 @@ u16_mbsnlen (const uint16_t *s, size_t n)
   characters = 0;
   while (n > 0)
     {
-      int count = u16_mblen (s, n);
+      ucs4_t uc;
+      int count = u16_mbtoucr (&uc, s, n);
+      characters++;
+      if (count == -2)
+        break;
       if (count <= 0)
         count = 1;
       s += count;
       n -= count;
-      characters++;
     }
   return characters;
 }

diff --git a/lib/unistr/u8-mbsnlen.c b/lib/unistr/u8-mbsnlen.c
index 913bbf0..9ddc42e 100644 (file)
--- a/lib/unistr/u8-mbsnlen.c
+++ b/lib/unistr/u8-mbsnlen.c
@@ -28,12 +28,15 @@ u8_mbsnlen (const uint8_t *s, size_t n)
   characters = 0;
   while (n > 0)
     {
-      int count = u8_mblen (s, n);
+      ucs4_t uc;
+      int count = u8_mbtoucr (&uc, s, n);
+      characters++;
+      if (count == -2)
+        break;
       if (count <= 0)
         count = 1;
       s += count;
       n -= count;
-      characters++;
     }
   return characters;
 }

diff --git a/modules/unistr/u16-mbsnlen b/modules/unistr/u16-mbsnlen
index ae5713d..6d8ba47 100644 (file)
--- a/modules/unistr/u16-mbsnlen
+++ b/modules/unistr/u16-mbsnlen
@@ -6,7 +6,7 @@ lib/unistr/u16-mbsnlen.c
 
 Depends-on:
 unistr/base
-unistr/u16-mblen
+unistr/u16-mbtoucr
 
 configure.ac:
 

diff --git a/modules/unistr/u8-mbsnlen b/modules/unistr/u8-mbsnlen
index 4508817..eaa6e1f 100644 (file)
--- a/modules/unistr/u8-mbsnlen
+++ b/modules/unistr/u8-mbsnlen
@@ -6,7 +6,7 @@ lib/unistr/u8-mbsnlen.c
 
 Depends-on:
 unistr/base
-unistr/u8-mblen
+unistr/u8-mbtoucr
 
 configure.ac: