Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / wcsmbs / mbsrtowcs.c

diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index aaafe3bf1e76ae0903e847e374ddd9363a966f35..5c03d1be8afe9c8c9b2397cd8c77a48075eecd9a 100644 (file)
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -1,142 +1,31 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
    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 <errno.h>
-#include <gconv.h>
-#include <stdlib.h>
-#include <string.h>
 #include <wchar.h>
-#include <wcsmbsload.h>
-
-#include <assert.h>
-
-#ifndef EILSEQ
-# define EILSEQ EINVAL
-#endif
+#include <locale/localeinfo.h>
 
 
 /* This is the private state used if PS is NULL.  */
 static mbstate_t state;
 
 size_t
-__mbsrtowcs (dst, src, len, ps)
-     wchar_t *dst;
-     const char **src;
-     size_t len;
-     mbstate_t *ps;
+__mbsrtowcs (wchar_t *dst, const char **src, size_t len, mbstate_t *ps)
 {
-  struct __gconv_step_data data;
-  size_t result;
-  int status;
-  struct __gconv_step *towc;
-  size_t non_reversible;
-
-  /* Tell where we want the result.  */
-  data.__invocation_counter = 0;
-  data.__internal_use = 1;
-  data.__flags = __GCONV_IS_LAST;
-  data.__statep = ps ?: &state;
-
-  /* Make sure we use the correct function.  */
-  update_conversion_ptrs ();
-
-  /* Get the structure with the function pointers.  */
-  towc = __wcsmbs_gconv_fcts.towc;
-
-  /* We have to handle DST == NULL special.  */
-  if (dst == NULL)
-    {
-      mbstate_t temp_state;
-      wchar_t buf[64];         /* Just an arbitrary size.  */
-      const unsigned char *inbuf = (const unsigned char *) *src;
-      const unsigned char *srcend = inbuf + strlen (inbuf) + 1;
-
-      temp_state = *data.__statep;
-      data.__statep = &temp_state;
-
-      result = 0;
-      data.__outbufend = (char *) buf + sizeof (buf);
-      do
-       {
-         data.__outbuf = (char *) buf;
-
-         status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data, &inbuf,
-                                  srcend, &non_reversible, 0, 1);
-
-         result += (wchar_t *) data.__outbuf - buf;
-       }
-      while (status == __GCONV_FULL_OUTPUT);
-
-      if (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
-       {
-         /* There better should be a NUL wide char at the end.  */
-         assert (((wchar_t *) data.__outbuf)[-1] == L'\0');
-         /* Don't count the NUL character in.  */
-         --result;
-       }
-    }
-  else
-    {
-      /* This code is based on the safe assumption that all internal
-        multi-byte encodings use the NUL byte only to mark the end
-        of the string.  */
-      const unsigned char *srcend;
-
-      srcend = (const unsigned char *) (*src
-                                       + __strnlen (*src, len * MB_CUR_MAX)
-                                       + 1);
-
-      data.__outbuf = (unsigned char *) dst;
-      data.__outbufend = data.__outbuf + len * sizeof (wchar_t);
-
-      status = (*towc->__fct) (__wcsmbs_gconv_fcts.towc, &data,
-                              (const unsigned char **) src, srcend,
-                              &non_reversible, 0, 1);
-
-      result = (wchar_t *) data.__outbuf - dst;
-
-      /* We have to determine whether the last character converted
-        is the NUL character.  */
-      if ((status == __GCONV_OK || status == __GCONV_EMPTY_INPUT)
-         && ((wchar_t *) dst)[result - 1] == L'\0')
-       {
-         assert (result > 0);
-         assert (__mbsinit (data.__statep));
-         *src = NULL;
-         --result;
-       }
-    }
-
-  /* There must not be any problems with the conversion but illegal input
-     characters.  */
-  assert (status == __GCONV_OK || status == __GCONV_EMPTY_INPUT
-         || status == __GCONV_ILLEGAL_INPUT
-         || status == __GCONV_INCOMPLETE_INPUT
-         || status == __GCONV_FULL_OUTPUT);
-
-  if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
-      && status != __GCONV_EMPTY_INPUT && status != __GCONV_INCOMPLETE_INPUT)
-    {
-      result = (size_t) -1;
-      __set_errno (EILSEQ);
-    }
-
-  return result;
+  return __mbsrtowcs_l (dst, src, len, ps ?: &state, _NL_CURRENT_LOCALE);
 }
 weak_alias (__mbsrtowcs, mbsrtowcs)