qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Don't use the charset
	name from the locale name.  Only use the value in the LC_CTYPE
	locale data file.
This commit is contained in:
Ulrich Drepper 1999-11-23 06:01:02 +00:00
parent 99296d9dee
commit e46309e103
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
1999-11-22 Ulrich Drepper <drepper@cygnus.com> 1999-11-22 Ulrich Drepper <drepper@cygnus.com>
* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Don't use the charset
name from the locale name. Only use the value in the LC_CTYPE
locale data file.
* locale/loadlocale.c (_nl_load_locale): Allow index of entry in * locale/loadlocale.c (_nl_load_locale): Allow index of entry in
file be equal to file size. file be equal to file size.

6
localedata/ChangeLog
View File

@ -1,3 +1,9 @@
1999-11-22 Ulrich Drepper <drepper@cygnus.com>
* locales/ja_JP [LC_CTYPE] (cntrl): Add PAD.
* repertoiremaps/mnemonic.ja: Add DCS and APC definitions.
1999-11-20 Ulrich Drepper <drepper@cygnus.com> 1999-11-20 Ulrich Drepper <drepper@cygnus.com>
* tst-trans.c: New file. * tst-trans.c: New file.

2
localedata/locales/ja_JP
View File

@ -39,7 +39,7 @@ cntrl <alert>;<backspace>;<tab>;<newline>;<vertical-tab>;/
<form-feed>;<carriage-return>;/ <form-feed>;<carriage-return>;/
<NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;<SI>;/ <NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;<SI>;/
<DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;<ETB>;<CAN>;/ <DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;<ETB>;<CAN>;/
<EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;<IS1>;<DEL>;<DAP>;/ <EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;<IS1>;<DEL>;<DAP>;<PAD>;/
<PBH>;<HOP>;<BPH>;<NBH>;<IND>;<NEL>;<SSA>;<ESA>;<HTS>;<HTJ>;/ <PBH>;<HOP>;<BPH>;<NBH>;<IND>;<NEL>;<SSA>;<ESA>;<HTS>;<HTJ>;/
<VTS>;<PLD>;<PLU>;<RI>;<DCS>;<PU1>;<PU2>;<STS>;<CCH>;<MW>;/ <VTS>;<PLD>;<PLU>;<RI>;<DCS>;<PU1>;<PU2>;<STS>;<CCH>;<MW>;/
<SPA>;<EPA>;<SOS>;<SGCI>;<SCI>;<CSI>;<ST>;<OSC>;<PM>;<APC> <SPA>;<EPA>;<SOS>;<SGCI>;<SCI>;<CSI>;<ST>;<OSC>;<PM>;<APC>

2
localedata/repertoiremaps/mnemonic.ja
View File

@ -233,6 +233,7 @@ escape_char /
<S2> <U008E> SINGLE-SHIFT TWO (SS2) <S2> <U008E> SINGLE-SHIFT TWO (SS2)
<S3> <U008F> SINGLE-SHIFT THREE (SS3) <S3> <U008F> SINGLE-SHIFT THREE (SS3)
<DC> <U0090> DEVICE CONTROL STRING (DCS) <DC> <U0090> DEVICE CONTROL STRING (DCS)
<DCS> <U0090> DEVICE CONTROL STRING (DCS)
<P1> <U0091> PRIVATE USE ONE (PU1) <P1> <U0091> PRIVATE USE ONE (PU1)
<P2> <U0092> PRIVATE USE ONE (PU2) <P2> <U0092> PRIVATE USE ONE (PU2)
<TS> <U0093> SET TRANSMIT STATE (STS) <TS> <U0093> SET TRANSMIT STATE (STS)
@ -248,6 +249,7 @@ escape_char /
<OC> <U009D> OPERATING SYSTEM COMMAND (OSC) <OC> <U009D> OPERATING SYSTEM COMMAND (OSC)
<PM> <U009E> PRIVACY MESSAGE (PM) <PM> <U009E> PRIVACY MESSAGE (PM)
<AC> <U009F> APPLICATION PROGRAM COMMAND (APC) <AC> <U009F> APPLICATION PROGRAM COMMAND (APC)
<APC> <U009F> APPLICATION PROGRAM COMMAND (APC)
<NS> <U00A0> NO-BREAK SPACE <NS> <U00A0> NO-BREAK SPACE
<!I> <U00A1> INVERTED EXCLAMATION MARK <!I> <U00A1> INVERTED EXCLAMATION MARK
<Ct> <U00A2> CENT SIGN <Ct> <U00A2> CENT SIGN

10
wcsmbs/wcsmbsload.c
View File

@ -194,14 +194,8 @@ __wcsmbs_load_conv (const struct locale_data *new_category)
__gconv_close_transform (__wcsmbs_gconv_fcts.tomb, 1); __gconv_close_transform (__wcsmbs_gconv_fcts.tomb, 1);
__gconv_close_transform (__wcsmbs_gconv_fcts.towc, 1); __gconv_close_transform (__wcsmbs_gconv_fcts.towc, 1);
/* Get name of charset of the locale. We first examine /* Get name of charset of the locale. */
whether we have a character set mentioned in the locale charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string;
name. If this isn't the case we use the information from
the locale files. */
charset_name = extract_charset_name (setlocale (LC_CTYPE, NULL));
if (charset_name == NULL)
charset_name =
new_category->values[_NL_ITEM_INDEX(CODESET)].string;
/* Normalize the name and add the slashes necessary for a /* Normalize the name and add the slashes necessary for a
complete lookup. */ complete lookup. */