diff options
| author | Arjun Shankar <arjun@redhat.com> | 2020-09-25 14:47:06 +0200 |
|---|---|---|
| committer | Arjun Shankar <arjun@redhat.com> | 2020-09-25 14:47:06 +0200 |
| commit | 7d4ec75e111291851620c6aa2c4460647b7fd50d (patch) | |
| tree | 1692804299aa1634e52cd2cf021ab4dbce2b01c6 /iconv/iconv_open.c | |
| parent | 06e95b93f0bb5943363ad3dcf0cd0fb9d8613b61 (diff) | |
| download | glibc-7d4ec75e111291851620c6aa2c4460647b7fd50d.zip glibc-7d4ec75e111291851620c6aa2c4460647b7fd50d.tar.gz glibc-7d4ec75e111291851620c6aa2c4460647b7fd50d.tar.bz2 | |
intl: Handle translation output codesets with suffixes [BZ #26383]
Commit 91927b7c7643 (Rewrite iconv option parsing [BZ #19519]) did not
handle cases where the output codeset for translations (via the `gettext'
family of functions) might have a caller specified encoding suffix such as
TRANSLIT or IGNORE. This led to a regression where translations did not
work when the codeset had a suffix.
This commit fixes the above issue by parsing any suffixes passed to
__dcigettext and adds two new test-cases to intl/tst-codeset.c to
verify correct behaviour. The iconv-internal function __gconv_create_spec
and the static iconv-internal function gconv_destroy_spec are now visible
internally within glibc and used in intl/dcigettext.c.
Diffstat (limited to 'iconv/iconv_open.c')
| -rw-r--r-- | iconv/iconv_open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c index dd54bc1..5b30055 100644 --- a/iconv/iconv_open.c +++ b/iconv/iconv_open.c @@ -39,7 +39,7 @@ iconv_open (const char *tocode, const char *fromcode) int res = __gconv_open (&conv_spec, &cd, 0); - gconv_destroy_spec (&conv_spec); + __gconv_destroy_spec (&conv_spec); if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK) { |