Update copyright notices with scripts/update-copyrights.

[thirdparty/glibc.git] / iconv / gconv.c

diff --git a/iconv/gconv.c b/iconv/gconv.c
index f51af4a4d8c7153feae8804f1956b103df917ac7..384e03610d2fbe82b74af26efe6ff5fcb61639bc 100644 (file)
--- a/iconv/gconv.c
+++ b/iconv/gconv.c
@@ -1,63 +1,84 @@
 /* Convert characters in input buffer using conversion descriptor to
    output buffer.
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997-2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
    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
+   <http://www.gnu.org/licenses/>.  */
 
 #include <assert.h>
-#include <gconv.h>
-#include <sys/param.h>
 #include <dlfcn.h>
+#include <stddef.h>
+#include <sys/param.h>
+
+#include <gconv_int.h>
+#include <sysdep.h>
+
 
 int
 internal_function
 __gconv (__gconv_t cd, const unsigned char **inbuf,
         const unsigned char *inbufend, unsigned char **outbuf,
-        unsigned char *outbufend, size_t *converted)
+        unsigned char *outbufend, size_t *irreversible)
 {
-  size_t last_step = cd->__nsteps - 1;
+  size_t last_step;
   int result;
 
   if (cd == (__gconv_t) -1L)
     return __GCONV_ILLEGAL_DESCRIPTOR;
 
-  assert (converted != NULL);
-  *converted = 0;
+  last_step = cd->__nsteps - 1;
+
+  assert (irreversible != NULL);
+  *irreversible = 0;
+
+  cd->__data[last_step].__outbuf = outbuf != NULL ? *outbuf : NULL;
+  cd->__data[last_step].__outbufend = outbufend;
+
+  __gconv_fct fct = cd->__steps->__fct;
+#ifdef PTR_DEMANGLE
+  if (cd->__steps->__shlib_handle != NULL)
+    PTR_DEMANGLE (fct);
+#endif
 
   if (inbuf == NULL || *inbuf == NULL)
-    /* We just flush.  */
-    result = DL_CALL_FCT (cd->__steps->__fct,
-                          (cd->__steps, cd->__data, NULL, NULL,
-                           converted, 1));
+    {
+      /* We just flush.  */
+      result = DL_CALL_FCT (fct,
+                           (cd->__steps, cd->__data, NULL, NULL, NULL,
+                            irreversible,
+                            cd->__data[last_step].__outbuf == NULL ? 2 : 1,
+                            0));
+
+      /* If the flush was successful clear the rest of the state.  */
+      if (result == __GCONV_OK)
+       for (size_t cnt = 0; cnt <= last_step; ++cnt)
+         cd->__data[cnt].__invocation_counter = 0;
+    }
   else
     {
       const unsigned char *last_start;
 
       assert (outbuf != NULL && *outbuf != NULL);
-      cd->__data[last_step].__outbuf = *outbuf;
-      cd->__data[last_step].__outbufend = outbufend;
 
       do
        {
          last_start = *inbuf;
-         result = DL_CALL_FCT (cd->__steps->__fct,
-                                (cd->__steps, cd->__data, inbuf, inbufend,
-                                 converted, 0));
+         result = DL_CALL_FCT (fct,
+                               (cd->__steps, cd->__data, inbuf, inbufend,
+                                NULL, irreversible, 0, 0));
        }
       while (result == __GCONV_EMPTY_INPUT && last_start != *inbuf
             && *inbuf + cd->__steps->__min_needed_from <= inbufend);