Update.

1998-04-21 18:00  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv.c (__gconv): Remove bogus input buffer size computation.

	* iconv/gconv_open.c (__gconv_open): Initialize outbufend element.

	* iconv/gconv_simple.c (__gconv_transform_internal_ascii): Don't use
	character in comparison with uint32_t.
	(__gconv_transform_internal_utf8): Specify MAX_NEEDED_TO.
	(__gconv_transform_utf8_internal): Specify MAX_NEEDED_FROM.
	Optimize BODY a bit.

	* iconv/loop.c: Require MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT to
	be defined.

	* iconv/skeleton.c: Also reset converted counter in case of an error.
	Call reset function using correct value for output buffer start.

	* iconvdata/Makefile: Re-enable tests.

	* iconvdata/iso8859-1.c: Swap MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT
	value for to-conversion.

	* iconvdata/TESTS: Add new third column.
	* iconvdata/run-iconv-test.sh: Add support for charsets which are
	not ASCII based.
	* iconvdata/testdata/suntzus: New file.

	* elf/dl-minimal.c (__strtol_internal): Increment pointer to string
	while reading.  Correctly used base.  Little optimization.
	(__strtoul_internal): Likewise.

	* elf/rtld.c (dl_main): Test to avoid duplicate call of _dl_init_paths
	was wrong.  Use explicit variable.

1998-04-20 23:49  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* configure.in: Check for awk.
	* config.make.in: Add AWK to be substituted.

	* manual/xtract-typefun.awk: Rewrite to eliminate gawk extensions.
	* manual/users.texi: Fix typo exposed by above rewrite.

	* Makefile: Invoke awk using AWK variable.
	* csu/Makefile: Likewise.
	* elf/Makefile: Likewise.
	* mach/Makefile: Likewise.
	* manual/Makefile: Likewise.
	* sysdeps/gnu/Makefile: Likewise.
	* sysdeps/mach/hurd/Makefile: Likewise.
	* sysdeps/unix/Makefile: Likewise.
	* timezone/Makefile: Likewise.

1998-04-10  Gordon Matzigkeit  <gord@profitpress.com>

	* sysdeps/gnu/errlist.awk (ERR_REMAP): Implement error code to
	array index translation.
	(SYS_ERRLIST_ALIAS, SYS_NERR_ALIAS): Make weak aliases only if
	these are defined.

	* sysdeps/mach/hurd/Dist: Add errlist.c to distribution.

	* sysdeps/mach/hurd/errlist.c: New file.
	(ERR_TRANSLATE): Map Hurd error codes into errlist indices.
	(_hurd_errlist): The Hurd error list doesn't have Unix sys_errlist
	semantics, so rename it.

1998-04-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* iconvdata/run-iconv-test.sh: Make portable.  Always test all
	conversions.

1998-04-21 12:30  H.J. Lu  <hjl@gnu.org>

	* wcsmbs/wcsrtombs.c (__wcsrtombs): Initialize result to 0.
	* wcsmbs/wcsnrtombs.c: Likewise.

1998-04-21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/dl-sysdep.c: Handle _dl_hwcap correctly.

	* wcsmbs/btowc.c (__btowc): Declare inptr as const char *.

	* time/strftime.c (my_strftime): Initialize pad variable in
	declaration.

	* iconvdata/big5.c: Don't use character constants in comparisons
	with unsigned value.

	* sysdeps/generic/setutxent.c: New file.
	* sysdeps/generic/getutxent.c: New file.
	* sysdeps/generic/endutxent.c: New file.
	* sysdeps/generic/getutxid.c: New file.
	* sysdeps/generic/getutxline.c: New file.
	* sysdeps/generic/pututxline.c: New file.
	* sysdeps/generic/utmpxname.c: New file.
	* sysdeps/generic/updwtmpx.c: New file.

5 files changed, 74 insertions, 73 deletions

