AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 23:11:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

gconv: Adjust GBK to support the Euro sign

Browse Source 
Commit aa4d00ca39 only updated the
data used by locales.
This commit is contained in:
Florian Weimer 2016-11-29 18:35:12 +01:00
parent a09411756f
commit 0415d32187
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2016-11-29 Florian Weimer <fweimer@redhat.com>
* iconvdata/gbk.c (BODY): Add Euro sign support (both directions).
2016-11-29 Yury Norov <ynorov@caviumnetworks.com> 2016-11-29 Yury Norov <ynorov@caviumnetworks.com>
Steve Ellcey <sellcey@caviumnetworks.com> Steve Ellcey <sellcey@caviumnetworks.com>

17
iconvdata/gbk.c
View File

@ -13148,8 +13148,17 @@ static const char __gbk_from_ucs4_tab12[][2] =
if (__builtin_expect (ch <= 0x80, 0) \ if (__builtin_expect (ch <= 0x80, 0) \
|| __builtin_expect (ch > 0xfe, 0)) \ || __builtin_expect (ch > 0xfe, 0)) \
{ \ { \
/* This is illegal. */ \ if (__glibc_likely (ch == 0x80)) \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \ { \
/* Exception for the Euro sign (see CP936). */ \
ch = 0x20ac; \
++inptr; \
} \
else \
{ \
/* This is illegal. */ \
STANDARD_FROM_LOOP_ERR_HANDLER (1); \
} \
} \ } \
else \ else \
{ \ { \
@ -13292,6 +13301,10 @@ static const char __gbk_from_ucs4_tab12[][2] =
case 0x2010 ... 0x203b: \ case 0x2010 ... 0x203b: \
cp = __gbk_from_ucs4_tab4[ch - 0x2010]; \ cp = __gbk_from_ucs4_tab4[ch - 0x2010]; \
break; \ break; \
case 0x20ac: \
/* Exception for the Euro sign (see CP396). */ \
cp = "\x80"; \
break; \
case 0x2103 ... 0x22bf: \ case 0x2103 ... 0x22bf: \
cp = __gbk_from_ucs4_tab5[ch - 0x2103]; \ cp = __gbk_from_ucs4_tab5[ch - 0x2103]; \
break; \ break; \