Update.

1998-04-13 14:52  Ulrich Drepper  <drepper@cygnus.com>

	* iconvdata/cns11643.c: New file.
	* iconvdata/cns11643.h: New file.
	* iconvdata/cns11643l1.c: New file.
	* iconvdata/cns11643l1.h: New file.
	* iconvdata/euctw.c: New file.
	* iconvdata/Makefile: Add rules for EUC-TW and CNS.
	* iconvdata/gconv-modules: Likewise.

	* iconvdata/eucjp.c: Several bug fixes and improvements.
	* iconvdata/gb2312.h: Likewise.
	* iconvdata/jis0201.h: Likewise.
	* iconvdata/jis0208.h: Likewise.
	* iconvdata/jis0212.h: Likewise.

1 files changed, 348 insertions, 0 deletions

diff --git a/iconvdata/eucjp.c b/iconvdata/eucjp.c
new file mode 100644
index 0000000..caf24e2
--- /dev/null
+++ b/iconvdata/eucjp.c
@@ -0,0 +1,348 @@
+/* Mapping tables for EUC-JP handling.
+   Copyright (C) 1998 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 <gconv.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <jis0201.h>
+#include <jis0208.h>
+#include <jis0212.h>
+
+/* Direction of the transformation.  */
+enum direction
+{
+  illegal,
+  to_eucjp,
+  from_eucjp
+};
+
+struct eucjp_data
+{
+  enum direction dir;
+};
+
+
+int
+gconv_init (struct gconv_step *step)
+{
+  /* Determine which direction.  */
+  struct eucjp_data *new_data;
+  enum direction dir;
+  int result;
+
+  if (strcasestr (step->from_name, "EUC-JP") != NULL)
+    dir = from_eucjp;
+  else if (strcasestr (step->to_name, "EUC-JP") != NULL)
+    dir = to_eucjp;
+  else
+    dir = illegal;
+
+  result = GCONV_NOCONV;
+  if (dir != illegal
+      && ((new_data
+	   = (struct eucjp_data *) malloc (sizeof (struct eucjp_data)))
+	  != NULL))
+    {
+      new_data->dir = dir;
+      step->data = new_data;
+      result = GCONV_OK;
+    }
+
+  return result;
+}
+
+
+void
+gconv_end (struct gconv_step *data)
+{
+  free (data->data);
+}
+
+
+int
+gconv (struct gconv_step *step, struct gconv_step_data *data,
+       const char *inbuf, size_t *inbufsize, size_t *written, int do_flush)
+{
+  struct gconv_step *next_step = step + 1;
+  struct gconv_step_data *next_data = data + 1;
+  gconv_fct fct = next_step->fct;
+  size_t do_write;
+  int result;
+
+  /* If the function is called with no input this means we have to reset
+     to the initial state.  The possibly partly converted input is
+     dropped.  */
+  if (do_flush)
+    {
+      do_write = 0;
+
+      /* Call the steps down the chain if there are any.  */
+      if (data->is_last)
+	result = GCONV_OK;
+      else
+	{
+	  struct gconv_step *next_step = step + 1;
+	  struct gconv_step_data *next_data = data + 1;
+
+	  result = (*fct) (next_step, next_data, NULL, 0, written, 1);
+
+	  /* Clear output buffer.  */
+	  data->outbufavail = 0;
+	}
+    }
+  else
+    {
+      enum direction dir = ((struct eucjp_data *) step->data)->dir;
+
+      do_write = 0;
+
+      do
+	{
+	  result = GCONV_OK;
+
+	  if (dir == from_eucjp)
+	    {
+	      size_t inchars = *inbufsize;
+	      size_t outwchars = data->outbufavail;
+	      char *outbuf = data->outbuf;
+	      size_t cnt = 0;
+
+	      while (cnt < inchars
+		     && (outwchars + sizeof (wchar_t) <= data->outbufsize))
+		{
+		  int inchar = (unsigned char) inbuf[cnt];
+		  wchar_t ch;
+
+		  if (inchar <= 0x7f)
+		    ch = (wchar_t) inchar;
+                  else if ((inchar <= 0xa0 || inchar > 0xfe)
+			   && inchar != 0x8e && inchar != 0x8f)
+                      /* This is illegal.  */
+                      ch = L'\0';
+		  else
+		    {
+		      /* Two or more byte character.  First test whether the
+			 next character is also available.  */
+		      int inchar2;
+
+		      if (cnt + 1 >= inchars)
+			{
+			  /* The second character is not available.  Store
+			     the intermediate result.  */
+			  result = GCONV_INCOMPLETE_INPUT;
+			  break;
+			}
+
+		      inchar2 = (unsigned char) inbuf[++cnt];
+
+		      /* All second bytes of a multibyte character must be
+			 >= 0xa1. */
+		      if (inchar2 < 0xa1)
+			{
+			  /* This is an illegal character.  */
+			  --cnt;
+			  result = GCONV_ILLEGAL_INPUT;
+			  break;
+			}
+
+		      if (inchar == '\x8e')
+			/* This is code set 2: half-width katakana.  */
+			ch = jisx0201_to_ucs4 (inchar2);
+		      else if (inchar == '\x8f')
+			{
+			  /* This is code set 3: JIS X 0212-1990.  */
+			  const char *endp = &inbuf[cnt];
+
+			  ch = jisx0212_to_ucs4 (&endp, 1 + inchars - cnt,
+						 0x80);
+			  cnt = endp - inbuf;
+			}
+		      else
+			{
+			  /* This is code set 1: JIS X 0208.  */
+			  const char *endp = &inbuf[cnt - 1];
+
+			  ch = jisx0208_to_ucs4 (&endp, 2 + inchars - cnt,
+						 0x80);
+			  if (ch != L'\0')
+			    ++cnt;
+			}
+
+		      if (ch == UNKNOWN_10646_CHAR)
+                         ch = L'\0';
+
+		      if (ch == L'\0')
+			--cnt;
+		    }
+
+		  if (ch == L'\0' && inbuf[cnt] != '\0')
+		    {
+		      /* This is an illegal character.  */
+		      result = GCONV_ILLEGAL_INPUT;
+		      break;
+		    }
+
+		  *((wchar_t *) (outbuf + outwchars)) = ch;
+		  ++do_write;
+		  outwchars += sizeof (wchar_t);
+		  ++cnt;
+		}
+	      *inbufsize -= cnt;
+	      data->outbufavail = outwchars;
+	    }
+	  else
+	    {
+	      size_t inwchars = *inbufsize;
+	      size_t outchars = data->outbufavail;
+	      char *outbuf = data->outbuf;
+	      size_t cnt = 0;
+	      int extra = 0;
+
+	      while (inwchars >= cnt + sizeof (wchar_t)
+		     && outchars < data->outbufsize)
+		{
+		  wchar_t ch = *((wchar_t *) (inbuf + cnt));
+
+		  if (ch <= L'\x7f')
+		    /* It's plain ASCII.  */
+		    outbuf[outchars] = ch;
+		  else
+		    {
+		      /* Try the JIS character sets.  */
+		      size_t found;
+
+		      found = ucs4_to_jisx0201 (ch, &outbuf[outchars]);
+
+		      if (found == UNKNOWN_10646_CHAR)
+			{
+			  /* No JIS 0201 character.  */
+			  found = ucs4_to_jisx0208 (ch, &outbuf[outchars],
+						    (data->outbufsize
+						     - outchars));
+			  if (found == 0)
+			    {
+			      /* We ran out of space.  */
+			      extra = 2;
+			      break;
+			    }
+			  else if (found != UNKNOWN_10646_CHAR)
+			    {
+			      /* It's a JIS 0208 character, adjust it for
+				 EUC-JP.  */
+			      outbuf[outchars++] += 0x80;
+			      outbuf[outchars] += 0x80;
+			    }
+			  else
+			    {
+			      /* No JIS 0208 character.  */
+			      found = ucs4_to_jisx0212 (ch, &outbuf[outchars],
+							(data->outbufsize
+							 - outchars));
+
+			      if (found == 0)
+				{
+				  /* We ran out of space.  */
+				  extra = 2;
+				  break;
+				}
+			      else if (found != UNKNOWN_10646_CHAR)
+				{
+				  /* It's a JIS 0212 character, adjust it for
+				     EUC-JP.  */
+				  outbuf[outchars++] += 0x80;
+				  outbuf[outchars] += 0x80;
+				}
+			      else
+				/* Illegal character.  */
+				break;
+			    }
+			}
+		    }
+
+		  ++do_write;
+		  ++outchars;
+		  cnt += sizeof (wchar_t);
+		}
+	      *inbufsize -= cnt;
+	      data->outbufavail = outchars;
+
+	      if (outchars + extra < data->outbufsize)
+		{
+		  /* If there is still room in the output buffer something
+		     is wrong with the input.  */
+		  if (inwchars >= cnt + sizeof (wchar_t))
+		    {
+		      /* An error occurred.  */
+		      result = GCONV_ILLEGAL_INPUT;
+		      break;
+		    }
+		  if (inwchars != cnt)
+		    {
+		      /* There are some unprocessed bytes at the end of the
+			 input buffer.  */
+		      result = GCONV_INCOMPLETE_INPUT;
+		      break;
+		    }
+		}
+	    }
+
+	  if (result != GCONV_OK)
+	    break;
+
+	  if (data->is_last)
+	    {
+	      /* This is the last step.  */
+	      result = (*inbufsize > (dir == from_eucjp
+				      ? 0 : sizeof (wchar_t) - 1)
+			? GCONV_FULL_OUTPUT : GCONV_EMPTY_INPUT);
+	      break;
+	    }
+
+	  /* Status so far.  */
+	  result = GCONV_EMPTY_INPUT;
+
+	  if (data->outbufavail > 0)
+	    {
+	      /* Call the functions below in the chain.  */
+	      size_t newavail = data->outbufavail;
+
+	      result = (*fct) (next_step, next_data, data->outbuf, &newavail,
+			       written, 0);
+
+	      /* Correct the output buffer.  */
+	      if (newavail != data->outbufavail && newavail > 0)
+		{
+		  memmove (data->outbuf,
+			   &data->outbuf[data->outbufavail - newavail],
+			   newavail);
+		  data->outbufavail = newavail;
+		}
+	    }
+	}
+      while (*inbufsize > 0 && result == GCONV_EMPTY_INPUT);
+    }
+
+  if (written != NULL && data->is_last)
+    *written = do_write;
+
+  return result;
+}