diff --git a/iconv/gconv.c b/iconv/gconv.c
index aa58bdba7d..24dc21e2c2 100644
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -51,19 +51,9 @@ __gconv (gconv_t cd, const char **inbuf, const char *inbufend, char **outbuf,
 
       do
 	{
-	  /* See whether the input size is reasoable for the output
-	     size.  If not adjust it.  */
-	  size_t inlen = ((inbufend - *inbuf) / cd->steps->max_needed_from
-			  * cd->steps->max_needed_from);
-
-	  if (cd->nsteps > 1)
-	    inlen = MIN (inlen, (((outbufend - cd->data[last_step].outbuf)
-				  / cd->steps[last_step].max_needed_to)
-				 * cd->steps[last_step].max_needed_to));
-
 	  last_start = *inbuf;
-	  result = (*cd->steps->fct) (cd->steps, cd->data, inbuf,
-				      *inbuf + inlen, converted, 0);
+	  result = (*cd->steps->fct) (cd->steps, cd->data, inbuf, inbufend,
+				      converted, 0);
 	}
       while (result == GCONV_EMPTY_INPUT && last_start != *inbuf
 	     && *inbuf + cd->steps->min_needed_from <= inbufend);
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index 831794fc22..d7e0191cca 100644
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -71,14 +71,16 @@ __gconv_open (const char *toset, const char *fromset, gconv_t *handle)
 		  /* Allocate the buffer.  */
 		  if (!data[cnt].is_last)
 		    {
-		      data[cnt].outbuf =
-			(char *) malloc (GCONV_NCHAR_GOAL
-					 * steps[cnt].max_needed_to);
+		      size_t size = (GCONV_NCHAR_GOAL
+				     * steps[cnt].max_needed_to);
+
+		      data[cnt].outbuf = (char *) malloc (size);
 		      if (data[cnt].outbuf == NULL)
 			{
 			  res = GCONV_NOMEM;
 			  break;
 			}
+		      data[cnt].outbufend = data[cnt].outbuf + size;
 		    }
 		}
 	    }
