diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-01 17:44:34 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-01 17:44:34 +0000 |
| commit | d2374599d441d86cbf4dab69b69d7563c1fcaaa0 (patch) | |
| tree | 4fdb62c712cf6f071567810400fe1348dc5ecf1b /iconv/gconv_builtin.h | |
| parent | 8fe0fd03e5fb2b5ce401fc313e714af874cf01b5 (diff) | |
| download | glibc-d2374599d441d86cbf4dab69b69d7563c1fcaaa0.tar glibc-d2374599d441d86cbf4dab69b69d7563c1fcaaa0.tar.gz glibc-d2374599d441d86cbf4dab69b69d7563c1fcaaa0.tar.bz2 glibc-d2374599d441d86cbf4dab69b69d7563c1fcaaa0.zip | |
Update.
1998-04-01 17:38 Ulrich Drepper <drepper@cygnus.com>
* iconv/gconv?simple.c: New builtins for UCS en/decoding.
* iconv/gconv_builtin.h: Add definitions for new builtins.
* iconv/gconv.h: Add prototypes for new builtins.
* iconvdata/Makefile (modules): Add ISO646.
Add rules for ISO646 module.
(distribute): Add iso646.c.
* iconvdata/gconv-modules: Add module and alias definition for
ISO646 charsets.
* iconvdata/iso646.c: New file.
Diffstat (limited to 'iconv/gconv_builtin.h')
| -rw-r--r-- | iconv/gconv_builtin.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h index 3990b2cdb3..8e5d692946 100644 --- a/iconv/gconv_builtin.h +++ b/iconv/gconv_builtin.h @@ -21,17 +21,32 @@ BUILTIN_ALIAS ("UTF8//", "ISO-10646/UTF8/") BUILTIN_ALIAS ("UTF-8//", "ISO-10646/UTF8/") -BUILTIN_TRANSFORMATION ("([^/]+)/UCS4/([^/]*)", NULL, 0, - "\\1/UTF8/\\2", 1, "=ucs4->utf8", +BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS4/", 15, + "ISO-10646/UTF8/", 1, "=ucs4->utf8", __gconv_transform_ucs4_utf8, __gconv_transform_init_rstate, __gconv_transform_end_rstate) -BUILTIN_TRANSFORMATION ("([^/]+)/UTF-?8/([^/]*)", NULL, 0, - "\\1/UCS4/\\2", 1, "=utf8->ucs4", +BUILTIN_TRANSFORMATION ("ISO-10646/UTF-?8/", "ISO-10646/UTF", 13, + "ISO-10646/UCS4/", 1, "=utf8->ucs4", __gconv_transform_utf8_ucs4, __gconv_transform_init_rstate, __gconv_transform_end_rstate) +BUILTIN_ALIAS ("UCS2//", "ISO-10646/UCS2/") +BUILTIN_ALIAS ("UCS-2//", "ISO-10646/UCS2/") + +BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS2/", 15, "ISO-10646/UCS4/", + 1, "=ucs2->ucs4", + __gconv_transform_ucs2_ucs4, + __gconv_transform_init_rstate, + __gconv_transform_end_rstate) + +BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS4/", 15, "ISO-10646/UCS2/", + 1, "=ucs4->ucs2", + __gconv_transform_ucs4_ucs2, + __gconv_transform_init_rstate, + __gconv_transform_end_rstate) + BUILTIN_TRANSFORMATION ("(.*)", NULL, 0, "\\1", 1, "=dummy", __gconv_transform_dummy, NULL, NULL) |