summary refs log tree commit diff
path: root/iconv/gconv_builtin.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-21 20:18:34 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-21 20:18:34 +0000
commit8d617a716df0ed5fd9ea1c8e65dd8e59b168573e (patch)
tree9bae23f82c38958c166ca3d65bb308f52ab2d14c /iconv/gconv_builtin.h
parentbc4831b956f96efd9f4185b739b8ce8f3fa4dae6 (diff)
downloadglibc-8d617a716df0ed5fd9ea1c8e65dd8e59b168573e.tar.gz
glibc-8d617a716df0ed5fd9ea1c8e65dd8e59b168573e.tar.xz
glibc-8d617a716df0ed5fd9ea1c8e65dd8e59b168573e.zip
Update.
	* iconv/gconv_builtin.c: Include <endian.h>.
	* iconv/gconv_builtin.h: Add UCS-BE aliases.
	Add UCS-4LE transformation.  Define UNICODEBIG and UNICODELITTLE
	according to current platform.
	* iconv/gconv_int.h: Declare __gconv_transform_ucs2reverse_internal,
	__gconv_transform_internal_ucs2reverse, and
	__gconv_transform_internal_ucs4le.
	* iconv/gconv_simple.c: Implement __gconv_transform_internal_ucs4le,
	__gconv_transform_ucs2reverse_internal and
	__gconv_transform_internal_ucs2reverse.
	* iconvdata/Makefile (modules): Add UNICODE.
	(distribute): Add unicode.c.
	* iconvdata/gconv-modules: Add definitions for UNICODE module.
	* iconvdata/unicode.c: New file.

	* iconvdata/utf-16.c: Rewrite code to emit BOM.  Correct code to
	determine byte order of input and convert accordingly.
Diffstat (limited to 'iconv/gconv_builtin.h')
-rw-r--r--iconv/gconv_builtin.h56
1 files changed, 44 insertions, 12 deletions
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h
index 6e91a8646c..150457b223 100644
--- a/iconv/gconv_builtin.h
+++ b/iconv/gconv_builtin.h
@@ -20,12 +20,14 @@
 
 BUILTIN_ALIAS ("UCS4//", "ISO-10646/UCS4/")
 BUILTIN_ALIAS ("UCS-4//", "ISO-10646/UCS4/")
+BUILTIN_ALIAS ("UCS-4BE//", "ISO-10646/UCS4/")
+BUILTIN_ALIAS ("CSUCS4//", "ISO-10646/UCS4/")
 BUILTIN_ALIAS ("ISO-10646//", "ISO-10646/UCS4/")
 BUILTIN_ALIAS ("10646-1:1993//", "ISO-10646/UCS4/")
 BUILTIN_ALIAS ("10646-1:1993/UCS4/", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("OSF00010104//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("OSF00010105//", "ISO-10646/UCS4/")
-BUILTIN_ALIAS ("OSF00010106//", "ISO-10646/UCS4/")
+BUILTIN_ALIAS ("OSF00010104//", "ISO-10646/UCS4/") /* level 1 */
+BUILTIN_ALIAS ("OSF00010105//", "ISO-10646/UCS4/") /* level 2 */
+BUILTIN_ALIAS ("OSF00010106//", "ISO-10646/UCS4/") /* level 3 */
 
 BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8,
 			"ISO-10646/UCS4/", 1, "=INTERNAL->ucs4",
@@ -37,6 +39,16 @@ BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS4/", 15,
 			4, 4, 4, 4)
 /* Please note that we need only one function for both direction.  */
 
+BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8,
+			"UCS-4LE//", 1, "=INTERNAL->ucs4le",
+			__gconv_transform_internal_ucs4le, NULL, NULL,
+			4, 4, 4, 4)
+BUILTIN_TRANSFORMATION (NULL, "UCS-4LE//", 15,
+			"INTERNAL", 1, "=ucs4le->INTERNAL",
+			__gconv_transform_internal_ucs4le, NULL, NULL,
+			4, 4, 4, 4)
+/* Please note that we need only one function for both direction.  */
+
 BUILTIN_ALIAS ("UTF8//", "ISO-10646/UTF8/")
 BUILTIN_ALIAS ("UTF-8//", "ISO-10646/UTF8/")
 BUILTIN_ALIAS ("ISO-IR-193//", "ISO-10646/UTF8/")
@@ -54,11 +66,9 @@ BUILTIN_TRANSFORMATION ("ISO-10646/UTF-?8/", "ISO-10646/UTF", 13,
 
 BUILTIN_ALIAS ("UCS2//", "ISO-10646/UCS2/")
 BUILTIN_ALIAS ("UCS-2//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("UNICODE//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("UNICODEBIG//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("OSF00010100//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("OSF00010101//", "ISO-10646/UCS2/")
-BUILTIN_ALIAS ("OSF00010102//", "ISO-10646/UCS2/")
+BUILTIN_ALIAS ("OSF00010100//", "ISO-10646/UCS2/") /* level 1 */
+BUILTIN_ALIAS ("OSF00010101//", "ISO-10646/UCS2/") /* level 2 */
+BUILTIN_ALIAS ("OSF00010102//", "ISO-10646/UCS2/") /* level 3 */
 
 BUILTIN_TRANSFORMATION (NULL, "ISO-10646/UCS2/", 15, "INTERNAL",
 			1, "=ucs2->INTERNAL",
@@ -71,12 +81,34 @@ BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "ISO-10646/UCS2/",
 			4, 4, 2, 2)
 
 
+#if BYTE_ORDER == BIG_ENDIAN
+BUILTIN_ALIAS ("UNICODEBIG//", "ISO-10646/UCS2/")
+BUILTIN_ALIAS ("UCS-2BE//", "ISO-10646/UCS2/")
+
+BUILTIN_ALIAS ("UCS-2LE//", "UNICODELITTLE//")
+
 BUILTIN_TRANSFORMATION (NULL, "UNICODELITTLE//", 15, "INTERNAL",
-			1, "=ucs2little->INTERNAL",
-			__gconv_transform_ucs2little_internal, NULL, NULL,
+			1, "=ucs2reverse->INTERNAL",
+			__gconv_transform_ucs2reverse_internal, NULL, NULL,
 			2, 2, 4, 4)
 
 BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "UNICODELITTLE//",
-			1, "=INTERNAL->ucs2little",
-			__gconv_transform_internal_ucs2little, NULL, NULL,
+			1, "=INTERNAL->ucs2reverse",
+			__gconv_transform_internal_ucs2reverse, NULL, NULL,
+			4, 4, 2, 2)
+#else
+BUILTIN_ALIAS ("UNICODELITTLE//", "ISO-10646/UCS2/")
+BUILTIN_ALIAS ("UCS-2LE//", "ISO-10646/UCS2/")
+
+BUILTIN_ALIAS ("UCS-2BE//", "UNICODEBIG//")
+
+BUILTIN_TRANSFORMATION (NULL, "UNICODEBIG//", 15, "INTERNAL",
+			1, "=ucs2reverse->INTERNAL",
+			__gconv_transform_ucs2reverse_internal, NULL, NULL,
+			2, 2, 4, 4)
+
+BUILTIN_TRANSFORMATION (NULL, "INTERNAL", 8, "UNICODEBIG//",
+			1, "=INTERNAL->ucs2reverse",
+			__gconv_transform_internal_ucs2reverse, NULL, NULL,
 			4, 4, 2, 2)
+#endif