Update copyright dates with scripts/update-copyrights.

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

diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index fb86992aea466a2073ecbe572e59907c67c16406..d41f78823f9f6f7abe71a3ae3c873adbda184933 100644 (file)
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -1,28 +1,29 @@
-/* Copyright (C) 1996, 1997, 1998, 1999   Free Software Foundation, Inc.
+/* Copyright (C) 1996-2020 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 <assert.h>
+#include <dlfcn.h>
 #include <errno.h>
 #include <gconv.h>
 #include <wchar.h>
 #include <wcsmbsload.h>
 
-#include <assert.h>
+#include <sysdep.h>
 
 #ifndef EILSEQ
 # define EILSEQ EINVAL
@@ -36,42 +37,48 @@ static mbstate_t state;
    implementation of stdio because we have to deal with unterminated
    buffers.  At most NWC wide character will be converted.  */
 size_t
-__wcsnrtombs (dst, src, nwc, len, ps)
-     char *dst;
-     const wchar_t **src;
-     size_t nwc;
-     size_t len;
-     mbstate_t *ps;
+__wcsnrtombs (char *dst, const wchar_t **src, size_t nwc, size_t len,
+             mbstate_t *ps)
 {
   struct __gconv_step_data data;
   const wchar_t *srcend;
   int status;
   size_t result;
   struct __gconv_step *tomb;
+  const struct gconv_fcts *fcts;
 
   /* Tell where we want the result.  */
   data.__invocation_counter = 0;
   data.__internal_use = 1;
-  data.__is_last = 1;
+  data.__flags = __GCONV_IS_LAST;
   data.__statep = ps ?: &state;
 
   if (nwc == 0)
     return 0;
   srcend = *src + __wcsnlen (*src, nwc - 1) + 1;
 
-  /* Make sure we use the correct function.  */
-  update_conversion_ptrs ();
+  /* Get the conversion functions.  */
+  fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
 
   /* Get the structure with the function pointers.  */
-  tomb = __wcsmbs_gconv_fcts.tomb;
+  tomb = fcts->tomb;
+  __gconv_fct fct = tomb->__fct;
+#ifdef PTR_DEMANGLE
+  if (tomb->__shlib_handle != NULL)
+    PTR_DEMANGLE (fct);
+#endif
 
   /* We have to handle DST == NULL special.  */
   if (dst == NULL)
     {
+      mbstate_t temp_state;
       unsigned char buf[256];          /* Just an arbitrary value.  */
-      const wchar_t *inbuf = *src;
+      const unsigned char *inbuf = (const unsigned char *) *src;
       size_t dummy;
 
+      temp_state = *data.__statep;
+      data.__statep = &temp_state;
+
       result = 0;
       data.__outbufend = buf + sizeof (buf);
 
@@ -79,9 +86,9 @@ __wcsnrtombs (dst, src, nwc, len, ps)
        {
          data.__outbuf = buf;
 
-         status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
-                                  (const unsigned char **) &inbuf,
-                                  (const unsigned char *) srcend, &dummy, 0);
+         status = DL_CALL_FCT (fct, (tomb, &data, &inbuf,
+                                     (const unsigned char *) srcend, NULL,
+                                     &dummy, 0, 1));
 
          /* Count the number of bytes.  */
          result += data.__outbuf - buf;
@@ -100,12 +107,12 @@ __wcsnrtombs (dst, src, nwc, len, ps)
         of the string.  */
       size_t dummy;
 
-      data.__outbuf = dst;
-      data.__outbufend = dst + len;
+      data.__outbuf = (unsigned char *) dst;
+      data.__outbufend = (unsigned char *) dst + len;
 
-      status = (*tomb->__fct) (__wcsmbs_gconv_fcts.tomb, &data,
-                              (const unsigned char **) src,
-                              (const unsigned char *) srcend, &dummy, 0);
+      status = DL_CALL_FCT (fct, (tomb, &data, (const unsigned char **) src,
+                                 (const unsigned char *) srcend, NULL,
+                                 &dummy, 0, 1));
 
       /* Count the number of bytes.  */
       result = data.__outbuf - (unsigned char *) dst;