Update.

2000-10-31  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/Makefile (modules): Add IBM856, IBM930, IBM933, IBM935,
	IBM937, IBM939, and IBM1046.
	(distribute): Add ibm856.c, ibm930.c, ibm933.c, ibm935.c, ibm937.c,
	ibm939.c, ibm1046.c, ibm856.h, ibm930.h, ibm933.h, ibm935.h, ibm937.h,
	ibm939.h, and ibm1046.h.
	* iconvdata/gconv-modules: Add entries for IBM856, IBM930, IBM933,
	IBM935, IBM937, IBM939, and IBM1046.
	Patches by Masahide Washizawa <washi@yamato.ibm.co.jp>.

1 files changed, 263 insertions, 0 deletions

diff --git a/iconvdata/ibm933.c b/iconvdata/ibm933.c
new file mode 100644
index 0000000000..be7fc0c86b
--- /dev/null
+++ b/iconvdata/ibm933.c
@@ -0,0 +1,263 @@
+/* Conversion from and to IBM933.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Masahide Washizawa <washi@yamato.ibm.co.jp>, 2000.
+
+   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 <dlfcn.h>
+#include <stdint.h>
+#include <wchar.h>
+#include <byteswap.h>
+#include "ibm933.h"
+
+/* The shift sequences for this charset (it does not use ESC).  */
+#define SI 		0x0F  /* Shift In, host code to turn DBCS off.  */
+#define SO 		0x0E  /* Shift Out, host code to turn DBCS on.  */
+
+/* Definitions used in the body of the `gconv' function.  */
+#define CHARSET_NAME	"IBM933//"
+#define FROM_LOOP	from_ibm933
+#define TO_LOOP		to_ibm933
+
+/* Definitions of initialization and destructor function.  */
+#define DEFINE_INIT	1
+#define DEFINE_FINI	1
+
+#define MIN_NEEDED_FROM	1
+#define MIN_NEEDED_TO	4
+
+/* Current codeset type.  */
+enum
+{
+  init = 0,
+  sb,
+  db
+};
+
+/* First, define the conversion function from IBM-933 to UCS4.  */
+#define MIN_NEEDED_INPUT  	MIN_NEEDED_FROM
+#define MIN_NEEDED_OUTPUT 	MIN_NEEDED_TO
+#define INIT_PARAMS 		int curcs = init;
+#define LOOPFCT 		FROM_LOOP
+#define BODY \
+  {									      \
+    uint32_t ch = *inptr;						      \
+    uint32_t res;							      \
+    const struct gap *rp1 = __ibm933sb_to_ucs4_idx;			      \
+    const struct gap *rp2 = __ibm933db_to_ucs4_idx;			      \
+									      \
+    if (__builtin_expect (ch, 0) == SO)					      \
+      {									      \
+	if (__builtin_expect (inptr + 1 >= inend, 0))			      \
+	  {								      \
+	    result = __GCONV_INCOMPLETE_INPUT;				      \
+	    break;							      \
+	  }								      \
+									      \
+	/* Shift OUT, change to DBCS converter.  */			      \
+	if (curcs == db)						      \
+	  {								      \
+	    result = __GCONV_ILLEGAL_INPUT;				      \
+	    break;							      \
+	  }								      \
+	curcs = db;							      \
+	++inptr;							      \
+	ch = *inptr;							      \
+      }									      \
+    else if (__builtin_expect (ch, 0) == SI)				      \
+      {									      \
+	if (__builtin_expect (inptr + 1 >= inend, 0))			      \
+	  {								      \
+	    result = __GCONV_INCOMPLETE_INPUT;				      \
+	    break;							      \
+	  }								      \
+									      \
+	/* Shift IN, change to SBCS converter.  */			      \
+	if (curcs == sb)						      \
+	  {								      \
+	    result = __GCONV_ILLEGAL_INPUT;				      \
+	    break;							      \
+	  }								      \
+	curcs = sb;							      \
+	++inptr;							      \
+	ch = *inptr;							      \
+      }									      \
+									      \
+    if (curcs == sb || curcs == init)					      \
+      {									      \
+	/* Use the IBM933 table for single byte.  */			      \
+	while (ch > rp1->end)						      \
+	  ++rp1;							      \
+									      \
+	if (__builtin_expect (rp1 == NULL, 0)				      \
+	    || __builtin_expect (ch < rp1->start, 0)			      \
+	    || (res = __ibm933sb_to_ucs4[ch + rp1->idx],		      \
+		__builtin_expect (res, L'\1') == L'\0' && ch != '\0'))	      \
+	  {								      \
+	    /* This is an illegal character.  */			      \
+	    if (! ignore_errors_p ())					      \
+	      {								      \
+		result = __GCONV_ILLEGAL_INPUT;				      \
+		break;							      \
+	      }								      \
+	    ++*irreversible;						      \
+	    ++inptr;							      \
+	    continue;							      \
+	  }								      \
+	else								      \
+	  {								      \
+	    put32 (outptr, res);					      \
+	    outptr += 4;						      \
+	    ++inptr;							      \
+	  }								      \
+      }									      \
+    else if (curcs == db)						      \
+      {									      \
+	/* Use the IBM933 table for double byte.  */			      \
+	if (__builtin_expect (inptr + 1 >= inend, 0))			      \
+	  {								      \
+	    /* The second character is not available.  Store the	      \
+	       intermediate result. */					      \
+	    result = __GCONV_INCOMPLETE_INPUT;				      \
+	    break;							      \
+	  }								      \
+									      \
+	ch = (ch * 0x100) + inptr[1];					      \
+	while (ch > rp2->end)						      \
+	  ++rp2;							      \
+									      \
+	if (__builtin_expect (rp2 == NULL, 0)				      \
+	    || __builtin_expect (ch < rp2->start, 0)			      \
+	    || (res = __ibm933db_to_ucs4[ch + rp2->idx],		      \
+		__builtin_expect (res, L'\1') == L'\0' && ch != '\0'))	      \
+	  {								      \
+	    /* This is an illegal character.  */			      \
+	    if (! ignore_errors_p ())					      \
+	      {								      \
+		result = __GCONV_ILLEGAL_INPUT;				      \
+		break;							      \
+	      }								      \
+	    ++*irreversible;						      \
+	    inptr += 2;							      \
+	    continue;							      \
+	  }								      \
+	else								      \
+	  {								      \
+	    put32 (outptr, res);					      \
+	    outptr += 4;						      \
+	    inptr += 2;							      \
+	  }								      \
+      }									      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+/* Next, define the other direction.  */
+#define MIN_NEEDED_INPUT	MIN_NEEDED_TO
+#define MIN_NEEDED_OUTPUT	MIN_NEEDED_FROM
+#define INIT_PARAMS 		int curcs = init;
+#define LOOPFCT			TO_LOOP
+#define BODY \
+  {									      \
+    uint32_t ch = get32 (inptr);					      \
+    const struct gap *rp1 = __ucs4_to_ibm933sb_idx;			      \
+    const struct gap *rp2 = __ucs4_to_ibm933db_idx;			      \
+    const char *cp;							      \
+									      \
+    if (__builtin_expect (ch, 0) >= 0xffff)				      \
+      {									      \
+	rp1 = NULL;							      \
+	rp2 = NULL;							      \
+      }									      \
+    else								      \
+      while (ch > rp1->end)						      \
+	++rp1;								      \
+									      \
+    /* Use the UCS4 table for single byte.  */				      \
+    if (__builtin_expect (rp1 == NULL, 0)				      \
+	|| __builtin_expect (ch < rp1->start, 0)			      \
+	|| (cp = __ucs4_to_ibm933sb[ch + rp1->idx],			      \
+	    __builtin_expect (cp[0], L'\1') == L'\0' && ch != '\0'))	      \
+      {									      \
+	/* Use the UCS4 table for double byte.  */			      \
+	while (ch > rp2->end)						      \
+	  ++rp2;							      \
+									      \
+	if (__builtin_expect (rp2 == NULL, 0)				      \
+	    || __builtin_expect (ch < rp2->start, 0)			      \
+	    || (cp = __ucs4_to_ibm933db[ch + rp2->idx],			      \
+		__builtin_expect (cp[0], L'\1')==L'\0' && ch != '\0'))	      \
+	  {								      \
+	    /* This is an illegal character.  */			      \
+	    if (! ignore_errors_p ())					      \
+	      {								      \
+		result = __GCONV_ILLEGAL_INPUT;				      \
+		break;							      \
+	      }								      \
+	    ++*irreversible;						      \
+	  }								      \
+	else								      \
+	  {								      \
+	    if (curcs == init || curcs == sb)				      \
+	      {								      \
+		if (__builtin_expect (outptr+1 > outend, 0))		      \
+		  {							      \
+		    result = __GCONV_FULL_OUTPUT;			      \
+		    break;						      \
+		  }							      \
+		*outptr++ = SO;						      \
+		curcs = db;						      \
+	      }								      \
+									      \
+	    if (__builtin_expect (outptr + 2 > outend, 0))		      \
+	      {								      \
+		result = __GCONV_FULL_OUTPUT;				      \
+		break;							      \
+	      }								      \
+	    *outptr++ = cp[0];						      \
+	    *outptr++ = cp[1];						      \
+	  }								      \
+      }									      \
+    else								      \
+      {									      \
+	if (curcs == db)						      \
+	  {								      \
+	    if (__builtin_expect (outptr + 1 > outend, 0))		      \
+	      {								      \
+		result = __GCONV_FULL_OUTPUT;				      \
+		break;							      \
+	      }								      \
+	    *outptr++ = SI;						      \
+	  }								      \
+									      \
+	if (__builtin_expect (outptr + 1 > outend, 0))			      \
+	  {								      \
+	    result = __GCONV_FULL_OUTPUT;				      \
+	    break;							      \
+	  }								      \
+	*outptr++ = cp[0];						      \
+	curcs = sb;							      \
+      }									      \
+									      \
+    /* Now that we wrote the output increment the input pointer.  */	      \
+    inptr += 4;								      \
+  }
+#define LOOP_NEED_FLAGS
+#include <iconv/loop.c>
+
+/* Now define the toplevel functions.  */
+#include <iconv/skeleton.c>