Update.

1999-01-11  Ulrich Drepper  <drepper@cygnus.com>

	* ctype/Versions [GLIBC_2.0]: Export __ctype32_b.
	* include/wctype.h: Declare __iswctype.
	* stdio-common/vfscanf.c (__vfscanf): Use __iswspace instead of
	iswspace.
	* wctype/Makefile (routines): Add wcextra_l.
	* wctype/wcextra.c (iswblank): Implement function here and don't use
	__iswctype.
	(__iswblank_l):  Move definition to...
	* wctype/wcextra_l.c: ...here.  New file.
	* wctype/wcfuncs.c: Really implement functions and don't call
	__iswctype or __towctrans.
	* wctype/wctype.h: Change isw* and tow* macros.  Don't call
	__iswctype or __towctrans.  Instead optimize constant argument case.

	* iconv/gconv.h: Fix typos.

	* iconv/skeleton.c: Fix typos.  Optimize init function a bit.
	Correctly emit escape sequence to return to initial state in
	conversion function.

	* iconvdata/iso-2022-jp.c (gconv_init): Correctly initialize
	max_needed_to element.

	* manual/mbyte.texi: Removed.  This is now described in charset.texi.
	* manual/charset.texi: New file.
	* manual/Makefile (chapters): Replace mbyte by charset.
	* manual/ctype.texi: Document wide character functions.
	* manual/intro.texi: Fix reference to mbyte chapter.
	* manual/lang.texi: Likewise.
	* manual/locale.texi: Likewise.
	* manual/stdio.texi: Likewise.
	* manual/string.texi: Fix @node line for new charset chapter.
	* manual/libc.texinfo (UPDATED): Updated.  Also update copyright years.
	* manual/memory.texi (savestring): Optimize code to give a good
	example.

	* manual/filesys.texi: Fix wording.  Patches by Jim Meyering.

	* nscd/nscd_getgr_r.c: Include stdint.h to get uintptr_t definition.
	* nscd/nscd_getpw_r.c: Likewise.
	* nscd/nscd_gethst_r.c: Likewise.

	* stdlib/stdtold_l.c: Always include xlocale.h.

1999-01-11  Geoffrey Keating  <geoffk@ozemail.com.au>

	* stdlib/fpioconst.h (LDBL_MAX_10_EXP_LOG): Define to be same as
	DBL_MAX_10_EXP_LOG if there is no long double.
	(_fpioconst_pow10): Always use size as LDBL_MAX_10_EXP_LOG to match
	printf_fp.c.

1999-01-10  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/Makefile ($(testdata)/GB): Changed to ...
	($(testdata)/Europe/London): ... for tst-timezone test.
	($(objpfx)tst-timezone.out): Change GB to Europe/London.

	* timezone/tst-timezone.c (main): Enable DST switching test,
	change GB to Europe/London.

1999-01-10  Philip Blundell  <philb@gnu.org>

	* socket/Makefile (headers): Remove bits/sockunion.h.

1999-01-09  Philip Blundell  <philb@gnu.org>

	* socket/sys/socket.h: Don't include <bits/sockunion.h>.
	* sysdeps/generic/bits/sockunion.h: Deleted.
	* sysdeps/unix/sysv/linux/bits/sockunion.h: Likewise.

1999-01-08  H.J. Lu  <hjl@gnu.org>

	* io/fts.c (fts_close): Don't access memory after having it freed.

1 files changed, 19 insertions, 25 deletions

diff --git a/iconv/skeleton.c b/iconv/skeleton.c
index 4ed16d6..c124eb1 100644
--- a/iconv/skeleton.c
+++ b/iconv/skeleton.c
@@ -1,5 +1,5 @@
 /* Skeleton for a conversion module.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   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.
 
@@ -119,7 +119,7 @@ static int to_object;
    character set we we can define RESET_INPUT_BUFFER is necessary.  */
 #if !defined RESET_INPUT_BUFFER && !defined SAVE_RESET_STATE
 # if MIN_NEEDED_FROM == MAX_NEEDED_FROM && MIN_NEEDED_TO == MAX_NEEDED_TO
-/* We have to used these `if's here since the compiler cannot know that
+/* We have to use these `if's here since the compiler cannot know that
    (outbuf - outerr) is always divisible by MIN_NEEDED_TO.  */
 #  define RESET_INPUT_BUFFER \
   if (MIN_NEEDED_FROM % MIN_NEEDED_TO == 0)				      \
@@ -144,26 +144,25 @@ gconv_init (struct gconv_step *step)
 {
   /* Determine which direction.  */
   if (__strcasecmp (step->from_name, CHARSET_NAME) == 0)
-    step->data = &from_object;
-  else if (__strcasecmp (step->to_name, CHARSET_NAME) == 0)
-    step->data = &to_object;
-  else
-    return GCONV_NOCONV;
-
-  if (step->data == &from_object)
     {
+      step->data = &from_object;
+
       step->min_needed_from = MIN_NEEDED_FROM;
       step->max_needed_from = MAX_NEEDED_FROM;
       step->min_needed_to = MIN_NEEDED_TO;
       step->max_needed_to = MAX_NEEDED_TO;
     }
-  else
+  else if (__strcasecmp (step->to_name, CHARSET_NAME) == 0)
     {
+      step->data = &to_object;
+
       step->min_needed_from = MIN_NEEDED_TO;
       step->max_needed_from = MAX_NEEDED_TO;
       step->min_needed_to = MIN_NEEDED_FROM;
       step->max_needed_to = MAX_NEEDED_FROM;
     }
+  else
+    return GCONV_NOCONV;
 
 #ifdef RESET_STATE
   step->stateful = 1;
@@ -210,22 +209,17 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
      dropped.  */
   if (do_flush)
     {
-      /* Call the steps down the chain if there are any.  */
-      if (data->is_last)
-	status = GCONV_OK;
-      else
-	{
-#ifdef EMIT_SHIFT_TO_INIT
-	  status = GCONV_OK;
+      status = GCONV_OK;
 
-	  EMIT_SHIFT_TO_INIT;
-
-	  if (status == GCONV_OK)
+#ifdef EMIT_SHIFT_TO_INIT
+      /* Emit the escape sequence to reset the state.  */
+      EMIT_SHIFT_TO_INIT;
 #endif
-	    /* Give the modules below the same chance.  */
-	    status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL,
-					written, 1));
-	}
+      /* Call the steps down the chain if there are any but only if we
+         successfully emitted the escape sequence.  */
+      if (status == GCONV_OK && ! data->is_last)
+	status = DL_CALL_FCT (fct, (next_step, next_data, NULL, NULL,
+				    written, 1));
     }
   else
     {
@@ -271,7 +265,7 @@ FUNCTION_NAME (struct gconv_step *step, struct gconv_step_data *data,
 			      data->statep, step->data, &converted
 			      EXTRA_LOOP_ARGS);
 
-	  /* If this is the last step leave the loop, there is nothgin
+	  /* If this is the last step leave the loop, there is nothing
              we can do.  */
 	  if (data->is_last)
 	    {