Update.

2001-04-06  Ulrich Drepper  <drepper@redhat.com>

	* iconv/iconv_open.c: Move strip and upstr definitions...
	* iconv/gconv_charset.h: ...here.  New file.
	* iconv/gconv_db.c (once): Move to file level.
	(do_lookup_alias): Split out from __gconv_find_transform.
	(__gconv_find_transform): Call do_lookup_alias.
	(__gconv_loopup_alias): New function.
	* locale/langinfo.h: Define _NL_*_CODESET values for all categories
	but LC_CTYPE.
	* locale/categories.def: Add entries for new _NL_*_CODESET values.
	* locale/C-ctype.c: Use _nl_C_codeset to initialize CODESET entry.
	* locale/C-address.c: Initialize _NL_*_CODESET element.
	* locale/C-collate.c: Likewise.
	* locale/C-identification.c: Likewise.
	* locale/C-measurement.c: Likewise.
	* locale/C-messages.c: Likewise.
	* locale/C-monetary.c: Likewise.
	* locale/C-name.c: Likewise.
	* locale/C-numeric.c: Likewise.
	* locale/C-paper.c: Likewise.
	* locale/C-telephone.c: Likewise.
	* locale/C-time.c: Likewise.
	* locale/localeinfo.h: Declare _nl_C_codeset.
	* locale/C_name.c: Define _nl_C_codeset.
	* locale/findlocale.c: Before accepting locale check that the used
	charset does not conflict with what the locale name said.
	* locale/programs/ld-address.c: Emit codeset information.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/ld-identification.c: Likewise.
	* locale/programs/ld-measurement.c: Likewise.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-name.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-telephone.c: Likewise.
	* locale/programs/ld-time.c: Likewise.

	* localedata/tests-mbwc/tst_funcs.h (TST_HEAD_LOCALE): It is an error
	if the locale data couldn't be found.

	* string/Makefile: Define tst-strxfrm-ENV.

	* ysdeps/unix/sysv/linux/ia64/getcontext.S: Fix comment.

1 files changed, 12 insertions, 0 deletions

diff --git a/locale/langinfo.h b/locale/langinfo.h
index c2e312fabf..4ba90d46ba 100644
--- a/locale/langinfo.h
+++ b/locale/langinfo.h
@@ -231,6 +231,8 @@ enum
 #define _DATE_FMT	_DATE_FMT
   _NL_W_DATE_FMT,
 
+  _NL_TIME_CODESET,
+
   _NL_NUM_LC_TIME,	/* Number of indices in LC_TIME category.  */
 
   /* LC_COLLATE category: text sorting.
@@ -254,6 +256,7 @@ enum
   _NL_COLLATE_SYMB_EXTRAMB,
   _NL_COLLATE_COLLSEQMB,
   _NL_COLLATE_COLLSEQWC,
+  _NL_COLLATE_CODESET,
   _NL_NUM_LC_COLLATE,
 
   /* LC_CTYPE category: character classification.
@@ -459,6 +462,7 @@ enum
   _NL_MONETARY_CONVERSION_RATE,
   _NL_MONETARY_DECIMAL_POINT_WC,
   _NL_MONETARY_THOUSANDS_SEP_WC,
+  _NL_MONETARY_CODESET,
   _NL_NUM_LC_MONETARY,
 
   /* LC_NUMERIC category: formatting of numbers.
@@ -481,6 +485,7 @@ enum
 #endif
   _NL_NUMERIC_DECIMAL_POINT_WC,
   _NL_NUMERIC_THOUSANDS_SEP_WC,
+  _NL_NUMERIC_CODESET,
   _NL_NUM_LC_NUMERIC,
 
   __YESEXPR = _NL_ITEM (__LC_MESSAGES, 0), /* Regex matching ``yes'' input.  */
@@ -495,10 +500,12 @@ enum
 #if defined __USE_GNU || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 # define NOSTR			__NOSTR
 #endif
+  _NL_MESSAGES_CODESET,
   _NL_NUM_LC_MESSAGES,
 
   _NL_PAPER_HEIGHT = _NL_ITEM (__LC_PAPER, 0),
   _NL_PAPER_WIDTH,
+  _NL_PAPER_CODESET,
   _NL_NUM_LC_PAPER,
 
   _NL_NAME_NAME_FMT = _NL_ITEM (__LC_NAME, 0),
@@ -507,6 +514,7 @@ enum
   _NL_NAME_NAME_MRS,
   _NL_NAME_NAME_MISS,
   _NL_NAME_NAME_MS,
+  _NL_NAME_CODESET,
   _NL_NUM_LC_NAME,
 
   _NL_ADDRESS_POSTAL_FMT = _NL_ITEM (__LC_ADDRESS, 0),
@@ -521,15 +529,18 @@ enum
   _NL_ADDRESS_LANG_AB,
   _NL_ADDRESS_LANG_TERM,
   _NL_ADDRESS_LANG_LIB,
+  _NL_ADDRESS_CODESET,
   _NL_NUM_LC_ADDRESS,
 
   _NL_TELEPHONE_TEL_INT_FMT = _NL_ITEM (__LC_TELEPHONE, 0),
   _NL_TELEPHONE_TEL_DOM_FMT,
   _NL_TELEPHONE_INT_SELECT,
   _NL_TELEPHONE_INT_PREFIX,
+  _NL_TELEPHONE_CODESET,
   _NL_NUM_LC_TELEPHONE,
 
   _NL_MEASUREMENT_MEASUREMENT = _NL_ITEM (__LC_MEASUREMENT, 0),
+  _NL_MEASUREMENT_CODESET,
   _NL_NUM_LC_MEASUREMENT,
 
   _NL_IDENTIFICATION_TITLE = _NL_ITEM (__LC_IDENTIFICATION, 0),
@@ -547,6 +558,7 @@ enum
   _NL_IDENTIFICATION_REVISION,
   _NL_IDENTIFICATION_DATE,
   _NL_IDENTIFICATION_CATEGORY,
+  _NL_IDENTIFICATION_CODESET,
   _NL_NUM_LC_IDENTIFICATION,
 
   /* This marks the highest value used.  */