Remove pre-ISO C support

[thirdparty/glibc.git] / locale / lc-ctype.c

diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c
index eb108416d27a9a15415e5584d1d53b00d43ae41c..95d35a4947d9754e8f4bfb3779ec40c1821a8d74 100644 (file)
--- a/locale/lc-ctype.c
+++ b/locale/lc-ctype.c
@@ -1,5 +1,6 @@
 /* Define current locale data for LC_CTYPE category.
-   Copyright (C) 1995-1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2002,2003,2005,2008,2012
+       Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,7 +36,10 @@ _nl_postload_ctype (void)
 #define current(type,x,offset) \
   ((const type *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_##x) + offset)
 
-/* These are defined in ctype-info.c.
+  const union locale_data_value *const ctypes
+    = _nl_global_locale.__locales[LC_CTYPE]->values;
+
+/* These thread-local variables are defined in ctype-info.c.
    The declarations here must match those in localeinfo.h.
 
    These point into arrays of 384, so they can be indexed by any `unsigned
@@ -45,13 +49,29 @@ _nl_postload_ctype (void)
    for broken old programs.  The case conversion arrays are of `int's
    rather than `unsigned char's because tolower (EOF) must be EOF, which
    doesn't fit into an `unsigned char'.  But today more important is that
-   the arrays are also used for multi-byte character sets.  */
+   the arrays are also used for multi-byte character sets.
+
+   First we update the special members of _nl_global_locale as newlocale
+   would.  This is necessary for uselocale (LC_GLOBAL_LOCALE) to find these
+   values properly.  */
+
+  _nl_global_locale.__ctype_b = (const unsigned short int *)
+    ctypes[_NL_ITEM_INDEX (_NL_CTYPE_CLASS)].string + 128;
+  _nl_global_locale.__ctype_tolower = (const int *)
+    ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER)].string + 128;
+  _nl_global_locale.__ctype_toupper = (const int *)
+    ctypes[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER)].string + 128;
 
+  /* Next we must set the thread-local caches if and only if this thread is
+     in fact using the global locale.  */
   if (_NL_CURRENT_LOCALE == &_nl_global_locale)
     {
-      __libc_tsd_set (CTYPE_B, (void *) current (uint16_t, CLASS, 128));
-      __libc_tsd_set (CTYPE_TOUPPER, (void *) current (int32_t, TOUPPER, 128));
-      __libc_tsd_set (CTYPE_TOLOWER, (void *) current (int32_t, TOLOWER, 128));
+      __libc_tsd_set (const uint16_t *, CTYPE_B,
+                     (void *) _nl_global_locale.__ctype_b);
+      __libc_tsd_set (const int32_t *, CTYPE_TOUPPER,
+                     (void *) _nl_global_locale.__ctype_toupper);
+      __libc_tsd_set (const int32_t *, CTYPE_TOLOWER,
+                     (void *) _nl_global_locale.__ctype_tolower);
     }
 
 #include <shlib-compat.h>
@@ -59,9 +79,9 @@ _nl_postload_ctype (void)
   /* We must use the exported names to access these so we are sure to
      be accessing the main executable's copy if it has COPY relocs.  */
 
-  extern __const unsigned short int *__ctype_b; /* Characteristics.  */
-  extern __const __int32_t *__ctype_tolower; /* Case conversions.  */
-  extern __const __int32_t *__ctype_toupper; /* Case conversions.  */
+  extern const unsigned short int *__ctype_b; /* Characteristics.  */
+  extern const __int32_t *__ctype_tolower; /* Case conversions.  */
+  extern const __int32_t *__ctype_toupper; /* Case conversions.  */
 
   extern const uint32_t *__ctype32_b;
   extern const uint32_t *__ctype32_toupper;
@@ -83,8 +103,8 @@ compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
 compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
 
   __ctype_b = current (uint16_t, CLASS, 128);
-  __ctype_toupper = current (uint32_t, TOUPPER, 128);
-  __ctype_tolower = current (uint32_t, TOLOWER, 128);
+  __ctype_toupper = current (int32_t, TOUPPER, 128);
+  __ctype_tolower = current (int32_t, TOLOWER, 128);
   __ctype32_b = current (uint32_t, CLASS32, 0);
   __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
   __ctype32_tolower = current (uint32_t, TOLOWER32, 0);