Update.

2000-07-25  Bruno Haible  <haible@clisp.cons.org>

	* wctype/wctype.h (__wctrans_l): New declaration.
	* wctype/wctrans_l.c: New file.
	* wctype/Makefile (routines): Add wctrans_l.

	* rt/tst-aio4.c: New file, slightly modified version of tst-aio2.
	* rt/tst-aio5.c: New file, slightly modified version of tst-aio2.

3 files changed, 67 insertions, 1 deletions

diff --git a/wctype/Makefile b/wctype/Makefile
index fe00e58d2a..0343ec8a3e 100644
--- a/wctype/Makefile
+++ b/wctype/Makefile
@@ -24,7 +24,8 @@ subdir	:= wctype
 headers		:= wctype.h
 distribute	:= cname-lookup.h
 routines	:= wcfuncs wctype iswctype wctrans towctrans wcextra \
-		   wcfuncs_l iswctype_l towctrans_l wctype_l wcextra_l
+		   wcfuncs_l wctype_l iswctype_l wctrans_l towctrans_l \
+		   wcextra_l
 
 tests	:= test_wctype test_wcfuncs
 
diff --git a/wctype/wctrans_l.c b/wctype/wctrans_l.c
new file mode 100644
index 0000000000..acd22ea556
--- /dev/null
+++ b/wctype/wctrans_l.c
@@ -0,0 +1,60 @@
+/* Copyright (C) 1996, 1997, 1999, 2000 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <string.h>
+#include <wctype.h>
+#include "../locale/localeinfo.h"
+
+wctrans_t
+__wctrans_l (const char *property, __locale_t locale)
+{
+  const char *names;
+  size_t cnt;
+
+  names = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_NAMES)].string;
+  cnt = 0;
+  while (names[0] != '\0')
+    {
+      if (strcmp (property, names) == 0)
+	break;
+
+      names = strchr (names, '\0') + 1;
+      ++cnt;
+    }
+
+  if (names[0] == '\0')
+    return 0;
+
+  if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word == 0)
+    {
+      /* Old locale format.  */
+      if (cnt == 0)
+	return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER32)].string;
+      else if (cnt == 1)
+	return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER32)].string;
+
+      /* We have to search the table.  */
+      return (wctrans_t) (const int32_t *) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_NUM_LC_CTYPE + cnt - 2)].string;
+    }
+  else
+    {
+      /* New locale format.  */
+      size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + cnt;
+      return (wctrans_t) locale->__locales[LC_CTYPE]->values[i].string;
+    }
+}
diff --git a/wctype/wctype.h b/wctype/wctype.h
index ef986c257c..afed31e963 100644
--- a/wctype/wctype.h
+++ b/wctype/wctype.h
@@ -378,6 +378,11 @@ extern wint_t __towlower_l (wint_t __wc, __locale_t __locale) __THROW;
 /* Converts an lowercase letter to the corresponding uppercase letter.  */
 extern wint_t __towupper_l (wint_t __wc, __locale_t __locale) __THROW;
 
+/* Construct value that describes a mapping between wide characters
+   identified by the string argument PROPERTY.  */
+extern wctrans_t __wctrans_l (__const char *__property, __locale_t __locale)
+     __THROW;
+
 /* Map the wide character WC using the mapping described by DESC.  */
 extern wint_t __towctrans_l (wint_t __wc, wctrans_t __desc,
 			     __locale_t __locale) __THROW;