Libc-763.11.tar.gz

[apple/libc.git] / locale / utf8-fbsd.c

diff --git a/locale/utf8-fbsd.c b/locale/utf8-fbsd.c
index cd5d052059ff447c451e5103923dcc89e00c769d..97515df8654a35ce7e55b6160fc9afcdfdefe270 100644 (file)
--- a/locale/utf8-fbsd.c
+++ b/locale/utf8-fbsd.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.11 2004/07/27 06:29:48 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.16 2007/10/15 09:51:30 ache Exp $");
 
 #include "xlocale_private.h"
 
@@ -39,14 +39,16 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.11 2004/07/27 06:29:48 tjr Ex
 
 #define UTF8_MB_CUR_MAX                6
 
-static size_t  _UTF8_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-           mbstate_t * __restrict, locale_t);
+static size_t  _UTF8_mbrtowc(wchar_t * __restrict, const char * __restrict,
+                   size_t, mbstate_t * __restrict, locale_t);
 static int     _UTF8_mbsinit(const mbstate_t *, locale_t);
-static size_t  _UTF8_mbsnrtowcs(wchar_t * __restrict, const char ** __restrict,
-           size_t, size_t, mbstate_t * __restrict, locale_t);
-static size_t  _UTF8_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
+static size_t  _UTF8_mbsnrtowcs(wchar_t * __restrict,
+                   const char ** __restrict, size_t, size_t,
+                   mbstate_t * __restrict, locale_t);
+static size_t  _UTF8_wcrtomb(char * __restrict, wchar_t,
+                   mbstate_t * __restrict, locale_t);
 static size_t  _UTF8_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-           size_t, size_t, mbstate_t * __restrict, locale_t);
+                   size_t, size_t, mbstate_t * __restrict, locale_t);
 
 typedef struct {
        wchar_t ch;
@@ -64,6 +66,12 @@ _UTF8_init(struct __xlocale_st_runelocale *xrl)
        xrl->__mbsnrtowcs = _UTF8_mbsnrtowcs;
        xrl->__wcsnrtombs = _UTF8_wcsnrtombs;
        xrl->__mb_cur_max = UTF8_MB_CUR_MAX;
+       /*
+        * UCS-4 encoding used as the internal representation, so
+        * slots 0x0080-0x00FF are occuped and must be excluded
+        * from the single byte ctype by setting the limit.
+        */
+       xrl->__mb_sb_limit = 128;
 
        return (0);
 }
@@ -141,7 +149,7 @@ _UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
                        mask = 0x03;
                        want = 5;
                        lbound = 0x200000;
-               } else if ((ch & 0xfc) == 0xfc) {
+               } else if ((ch & 0xfe) == 0xfc) {
                        mask = 0x01;
                        want = 6;
                        lbound = 0x4000000;
@@ -391,7 +399,7 @@ _UTF8_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
                        *dst = *s;
                } else if (len > (size_t)UTF8_MB_CUR_MAX) {
                        /* Enough space to translate in-place. */
-                       if ((nb = (int)_UTF8_wcrtomb(dst, *s, ps, loc)) < 0) {
+                       if ((nb = _UTF8_wcrtomb(dst, *s, ps, loc)) == (size_t)-1) {
                                *src = s;
                                return ((size_t)-1);
                        }
@@ -399,7 +407,7 @@ _UTF8_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
                        /*
                         * May not be enough space; use temp. buffer.
                         */
-                       if ((nb = (int)_UTF8_wcrtomb(buf, *s, ps, loc)) < 0) {
+                       if ((nb = _UTF8_wcrtomb(buf, *s, ps, loc)) == (size_t)-1) {
                                *src = s;
                                return ((size_t)-1);
                        }