diff --git a/iconv/gconv_simple.c b/iconv/gconv_simple.c
index f2fec12fb8..95b4a66daf 100644
--- a/iconv/gconv_simple.c
+++ b/iconv/gconv_simple.c
@@ -181,7 +181,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 #define LOOPFCT			FROM_LOOP
 #define BODY \
   {									      \
-    if (*((uint32_t *) inptr) > '\x7f')					      \
+    if (*((uint32_t *) inptr) > 0x7f)					      \
       {									      \
 	/* This is no correct ANSI_X3.4-1968 character.  */		      \
 	result = GCONV_ILLEGAL_INPUT;					      \
@@ -208,6 +208,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 
 #define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
 #define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
+#define MAX_NEEDED_OUTPUT	MAX_NEEDED_TO
 #define LOOPFCT			FROM_LOOP
 #define BODY \
   {									      \
@@ -266,6 +267,7 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
 #define FUNCTION_NAME		__gconv_transform_utf8_internal
 
 #define MIN_NEEDED_INPUT	MIN_NEEDED_FROM
+#define MAX_NEEDED_INPUT	MAX_NEEDED_FROM
 #define MIN_NEEDED_OUTPUT	MIN_NEEDED_TO
 #define LOOPFCT			FROM_LOOP
 #define BODY \
@@ -278,69 +280,75 @@ internal_ucs4_loop (const unsigned char **inptrp, const unsigned char *inend,
     ch = *inptr;							      \
 									      \
     if (ch < 0x80)							      \
-      /* One byte sequence.  */						      \
-      cnt = 1;								      \
-    else if ((ch & 0xe0) == 0xc0)					      \
       {									      \
-	cnt = 2;							      \
-	ch &= 0x1f;							      \
-      }									      \
-    else if ((ch & 0xf0) == 0xe0)					      \
-      {									      \
-	/* We expect three bytes.  */					      \
-	cnt = 3;							      \
-	ch &= 0x0f;							      \
-      }									      \
-    else if ((ch & 0xf8) == 0xf0)					      \
-      {									      \
-	/* We expect four bytes.  */					      \
-	cnt = 4;							      \
-	ch &= 0x07;							      \
-      }									      \
-    else if ((ch & 0xfc) == 0xf8)					      \
-      {									      \
-	/* We expect five bytes.  */					      \
-	cnt = 5;							      \
-	ch &= 0x03;							      \
-      }									      \
-    else if ((ch & 0xfe) == 0xfc)					      \
-      {									      \
-	/* We expect six bytes.  */					      \
-	cnt = 6;							      \
-	ch &= 0x01;							      \
+	/* One byte sequence.  */					      \
+	cnt = 1;							      \
+	++inptr;							      \
       }									      \
     else								      \
       {									      \
-	/* This is an illegal encoding.  */				      \
-	result = GCONV_ILLEGAL_INPUT;					      \
-	break;								      \
-      }									      \
-									      \
-    if (NEED_LENGTH_TEST && inptr + cnt >= inend)			      \
-      {									      \
-	/* We don't have enough input.  */				      \
-	result = GCONV_INCOMPLETE_INPUT;				      \
-	break;								      \
-      }									      \
-									      \
-    /* Read the possible remaining bytes.  */				      \
-    for (i = 1; i < cnt; ++i)						      \
-      {									      \
-	uint32_t byte = inptr[i];					      \
-									      \
-	if ((byte & 0xc0) != 0x80)					      \
+	if ((ch & 0xe0) == 0xc0)					      \
+	  {								      \
+	    cnt = 2;							      \
+	    ch &= 0x1f;							      \
+	  }								      \
+        else if ((ch & 0xf0) == 0xe0)					      \
+	  {								      \
+	    /* We expect three bytes.  */				      \
+	    cnt = 3;							      \
+	    ch &= 0x0f;							      \
+	  }								      \
+	else if ((ch & 0xf8) == 0xf0)					      \
+	  {								      \
+	    /* We expect four bytes.  */				      \
+	    cnt = 4;							      \
+	    ch &= 0x07;							      \
+	  }								      \
+	else if ((ch & 0xfc) == 0xf8)					      \
+	  {								      \
+	    /* We expect five bytes.  */				      \
+	    cnt = 5;							      \
+	    ch &= 0x03;							      \
+	  }								      \
+	else if ((ch & 0xfe) == 0xfc)					      \
+	  {								      \
+	    /* We expect six bytes.  */					      \
+	    cnt = 6;							      \
+	    ch &= 0x01;							      \
+	  }								      \
+	else								      \
 	  {								      \
 	    /* This is an illegal encoding.  */				      \
 	    result = GCONV_ILLEGAL_INPUT;				      \
 	    break;							      \
 	  }								      \
 									      \
-	ch <<= 6;							      \
-	ch |= byte & 0x3f;						      \
+	if (NEED_LENGTH_TEST && inptr + cnt > inend)			      \
+	  {								      \
+	    /* We don't have enough input.  */				      \
+	    result = GCONV_INCOMPLETE_INPUT;				      \
+	    break;							      \
+	  }								      \
+									      \
+	/* Read the possible remaining bytes.  */			      \
+	for (i = 1; i < cnt; ++i)					      \
+	  {								      \
+	    uint32_t byte = inptr[i];					      \
+									      \
+	    if ((byte & 0xc0) != 0x80)					      \
+	      {								      \
+		/* This is an illegal encoding.  */			      \
+		result = GCONV_ILLEGAL_INPUT;				      \
+		break;							      \
+	      }								      \
+									      \
+	    ch <<= 6;							      \
+	    ch |= byte & 0x3f;						      \
+	  }								      \
+	inptr += cnt;							      \
       }									      \
 									      \
     /* Now adjust the pointers and store the result.  */		      \
-    inptr += cnt;							      \
     *((uint32_t *) outptr)++ = ch;					      \
   }
 #include <iconv/loop.c>
diff --git a/iconv/loop.c b/iconv/loop.c
index b8657d574c..e1c1ab6e49 100644
--- a/iconv/loop.c
+++ b/iconv/loop.c
@@ -32,8 +32,6 @@
 			bytes needed.  It defaults to MIN_NEEDED_INPUT
      MAX_NEEDED_OUTPUT	likewise for output bytes.
 
-   Both values have a default of 1.
-
      LOOPFCT		name of the function created.  If not specified
 			the name is `loop' but this prevents the use
 			of multiple functions in the same file.
@@ -55,7 +53,7 @@
 
 /* We need at least one byte for the next round.  */
 #ifndef MIN_NEEDED_INPUT
-# define MIN_NEEDED_INPUT	1
+# error "MIN_NEEDED_INPUT definition missing"
 #endif
 
 /* Let's see how many bytes we produce.  */
@@ -65,7 +63,7 @@
 
 /* We produce at least one byte in the next round.  */
 #ifndef MIN_NEEDED_OUTPUT
-# define MIN_NEEDED_OUTPUT	1
+# error "MIN_NEEDED_OUTPUT definition missing"
 #endif
 
 /* Let's see how many bytes we produce.  */
diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 3582f14110..f905bcdaea 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -196,6 +196,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
       /* This variable is used to count the number of characters we
          actually converted.  */
       size_t converted = 0;
+      size_t last_converted;
 
       /* We preserve the initial values of the pointer variables.  */
       const char *inptr = *inbuf;
@@ -211,6 +212,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
 	  outptr = outbuf;
 
 	  /* Save the state.  */
+	  last_converted = converted;
 #ifdef SAVE_RESET_STATE
 	  SAVE_RESET_STATE (1);
 #endif
@@ -242,7 +244,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
 	  /* Write out all output which was produced.  */
 	  if (outbuf > outptr)
 	    {
-	      const char *outerr = outbuf;
+	      const char *outerr = data->outbuf;
 	      int result;
 
 	      result = (*fct) (next_step, next_data, &outerr, outbuf,
@@ -264,6 +266,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
 		      outbuf = outptr;
 
 		      /* Reset the state.  */
+		      converted = last_converted;
 # ifdef SAVE_RESET_STATE
 		      SAVE_RESET_STATE (0);
 # endif
@@ -287,8 +290,8 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
 
 		      /* We must run out of output buffer space in this
 			 rerun.  */
-		      assert (nstatus == GCONV_FULL_OUTPUT
-			      && outbuf == outerr);
+		      assert (outbuf == outerr);
+		      assert (nstatus == GCONV_FULL_OUTPUT);
 #endif	/* reset input buffer */
 		    }