Update.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* string/strxfrm.c (strxfrm, wcsxfrm): Include <sys/param.h>.
	If nrules == 0 and srclen < n, copy only srclen + 1 characters.

	* sysdeps/generic/getdomain.c (getdomainname): Include <sys/param.h>.
	If the result is fits in the buffer, copy only as many bytes as needed.

	* sysdeps/generic/_strerror.c (__strerror_r): Don't zero-fill the
	buffer after copying numbuf into it.
	* sysdeps/mach/_strerror.c (__strerror_r): Likewise.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* posix/confstr.c (confstr): When string_len > len, NUL-terminate
	the result.  When string_len < len, don't clear the rest of the buffer.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	Support for new LC_COLLATE format.
	* locale/coll-lookup.h: New file.
	* locale/weightwc.h (findidx): When size == 0, call
	collidx_table_lookup.
	* wcsmbs/wcscoll.c: Include coll-lookup.h.
	* wcsmbs/wcsxfrm.c: Likewise.
	* posix/fnmatch.c: Likewise.
	* posix/fnmatch_loop.c (internal_fnwmatch): When size == 0, call
	collseq_table_lookup.
	* locale/programs/3level.h: New file.
	* locale/programs/ld-ctype.c: (wcwidth_table, wctrans_table): Define
	by including "3level.h".
	* locale/programs/ld-collate.c (wchead_table, collidx_table,
	collseq_table): New types, defined by including "3level.h".
	(locale_collate_t): New wcheads_3level, wcseqorder_3level fields.
	(encoding_mask, encoding_byte): Remove.
	(utf8_encode): Use simple shifts instead.
	(collate_finish): When !oldstyle_tables, set plane_size and plane_cnt
	to 0, and initialize and fill wcheads_3level and wcseqorder_3level.
	(collate_output): New local variable tablewc_3level. When
	!oldstyle_tables, set table_size to 0 and names to NULL and fill
	tablewc_3level instead of tablewc. Change format of TABLEWC and
	COLLSEQWC entries written to the file.
	* locale/C-collate.c (collseqwc): Change format.
	(_nl_C_LC_COLLATE): Set HASH_SIZE and HASH_LAYERS to 0, change format
	of COLLSEQWC.
	* locale/Makefile (distribute): Add coll-lookup.h, programs/3level.h.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* locale/programs/ld-ctype.c (MAX_CHARNAMES_IDX): New macro.
	(locale_ctype_t): New charnames_idx field.
	(ctype_startup): Initialize charnames_idx field.
	(find_idx): Speed up dramatically by using charnames_idx inverse table.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* locale/C-ctype.c: Switch to new locale format.
	(_nl_C_LC_CTYPE_names): Remove array.
	(STRUCT_CTYPE_CLASS): New macro.
	(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
	graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
	New three-level tables.
	(_nl_C_LC_CTYPE_width): Change from array to three-level table.
	(_nl_C_LC_CTYPE): Fix nstrings value. Set HASH_SIZE and HASH_LAYERS
	to 0. Change WIDTH format. Set CLASS_OFFSET and MAP_OFFSET. Add
	12 class tables and 2 map tables at the end.
	* ctype/ctype-info.c (_nl_C_LC_CTYPE_names): Remove declaration.
	(_nl_C_LC_CTYPE_class_{upper,lower,alpha,digit,xdigit,space,print,
	graph,blank,cntrl,punct,alnum}, _nl_C_LC_CTYPE_map_{toupper,tolower}):
	New declarations.
	(b): Remove trailing semicolon.
	(__ctype_names, __ctype_width): Don't initialize.
	(__ctype32_wctype, __ctype32_wctrans, __ctype32_width): Initialize.

2000-08-27  Bruno Haible  <haible@clisp.cons.org>

	* elf/dl-load.c (open_path): Add a argument telling whether *dirsp
	is guaranteed to be allocated with the same malloc() and may be
	passed to free().
	(_dl_map_object): Update open_path calls. If rtld_search_dirs has
	been set to empty by an earlier open_path call, don't pass it again.

1 files changed, 298 insertions, 59 deletions

diff --git a/locale/C-ctype.c b/locale/C-ctype.c
index 23420c1bc5..4f8e204a5d 100644
--- a/locale/C-ctype.c
+++ b/locale/C-ctype.c
@@ -286,59 +286,248 @@ const uint32_t _nl_C_LC_CTYPE_tolower[384] =
   /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
   /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
 };
