mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity
cc6c89faf3
glibc/wcsmbs
History
Joseph Myers be8ff03f92 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).
2018-10-22 14:52:14 +00:00
..
bits Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
btowc.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
c16rtomb.c Handle surrogate pairs in c16rtomb (bug 23794, DR#488, C2X). 2018-10-19 16:31:29 +00:00
c32rtomb.c Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
Depend
isoc99_fwscanf.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
isoc99_swscanf.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
isoc99_vfwscanf.c Mechanically remove _IO_ name aliases for types and constants. 2018-02-21 14:11:05 -05:00
isoc99_vswscanf.c Mechanically remove _IO_ name aliases for types and constants. 2018-02-21 14:11:05 -05:00
isoc99_vwscanf.c Mechanically remove _IO_ name aliases for types and constants. 2018-02-21 14:11:05 -05:00
isoc99_wscanf.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
Makefile Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
mbrlen.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
mbrtoc16.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
mbrtoc32.c Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
mbrtowc.c Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
mbsinit.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
mbsnrtowcs.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
mbsrtowcs_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
mbsrtowcs.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-char-types.c Define char16_t, char32_t consistently with uint_least16_t, uint_least32_t (bug 17979). 2018-02-07 20:33:55 +00:00
test-wcpcpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcpncpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcscat.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcschr.c
test-wcschrnul.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcscmp.c
test-wcscpy.c
test-wcscspn.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcslen.c
test-wcsncat.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcsncmp.c Use correct signedness in wcsncmp 2015-04-13 21:25:04 +02:00
test-wcsncpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcsnlen.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcspbrk.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wcsrchr.c
test-wcsspn.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wmemchr.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
test-wmemcmp.c
test-wmemset.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-btowc.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-c16-surrogate.c Handle surrogate pairs in c16rtomb (bug 23794, DR#488, C2X). 2018-10-19 16:31:29 +00:00
tst-c16c32-1.c Add #include <stdint.h> for uint[32|64]_t usage (except installed headers). 2013-05-16 11:32:54 -05:00
tst-c32-state.c Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
tst-fgetwc-after-eof.c [BZ 1190] Make EOF sticky in stdio. 2018-03-13 08:31:56 -04:00
tst-mbrtowc2.c Prefer https for Sourceware links 2017-11-16 11:49:26 +05:30
tst-mbrtowc.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-mbsrtowcs.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wchar-h.c Update wcsmbs tests to use the support test driver 2017-04-04 18:05:20 -03:00
tst-wcpncpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wcrtomb.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wcsnlen.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wcstod-nan-locale.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wcstod-nan-sign.c Add tests for sign of NaN returned by strtod (bug 23007). 2018-06-15 17:36:21 +00:00
tst-wcstod-round.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
tst-wcstof.c Update wcsmbs tests to use the support test driver 2017-04-04 18:05:20 -03:00
tst-wcstol-locale.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
uchar.h Define char16_t, char32_t consistently with uint_least16_t, uint_least32_t (bug 17979). 2018-02-07 20:33:55 +00:00
Versions Add _Float32 function aliases. 2017-12-07 00:48:31 +00:00
wchar.h Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcpcpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcpncpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcrtomb.c Stop c32rtomb and mbrtoc32 aliasing wcrtomb and mbrtowc (bug 23793). 2018-10-22 14:52:14 +00:00
wcsatcliff.c
wcscasecmp_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscasecmp.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscat.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcschr.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcschrnul.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscmp.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscoll_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscoll.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcscspn.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsdup.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcslen.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsmbs-tst1.c Add dependencies on needed locales in each subdir tests (bug 18969) 2015-10-12 15:18:08 +02:00
wcsmbsload.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsmbsload.h Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsncase_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsncase.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsncat.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsncmp.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsncpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsnlen.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsnrtombs.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcspbrk.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsrchr.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsrtombs.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsspn.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsstr.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstod_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstod_nan.c math: Merge strtod_nan_*.h into math-type-macros-*.h 2018-05-16 06:03:08 +02:00
wcstod.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstof_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstof_nan.c math: Merge strtod_nan_*.h into math-type-macros-*.h 2018-05-16 06:03:08 +02:00
wcstof.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstok.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstol_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstol.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstold_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstold_nan.c math: Merge strtod_nan_*.h into math-type-macros-*.h 2018-05-16 06:03:08 +02:00
wcstold.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoll_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoll.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoul_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoul.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoull_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcstoull.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcswidth.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsxfrm_l.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcsxfrm.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wctob.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcwidth.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wcwidth.h Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmemchr.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmemcmp.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmemcpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmemmove.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmempcpy.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00
wmemset.c Update copyright dates with scripts/update-copyrights. 2018-01-01 00:32:25 +00:00