diff options
author | Joseph Myers <joseph@codesourcery.com> | 2018-10-22 14:52:14 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2018-10-22 14:52:14 +0000 |
commit | be8ff03f92df08055ac5f15f1b65b24026a683a5 (patch) | |
tree | ec40bc97f79dc838435cd541cab97f3cc19e38d5 /wcsmbs/wcrtomb.c | |
parent | 2dd8e58cc533ee840d37725b11bc0dc0308a5dc0 (diff) | |
download | glibc-be8ff03f92df08055ac5f15f1b65b24026a683a5.tar.gz glibc-be8ff03f92df08055ac5f15f1b65b24026a683a5.tar.xz glibc-be8ff03f92df08055ac5f15f1b65b24026a683a5.zip |
Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793).
glibc does: /* There should be no difference between the UTF-32 handling required by c32rtomb and the wchar_t handling which has long since been implemented in wcrtomb. */ weak_alias (__wcrtomb, c32rtomb) /* There should be no difference between the UTF-32 handling required by mbrtoc32 and the wchar_t handling which has long since been implemented in mbrtowc. */ weak_alias (__mbrtowc, mbrtoc32) The reasoning in those comments to justify those aliases is incorrect: ISO C requires that, for the case of a NULL mbstate_t* being passed, each function has its *own* internal static mbstate_t. Thus a program must be able to use both wcrtomb and c32rtomb at the same time with each keeping its own separate state, and likewise for mbrtowc and mbrtoc32. This patch duly sets up separarate char32_t function that wrap the wchar_t ones. Note that the included test only covers the mbrtoc32 / mbrtowc pair. While I think the change made is logically correct for c32rtomb / wcrtomb as well, I'm not sure we have a locale with a suitable state-dependent multibyte encoding for testing that part of the change. Tested for x86_64. [BZ #23793] * wcsmbs/c32rtomb.c: New file. * wcsmbs/mbrtoc32.c: Likewise. * wcsmbs/tst-c32-state.c: Likewise. * wcsmbs/mbrtowc.c (mbrtoc32): Do not define as alias. * wcsmbs/wcrtomb.c (c32rtomb): Likewise. * wcsmbs/Makefile (routines): Add mbrtoc32 and c32rtomb. (tests): Add tst-c32-state. [$(run-built-tests) = yes] ($(objpfx)tst-c32-state.out): Depend on $(gen-locales).
Diffstat (limited to 'wcsmbs/wcrtomb.c')
-rw-r--r-- | wcsmbs/wcrtomb.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 23f122599a..b10295e939 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -113,8 +113,3 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) } weak_alias (__wcrtomb, wcrtomb) libc_hidden_weak (wcrtomb) - -/* There should be no difference between the UTF-32 handling required - by c32rtomb and the wchar_t handling which has long since been - implemented in wcrtomb. */ -weak_alias (__wcrtomb, c32rtomb) |