-const uint32_t _nl_C_LC_CTYPE_names[256] =
+
+#define STRUCT_CTYPE_CLASS(p, q) \
+  struct                                                                      \
+    {                                                                         \
+      uint32_t isctype_data[8];                                               \
+      uint32_t header[5];                                                     \
+      uint32_t level1[1];                                                     \
+      uint32_t level2[1 << q];                                                \
+      uint32_t level3[1 << p];                                                \
+    }
+
+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_upper =
 {
-  /* 0x00 */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  /* 0x08 */ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  /* 0x10 */ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  /* 0x18 */ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-  /* 0x20 */ 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-  /* 0x28 */ 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-  /* 0x30 */ 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-  /* 0x38 */ 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-  /* 0x40 */ 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-  /* 0x48 */ 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-  /* 0x50 */ 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-  /* 0x58 */ 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
-  /* 0x60 */ 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-  /* 0x68 */ 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-  /* 0x70 */ 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-  /* 0x78 */ 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-  /* 0x80 */ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-  /* 0x88 */ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-  /* 0x90 */ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-  /* 0x98 */ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-  /* 0xa0 */ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-  /* 0xa8 */ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-  /* 0xb0 */ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-  /* 0xb8 */ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-  /* 0xc0 */ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-  /* 0xc8 */ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-  /* 0xd0 */ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-  /* 0xd8 */ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-  /* 0xe0 */ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-  /* 0xe8 */ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-  /* 0xf0 */ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-  /* 0xf8 */ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+  { 0x00000000, 0x00000000, 0x07fffffe, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 6, 1, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 0, 8 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x07fffffe, 0x00000000 }
+};
+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_lower =
+{
+  { 0x00000000, 0x00000000, 0x00000000, 0x07fffffe,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 6, 1, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 0, 8 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0x07fffffe }
+};
+const STRUCT_CTYPE_CLASS(1, 1) _nl_C_LC_CTYPE_class_alpha =
+{
+  { 0x00000000, 0x00000000, 0x07fffffe, 0x07fffffe,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 6, 1, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 0, 8 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x07fffffe, 0x07fffffe }
+};
+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_digit =
+{
+  { 0x00000000, 0x03ff0000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 6, 1, 6, 0, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0x03ff0000 }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_xdigit =
+{
+  { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0x03ff0000, 0x0000007e, 0x0000007e }
+};
+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_space =
+{
+  { 0x00003e00, 0x00000001, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 6, 1, 6, 0, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00003e00, 0x00000001 }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_print =
+{
+  { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0xffffffff, 0xffffffff, 0x7fffffff }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_graph =
+{
+  { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0xfffffffe, 0xffffffff, 0x7fffffff }
+};
+const STRUCT_CTYPE_CLASS(1, 0) _nl_C_LC_CTYPE_class_blank =
+{
+  { 0x00000200, 0x00000001, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 6, 1, 6, 0, 1 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000200, 0x00000001 }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_cntrl =
+{
+  { 0xffffffff, 0x00000000, 0x00000000, 0x80000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0xffffffff, 0x00000000, 0x00000000, 0x80000000 }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_punct =
+{
+  { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0xfc00fffe, 0xf8000001, 0x78000001 }
+};
+const STRUCT_CTYPE_CLASS(2, 0) _nl_C_LC_CTYPE_class_alnum =
+{
+  { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  },
+  { 7, 1, 7, 0, 3 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 0x00000000, 0x03ff0000, 0x07fffffe, 0x07fffffe }
 };
-const char _nl_C_LC_CTYPE_width[256] =
-  /* 0x00 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x10 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x20 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x30 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x40 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x50 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x60 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x70 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x80 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0x90 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xa0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xb0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xc0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xd0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xe0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-  /* 0xf0 */ "\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001\001"
-;
+
+const struct
+{
+  uint32_t header[5];
+  uint32_t level1[1];
+  uint32_t level2[4];
+  int32_t level3[32];
+}
+_nl_C_LC_CTYPE_map_toupper =
+{
+  { 7, 1, 5, 3, 31 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 0, 0, 0, 10 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  {
+    0x00000000, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0xffffffe0,
+    0xffffffe0, 0xffffffe0, 0xffffffe0, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  }
+},
+_nl_C_LC_CTYPE_map_tolower =
+{
+  { 7, 1, 5, 3, 31 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 0, 0, 10 * sizeof (uint32_t), 0 },
+  /* 3rd-level table */
+  {
+    0x00000000, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000020,
+    0x00000020, 0x00000020, 0x00000020, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000
+  }
+};
+
+const struct
+{
+  uint32_t header[5];
+  uint32_t level1[1];
+  uint32_t level2[1];
+  uint8_t level3[1];
+}
+_nl_C_LC_CTYPE_width =
+{
+  { 7, 1, 0, 0, 0 },
+  /* 1st-level table */
+  { 6 * sizeof (uint32_t) },
+  /* 2nd-level table */
+  { 7 * sizeof (uint32_t) },
+  /* 3rd-level table */
+  { 1 }
+};
+
+/* Number of fields with fixed meanings, starting at 0.  */
+#define NR_FIXED 70
+/* Number of class fields, starting at CLASS_OFFSET.  */
+#define NR_CLASSES 12
+/* Number of map fields, starting at MAP_OFFSET.  */
+#define NR_MAPS 2
+
+/* Compile time verification of
+   NR_FIXED == _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1). */
+typedef int assertion1[1 - 2 * (NR_FIXED != _NL_ITEM_INDEX (_NL_CTYPE_EXTRA_MAP_1))];
 
 const struct locale_data _nl_C_LC_CTYPE =
 {
@@ -347,18 +536,29 @@ const struct locale_data _nl_C_LC_CTYPE =
   UNDELETABLE,
   1,		/* Enable transliteration by default.  */
   NULL,
-  66,
+  NR_FIXED + NR_CLASSES + NR_MAPS,
   {
+    /* _NL_CTYPE_CLASS */
     { string: _nl_C_LC_CTYPE_class },
+    /* _NL_CTYPE_TOUPPER */
     { string: (const char *) _nl_C_LC_CTYPE_toupper },
+    /* _NL_CTYPE_GAP1 */
     { string: NULL },
+    /* _NL_CTYPE_TOLOWER */
     { string: (const char *) _nl_C_LC_CTYPE_tolower },
+    /* _NL_CTYPE_GAP2 */
     { string: NULL },
+    /* _NL_CTYPE_CLASS32 */
     { string: _nl_C_LC_CTYPE_class32 },
-    { string: (const char *) _nl_C_LC_CTYPE_names },
+    /* _NL_CTYPE_NAMES */
     { string: NULL },
-    { word: 256 },
-    { word: 1 },
+    /* _NL_CTYPE_GAP3 */
+    { string: NULL },
+    /* _NL_CTYPE_HASH_SIZE */
+    { word: 0 },
+    /* _NL_CTYPE_HASH_LAYERS */
+    { word: 0 },
+    /* _NL_CTYPE_CLASS_NAMES */
     { string: "upper\0" "lower\0" "alpha\0" "digit\0" "xdigit\0" "space\0"
 	      "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0"  "alnum\0"
 #ifdef PREDEFINED_CLASSES
@@ -370,19 +570,29 @@ const struct locale_data _nl_C_LC_CTYPE =
 	      "vowel_connect\0"
 #endif
     },
+    /* _NL_CTYPE_MAP_NAMES */
     { string: "toupper\0" "tolower\0"
 #ifdef PREDEFINED_CLASSES
       "tosymmetric\0"
 #endif
     },
-    { string: _nl_C_LC_CTYPE_width },
+    /* _NL_CTYPE_WIDTH */
+    { string: (const char *) _nl_C_LC_CTYPE_width.header },
+    /* _NL_CTYPE_MB_CUR_MAX */
     { word: 1 },
+    /* _NL_CTYPE_CODESET_NAME */
     { string: "ANSI_X3.4-1968" },
+    /* _NL_CTYPE_TOUPPER32 */
     { string: (const char *) &_nl_C_LC_CTYPE_toupper[128] },
+    /* _NL_CTYPE_TOLOWER32 */
     { string: (const char *) &_nl_C_LC_CTYPE_tolower[128] },
-    { word: 0 },
-    { word: 0 },
+    /* _NL_CTYPE_CLASS_OFFSET */
+    { word: NR_FIXED },
+    /* _NL_CTYPE_MAP_OFFSET */
+    { word: NR_FIXED + NR_CLASSES },
+    /* _NL_CTYPE_INDIGITS_MB_LEN */
     { word: 1 },
+    /* _NL_CTYPE_INDIGITS0_MB .. _NL_CTYPE_INDIGITS9_MB */
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -393,7 +603,9 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
+    /* _NL_CTYPE_INDIGITS_WC_LEN */
     { word: 1 },
+    /* _NL_CTYPE_INDIGITS0_WC .. _NL_CTYPE_INDIGITS9_WC */
     { wstr: (uint32_t *) L"0" },
     { wstr: (uint32_t *) L"1" },
     { wstr: (uint32_t *) L"2" },
@@ -404,6 +616,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { wstr: (uint32_t *) L"7" },
     { wstr: (uint32_t *) L"8" },
     { wstr: (uint32_t *) L"9" },
+    /* _NL_CTYPE_OUTDIGIT0_MB .. _NL_CTYPE_OUTDIGIT9_MB */
     { string: "0" },
     { string: "1" },
     { string: "2" },
@@ -414,6 +627,7 @@ const struct locale_data _nl_C_LC_CTYPE =
     { string: "7" },
     { string: "8" },
     { string: "9" },
+    /* _NL_CTYPE_OUTDIGIT0_WC .. _NL_CTYPE_OUTDIGIT9_WC */
     { word: L'0' },
     { word: L'1' },
     { word: L'2' },
@@ -424,14 +638,39 @@ const struct locale_data _nl_C_LC_CTYPE =
     { word: L'7' },
     { word: L'8' },
     { word: L'9' },
+    /* _NL_CTYPE_TRANSLIT_TAB_SIZE */
     { word: NTRANSLIT },
+    /* _NL_CTYPE_TRANSLIT_FROM_IDX */
     { wstr: translit_from_idx },
+    /* _NL_CTYPE_TRANSLIT_FROM_TBL */
     { wstr: (uint32_t *) translit_from_tbl },
+    /* _NL_CTYPE_TRANSLIT_TO_IDX */
     { wstr: translit_to_idx },
+    /* _NL_CTYPE_TRANSLIT_TO_TBL */
     { wstr: (uint32_t *) translit_to_tbl },
+    /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING_LEN */
     { word: 1 },
+    /* _NL_CTYPE_TRANSLIT_DEFAULT_MISSING */
     { wstr: (uint32_t *) L"?" },
+    /* _NL_CTYPE_TRANSLIT_IGNORE_LEN */
     { word: 0 },
-    { wstr: NULL }
+    /* _NL_CTYPE_TRANSLIT_IGNORE */
+    { wstr: NULL },
+    /* NR_CLASSES wctype_tables */
+    { string: (const char *) _nl_C_LC_CTYPE_class_upper.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_lower.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_alpha.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_digit.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_xdigit.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_space.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_print.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_graph.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_blank.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_cntrl.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_punct.header },
+    { string: (const char *) _nl_C_LC_CTYPE_class_alnum.header },
+    /* NR_MAPS wctrans_tables */
+    { string: (const char *) _nl_C_LC_CTYPE_map_toupper.header },
+    { string: (const char *) _nl_C_LC_CTYPE_map_tolower.header }
   }
 };