Update.

	* iconvdata/Makefile (modules): Add ISO-2022-CN.
	Add link rules for this module.
	(distribute): Add iso-2022-cn.c and cns11643l2.h.
	* iconvdata/cns11643l2.h: New file.
	* iconvdata/iso-2022-cn.c: New file.
	* iconvdata/gconv-modules: Add entries for ISO-2022-CN module.

	* iconvdata/cns11643l1.h (cns11643l1_to_ucs4): Make string argument
	unsigned.
	(ucs4_to_cns11643l1): Likewise.
	* iconvdata/euc-tw.c: Correct parameter passed to cns11643l1_to_ucs4.

	* iconvdata/iso-2022-kr.c: Remove unnecessary test from conversion
	loop to UCS4.
	Optimize recognition of escape sequences a bit.

1 files changed, 85 insertions, 0 deletions

diff --git a/iconvdata/cns11643l2.h b/iconvdata/cns11643l2.h
new file mode 100644
index 0000000000..0fea3885ff
--- /dev/null
+++ b/iconvdata/cns11643l2.h
@@ -0,0 +1,85 @@
+/* Access functions for CNS 11643, plane 2 handling.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdint.h>
+#include <gconv.h>
+
+/* Table for CNS 11643, plane 2 to UCS4 conversion.  */
+extern const uint16_t __cns11643l2_to_ucs4_tab[];
+
+
+static inline uint32_t
+cns11643l2_to_ucs4 (const unsigned char **s, size_t avail,
+		    unsigned char offset)
+{
+  unsigned char ch = *(*s);
+  unsigned char ch2;
+  int idx;
+
+  if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) > 0x7d)
+    return __UNKNOWN_10646_CHAR;
+
+  if (avail < 2)
+    return 0;
+
+  ch2 = (*s)[1];
+  if ((ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
+    return __UNKNOWN_10646_CHAR;
+
+  idx = (ch - 0x21 - offset) * 94 + (ch2 - 0x21 - offset);
+  if (idx > 0x1de1)
+    return __UNKNOWN_10646_CHAR;
+
+  (*s) += 2;
+
+  return __cns11643l2_to_ucs4_tab[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
+}
+
+
+/* The table which contains the CNS 11643 level 2 mappings.  */
+extern const char __cns11643_from_ucs4_tab[][3];
+
+
+static inline size_t
+ucs4_to_cns11643l2 (uint32_t wch, unsigned char *s, size_t avail)
+{
+  unsigned int ch = (unsigned int) wch;
+  const char *cp = NULL;
+
+  if (ch >= 0x4e07 && ch <= 0x9fa4)
+    {
+      cp = __cns11643_from_ucs4_tab[ch - 0x4e00];
+      if (cp[0] == '\2')
+	++cp;
+      else
+	cp = NULL;
+    }
+
+  if (cp == NULL)
+    return __UNKNOWN_10646_CHAR;
+
+  if (avail < 2)
+    return 0;
+
+  s[0] = cp[0];
+  s[1] = cp[1];
+
+  return 2;
+}