posix/glob.c: update from gnulib

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

diff --git a/stdlib/mbstowcs.c b/stdlib/mbstowcs.c
index 1b380308d62334449c1598d49ec9d5c7d8ecb610..cd9fcfc6e10bd035fe0c9cabc28a09f47e95a038 100644 (file)
--- a/stdlib/mbstowcs.c
+++ b/stdlib/mbstowcs.c
@@ -1,46 +1,34 @@
-/* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991-2022 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.
+   The GNU C Library is free software; you can redistribute it and/or
+   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.
+   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
+   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., 675 Mass Ave,
-Cambridge, MA 02139, 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>
 
 
-extern mbstate_t __no_r_state; /* Defined in mbtowc.c.  */
-
 /* Convert the string of multibyte characters in S to `wchar_t's in
    PWCS, writing no more than N.  Return the number written,
-   or (size_t) -1 if an invalid multibyte character is encountered.
-
-   Attention: this function should NEVER be intentionally used.
-   The interface is completely stupid.  The state is shared between
-   all conversion functions.  You should use instead the restartable
-   version `mbsrtowcs'.  */
+   or (size_t) -1 if an invalid multibyte character is encountered.  */
 size_t
 mbstowcs (wchar_t *pwcs, const char *s, size_t n)
 {
-  mbstate_t save_shift = __no_r_state;
-  size_t written;
-
-  written = __mbsrtowcs (pwcs, &s, n, &__no_r_state);
-
-  /* Restore the old shift state.  */
-  __no_r_state = save_shift;
+  mbstate_t state;
 
+  memset (&state, '\0', sizeof state);
   /* Return how many we wrote (or maybe an error).  */
-  return written;
+  return __mbsrtowcs (pwcs, &s, n, &state);
 }