diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2018-10-19 16:31:29 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2018-10-19 16:31:29 +0000 |
| commit | d0a74159792477e5922f53fa2aa6d58eb8265a14 (patch) | |
| tree | fcce06511d2a91afa649f629cde15875b6fe6f6a /wcsmbs/Makefile | |
| parent | f997b4be18f7e57d757d39e42f7715db26528aa0 (diff) | |
| download | glibc-d0a74159792477e5922f53fa2aa6d58eb8265a14.zip glibc-d0a74159792477e5922f53fa2aa6d58eb8265a14.tar.gz glibc-d0a74159792477e5922f53fa2aa6d58eb8265a14.tar.bz2 | |
Handle surrogate pairs in c16rtomb (bug 23794, DR#488, C2X).
The c16rtomb implementation has:
// XXX The ISO C 11 spec I have does not say anything about handling
// XXX surrogates in this interface.
The DR#488 resolution, as applied to C2X, requires surrogate pairs to
be handled here (so the first call returns 0 and stores the high
surrogate in the mbstate_t, while the second call combines the
surrogates, produces a multibyte character and returns the number of
bytes written). This patch implements that. (mbrtoc16 already
handled producing surrogates as output.)
Tested for x86_64.
[BZ #23794]
* wcsmbs/c16rtomb.c (c16rtomb): Save first character of surrogate
pair and return 0 in that case, and use saved character to
interpret following character.
* wcsmbs/tst-c16-surrogate.c: New file.
* wcsmbs/Makefile (tests): Add tst-c16-surrogate.c.
[$(run-built-tests) = yes] ($(objpfx)tst-c16-surrogate.out):
Depend on $(gen-locales)
Diffstat (limited to 'wcsmbs/Makefile')
| -rw-r--r-- | wcsmbs/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 2e02b22..a58d36f 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -51,7 +51,8 @@ tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ tst-wcstod-round test-char-types tst-fgetwc-after-eof \ - tst-wcstod-nan-sign $(addprefix test-,$(strop-tests)) + tst-wcstod-nan-sign tst-c16-surrogate \ + $(addprefix test-,$(strop-tests)) include ../Rules @@ -68,6 +69,7 @@ $(objpfx)tst-wcrtomb.out: $(gen-locales) $(objpfx)wcsmbs-tst1.out: $(gen-locales) $(objpfx)tst-wcstol-locale.out: $(gen-locales) $(objpfx)tst-wcstod-nan-locale.out: $(gen-locales) +$(objpfx)tst-c16-surrogate.out: $(gen-locales) endif $(objpfx)tst-wcstod-round: $(libm) |