math: Use wordsize-64 version for isnan

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

diff --git a/iconv/iconv.c b/iconv/iconv.c
index 8804e851b620b00649ac88a47c324ba25cba7212..b96f9d84a34a0e2abd4dd19beabfe20253f46685 100644 (file)
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -1,64 +1,89 @@
 /* Convert characters in input buffer using conversion descriptor to
    output buffer.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2019 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 <stddef.h> /* for NULL */
 #include <errno.h>
 #include <iconv.h>
-#include <gconv.h>
+
+#include <gconv_int.h>
 
 #include <assert.h>
 
 
 size_t
-iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
+iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
        size_t *outbytesleft)
 {
-  gconv_t gcd = (gconv_t) cd;
-  size_t converted;
+  __gconv_t gcd = (__gconv_t) cd;
+  char *outstart = outbuf ? *outbuf : NULL;
+  size_t irreversible;
   int result;
 
-  result = __gconv (gcd, inbuf, inbytesleft, outbuf, outbytesleft, &converted);
-  switch (result)
+  if (__glibc_unlikely (inbuf == NULL || *inbuf == NULL))
+    {
+      if (outbuf == NULL || *outbuf == NULL)
+       result = __gconv (gcd, NULL, NULL, NULL, NULL, &irreversible);
+      else
+       result = __gconv (gcd, NULL, NULL, (unsigned char **) outbuf,
+                         (unsigned char *) (outstart + *outbytesleft),
+                         &irreversible);
+    }
+  else
+    {
+      const char *instart = *inbuf;
+
+      result = __gconv (gcd, (const unsigned char **) inbuf,
+                       (const unsigned char *)  (*inbuf + *inbytesleft),
+                       (unsigned char **) outbuf,
+                       (unsigned char *) (*outbuf + *outbytesleft),
+                       &irreversible);
+
+      *inbytesleft -= *inbuf - instart;
+    }
+  if (outstart != NULL)
+    *outbytesleft -= *outbuf - outstart;
+
+  switch (__builtin_expect (result, __GCONV_OK))
     {
-    case GCONV_ILLEGAL_DESCRIPTOR:
+    case __GCONV_ILLEGAL_DESCRIPTOR:
       __set_errno (EBADF);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
-    case GCONV_ILLEGAL_INPUT:
+    case __GCONV_ILLEGAL_INPUT:
       __set_errno (EILSEQ);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
-    case GCONV_FULL_OUTPUT:
+    case __GCONV_FULL_OUTPUT:
       __set_errno (E2BIG);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
-    case GCONV_INCOMPLETE_INPUT:
+    case __GCONV_INCOMPLETE_INPUT:
       __set_errno (EINVAL);
-      converted = (size_t) -1L;
+      irreversible = (size_t) -1L;
       break;
 
-    case GCONV_EMPTY_INPUT:
-    case GCONV_OK:
+    case __GCONV_EMPTY_INPUT:
+    case __GCONV_OK:
       /* Nothing.  */
       break;
 
@@ -66,5 +91,5 @@ iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
       assert (!"Nothing like this should happen");
     }
 
-  return converted;
+  return irreversible;
 }