Update.

2000-04-09  Ulrich Drepper  <drepper@redhat.com>

	Implement handling of restartable conversion functions according to
	ISO C.
	* iconv/gconv.h (__gconv_fct): Add additional parameter.
	* iconv/gconv_int.h (__BUILTIN_TRANS): Likewise.
	* iconv/gconv.c: Pass additional parameter to conversion function.
	* iconv/gconv_simple.c (internal_ucs4_loop_single): New function.
	(internal_ucs4le_loop_single): New function.
	(__gconv_transform_ascii_internal): Define ONE_DIRECTION.
	(__gconv_transform_internal_ascii): Likewise.
	(__gconv_transform_internal_utf8): Likewise.
	(__gconv_transform_utf8_internal): Likewise.
	(__gconv_transform_ucs2_internal): Likewise.
	(__gconv_transform_internal_ucs2): Likewise.
	(__gconv_transform_ucs2reverse_internal): Likewise.
	(__gconv_transform_internal_ucs2reverse): Likewise.
	(internal_ucs4le_loop_unaligned): Before return
	__GCONV_INCOMPLETE_INPUT check that the remaining bytes really form
	a valid character.  Otherwise return __GCONV_ILLEGAL_INPUT.
	(__gconv_transform_utf8_internal): Define STORE_REST and UNPACK_BYTES.
	* iconv/loop.c: Fit in definition of function to convert one character
	for processing of left-over bytes from the state object.
	* iconv/skeleton.c (gconv): Rename inbuf to inptrp and inbufend to
	inend to match names in loop functions.
	(RESET_INPUT_BUFFER): Change apprpriately.
	(gconv): If needed, call function to process bytes from the state
	object.  Similar at the end: store left over bytes if input is
	incomplete.
	Take extra argument and add new argument to all calls of the
	conversion function.
	* iconvdata/iso-2022-cn.c: Adjust numeric values used to store
	information in the state object to not conflict with length count.
	* iconvdata/iso-2022-jp.c: Likewise.
	* iconvdata/iso-2022-kr.c: Likewise.
	* iconvdata/unicode.c: Adjust for change change in parameters of
	skeleton function.
	* iconvdata/utf-16.c: Likewise.
	* libio/iofwide.c: Add new parameter to all calls of conversion
	function.
	* wcsmbs/btowc.c: Likewise.
	* wcsmbs/mbrtowc.c: Likewise.
	* wcsmbs/mbsnrtowcs.c: Likewise.
	* wcsmbs/mbsrtowcs.c: Likewise.
	* wcsmbs/wcrtomb.c: Likewise.
	* wcsmbs/wcsnrtombs.c: Likewise.
	* wcsmbs/wcsrtombs.c: Likewise.
	* wcsmbs/wctob.c: Likewise.

	* iconvdata/gbgbk.c: Always define MAX_NEEDED_OUTPUT and
	MAX_NEEDED_INPUT.

1 files changed, 27 insertions, 19 deletions

diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c
index 99f45dad7e..105fd4753b 100644
--- a/iconvdata/iso-2022-jp.c
+++ b/iconvdata/iso-2022-jp.c
@@ -89,13 +89,14 @@ struct iso2022jp_data
 enum
 {
   ASCII_set = 0,
-  JISX0208_1978_set,
-  JISX0208_1983_set,
-  JISX0201_Roman_set,
-  JISX0201_Kana_set,
-  GB2312_set,
-  KSC5601_set,
-  JISX0212_set
+  JISX0208_1978_set = 8,
+  JISX0208_1983_set = 16,
+  JISX0201_Roman_set = 24,
+  JISX0201_Kana_set = 32,
+  GB2312_set = 40,
+  KSC5601_set = 48,
+  JISX0212_set = 56,
+  CURRENT_SEL_MASK = 56
 };
 
 /* The second value stored is the designation of the G2 set.  The following
@@ -103,8 +104,9 @@ enum
 enum
 {
   UNSPECIFIED_set = 0,
-  ISO88591_set,
-  ISO88597_set
+  ISO88591_set = 64,
+  ISO88597_set = 128,
+  CURRENT_ASSIGN_MASK = 192
 };
 
 
@@ -188,15 +190,18 @@ gconv_end (struct __gconv_step *data)
    the output state to the initial state.  This has to be done during the
    flushing.  */
 #define EMIT_SHIFT_TO_INIT \
-  if (data->__statep->__count != ASCII_set)				      \
+  if ((data->__statep->__count & ~7) != ASCII_set)			      \
     {									      \
       enum direction dir = ((struct iso2022jp_data *) step->__data)->dir;     \
 									      \
       if (dir == from_iso2022jp)					      \
-	/* It's easy, we don't have to emit anything, we just reset the	      \
-	   state for the input.  Note that this also clears the G2	      \
-	   designation.  */						      \
-	data->__statep->__count = ASCII_set;				      \
+	{								      \
+	  /* It's easy, we don't have to emit anything, we just reset the     \
+	     state for the input.  Note that this also clears the G2	      \
+	     designation.  */						      \
+	  data->__statep->__count &= 7;					      \
+	  data->__statep->__count |= ASCII_set;				      \
+	}								      \
       else								      \
 	{								      \
 	  unsigned char *outbuf = data->__outbuf;			      \
@@ -216,7 +221,8 @@ gconv_end (struct __gconv_step *data)
 	        *written += 3;						      \
 	      data->__outbuf = outbuf;					      \
 	      /* Note that this also clears the G2 designation.  */	      \
-	      data->__statep->__count = ASCII_set;			      \
+	      data->__statep->__count &= ~7;				      \
+	      data->__statep->__count |= ASCII_set;			      \
 	    }								      \
 	}								      \
     }
@@ -440,8 +446,9 @@ gconv_end (struct __gconv_step *data)
     outptr += 4;							      \
   }
 #define EXTRA_LOOP_DECLS	, enum variant var, int *setp
-#define INIT_PARAMS		int set = *setp % 0x100, set2 = *setp / 0x100
-#define UPDATE_PARAMS		*setp = (set2 << 8) + set
+#define INIT_PARAMS		int set = *setp & CURRENT_SEL_MASK;	      \
+				int set2 = *setp & CURRENT_ASSIGN_MASK
+#define UPDATE_PARAMS		*setp = set | set2
 #include <iconv/loop.c>
 
 
@@ -848,8 +855,9 @@ gconv_end (struct __gconv_step *data)
     inptr += 4;								      \
   }
 #define EXTRA_LOOP_DECLS	, enum variant var, int *setp
-#define INIT_PARAMS		int set = *setp % 0x100, set2 = *setp / 0x100
-#define UPDATE_PARAMS		*setp = (set2 << 8) + set
+#define INIT_PARAMS		int set = *setp & CURRENT_SEL_MASK;	      \
+				int set2 = *setp & CURRENT_ASSIGN_MASK
+#define UPDATE_PARAMS		*setp = set | set2
 #include <iconv/loop.c>