Libc-1439.100.3.tar.gz

[apple/libc.git] / locale / FreeBSD / tolower.c

diff --git a/locale/FreeBSD/tolower.c b/locale/FreeBSD/tolower.c
index 968cb5a04ed0177fbe54cd3596f0502beaf83d82..298b321263339f00880cb50dd29589bc5a5d0a23 100644 (file)
--- a/locale/FreeBSD/tolower.c
+++ b/locale/FreeBSD/tolower.c
@@ -32,22 +32,34 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.13 2007/01/09 00:28:01 imp Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.13 2007/01/09 00:28:01 imp Exp $");

+  
+#include "xlocale_private.h"

 
 #include <ctype.h>
 #include <stdio.h>
 #include <runetype.h>
 
 __ct_rune_t
 
 #include <ctype.h>
 #include <stdio.h>
 #include <runetype.h>
 
 __ct_rune_t

-___tolower(c)
+___tolower_l(c, loc)

        __ct_rune_t c;
        __ct_rune_t c;

+       locale_t loc;

 {
        size_t lim;
 {
        size_t lim;

-       _RuneRange *rr = &_CurrentRuneLocale->__maplower_ext;
+       _RuneRange *rr;

        _RuneEntry *base, *re;
 
        if (c < 0 || c == EOF)
                return(c);
 
        _RuneEntry *base, *re;
 
        if (c < 0 || c == EOF)
                return(c);
 

+       NORMALIZE_LOCALE(loc);
+       /*
+        * the following is not used by tolower(), but can be used by
+        * tolower_l().  This provides the oppurtunity to optimize tolower()
+        * when compatibility for Panther and lower is no longer needed
+        */
+       if (c < _CACHED_RUNES)
+               return loc->__lc_ctype->_CurrentRuneLocale.__maplower[c];
+       rr = &loc->__lc_ctype->_CurrentRuneLocale.__maplower_ext;

        /* Binary search -- see bsearch.c for explanation. */
        base = rr->__ranges;
        for (lim = rr->__nranges; lim != 0; lim >>= 1) {
        /* Binary search -- see bsearch.c for explanation. */
        base = rr->__ranges;
        for (lim = rr->__nranges; lim != 0; lim >>= 1) {


@@ -62,3 +74,10 @@ ___tolower(c)
 
        return(c);
 }
 
        return(c);
 }

+
+__ct_rune_t
+___tolower(c)
+       __ct_rune_t c;
+{
+       return ___tolower_l(c, __current_locale());
+}