Regenerate charmap-kw.h, locfile-kw.h

[thirdparty/glibc.git] / stdlib / mbtowc.c

diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c
index 938d54750c206c4275292c5f217af4aaffd81544..f4ec94283acd77f1059ecfea18a44b69e0b9f6f8 100644 (file)
--- a/stdlib/mbtowc.c
+++ b/stdlib/mbtowc.c
@@ -1,30 +1,27 @@
-/* Copyright (C) 1991, 92, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2019 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
-   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.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 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.
+   Lesser 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.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <wchar.h>
 #include <gconv.h>
 #include <wcsmbs/wcsmbsload.h>
 
 
-/* Common state for all non-restartable conversion functions.  */
-mbstate_t __no_r_state;
-
 /* Convert the multibyte character at S, which is no longer
    than N characters, to its `wchar_t' representation, placing
    this n *PWC and returning its length.
@@ -37,16 +34,23 @@ int
 mbtowc (wchar_t *pwc, const char *s, size_t n)
 {
   int result;
+  static mbstate_t state;
 
   /* If S is NULL the function has to return null or not null
      depending on the encoding having a state depending encoding or
      not.  */
   if (s == NULL)
     {
-      /* Make sure we use the correct value.  */
-      update_conversion_ptrs ();
+      const struct gconv_fcts *fcts;
+
+      /* Get the conversion functions.  */
+      fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
+
+      /* This is an extension in the Unix standard which does not directly
+        violate ISO C.  */
+      memset (&state, '\0', sizeof state);
 
-      result = __wcsmbs_gconv_fcts.towc->stateful;
+      result = fcts->towc->__stateful;
     }
   else if (*s == '\0')
     {
@@ -56,7 +60,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
     }
   else
     {
-      result = __mbrtowc (pwc, s, n, &__no_r_state);
+      result = __mbrtowc (pwc, s, n, &state);
 
       /* The `mbrtowc' functions tell us more than we need.  Fold the -1
         and -2 result into -1.  */