about summary refs log tree commit diff
path: root/stdlib/wctomb.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-21 19:09:49 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-21 19:09:49 +0000
commit9ce5071a3d3af1b7837b1a081548fdd945a66efe (patch)
treec9e8e02e1edb77de0cad9c39662b999cb28994a6 /stdlib/wctomb.c
parent5aa8ff620ef68811c5a7dd5d5bbac1c078730a2a (diff)
downloadglibc-9ce5071a3d3af1b7837b1a081548fdd945a66efe.tar.gz
glibc-9ce5071a3d3af1b7837b1a081548fdd945a66efe.tar.xz
glibc-9ce5071a3d3af1b7837b1a081548fdd945a66efe.zip
Update.
1998-04-21 19:05  Ulrich Drepper  <drepper@cygnus.com>

	* iconv/gconv.h (struct gconv_step): Add element stateful.
	* iconv/gconv_builtin.c (__gconv_builtin_trans): Initialize stateful
	to zero for all internal conversions.
	* iconv/skeleton.c: Initialize stateful depending on whether or not
	RESET_STATE is defined to one or zero respectively.
	* stdlib/mblen.c: Use stateful element of currently selected
	converter for result if S is NULL.
	* stdlib/mbtowc.c: Likewise.
	* stdlib/wctomb.c: Likewise.
Diffstat (limited to 'stdlib/wctomb.c')
-rw-r--r--stdlib/wctomb.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c
index acf139380f..b7132e02c4 100644
--- a/stdlib/wctomb.c
+++ b/stdlib/wctomb.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -18,6 +18,8 @@
 
 #include <stdlib.h>
 #include <wchar.h>
+#include <gconv.h>
+#include <wcsmbs/wcsmbsload.h>
 
 
 extern mbstate_t __no_r_state;	/* Defined in mbtowc.c.  */
@@ -34,12 +36,14 @@ wctomb (char *s, wchar_t wchar)
 {
   /* If S is NULL the function has to return null or not null
      depending on the encoding having a state depending encoding or
-     not.  This is nonsense because any multibyte encoding has a
-     state.  The ISO C amendment 1 corrects this while introducing the
-     restartable functions.  We simply say here all encodings have a
-     state.  */
+     not.  */
   if (s == NULL)
-    return 1;
+    {
+      /* Make sure we use the correct value.  */
+      update_conversion_ptrs ();
+
+      return __wcsmbs_gconv_fcts.tomb->stateful;
+    }
 
   return __wcrtomb (s, wchar, &__no_r_state);
 }