Update copyright dates with scripts/update-copyrights.

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

diff --git a/wcsmbs/btowc.c b/wcsmbs/btowc.c
index b40a98f65b5a05c695a283e5f9a8b6f087bc1fa2..e9d3fd25b0d47010c0f69754a9e35a63febfe548 100644 (file)
--- a/wcsmbs/btowc.c
+++ b/wcsmbs/btowc.c
@@ -1,68 +1,100 @@
-/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2016 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+   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
+   <http://www.gnu.org/licenses/>.  */
 
+#include <ctype.h>
+#include <dlfcn.h>
 #include <gconv.h>
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
 #include <wcsmbsload.h>
+#include <limits.h>
+
+#include <sysdep.h>
 
 
 wint_t
-__btowc (c)
-     int c;
+__btowc (int c)
 {
-  char buf[sizeof (wchar_t)];
-  struct gconv_step_data data;
-  char inbuf[1];
-  char *inptr = inbuf;
-  size_t converted;
-  int status;
+  const struct gconv_fcts *fcts;
 
   /* If the parameter does not fit into one byte or it is the EOF value
      we can give the answer now.  */
-  if (c < -128 || c > 127 || c == EOF)
+  if (c < SCHAR_MIN || c > UCHAR_MAX || c == EOF)
     return WEOF;
 
-  /* Tell where we want the result.  */
-  data.outbuf = (char *) buf;
-  data.outbufend = data.outbuf + sizeof (wchar_t);
-  data.is_last = 1;
-  data.statep = &data.__state;
+  /* We know that only ASCII compatible encodings are used for the
+     locale and that the wide character encoding is ISO 10646.  */
+  if (isascii (c))
+    return (wint_t) c;
 
-  /* Make sure we start in the initial state.  */
-  memset (&data.__state, '\0', sizeof (mbstate_t));
+  /* Get the conversion functions.  */
+  fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
+  __gconv_btowc_fct btowc_fct = fcts->towc->__btowc_fct;
 
-  /* Make sure we use the correct function.  */
-  update_conversion_ptrs ();
+  if (__builtin_expect (fcts->towc_nsteps == 1, 1)
+      && __builtin_expect (btowc_fct != NULL, 1))
+    {
+      /* Use the shortcut function.  */
+#ifdef PTR_DEMANGLE
+      if (fcts->towc->__shlib_handle != NULL)
+       PTR_DEMANGLE (btowc_fct);
+#endif
+      return DL_CALL_FCT (btowc_fct, (fcts->towc, (unsigned char) c));
+    }
+  else
+    {
+      /* Fall back to the slow but generic method.  */
+      wchar_t result;
+      struct __gconv_step_data data;
+      unsigned char inbuf[1];
+      const unsigned char *inptr = inbuf;
+      size_t dummy;
+      int status;
 
-  /* Create the input string.  */
-  inbuf[0] = c;
+      /* Tell where we want the result.  */
+      data.__outbuf = (unsigned char *) &result;
+      data.__outbufend = data.__outbuf + sizeof (wchar_t);
+      data.__invocation_counter = 0;
+      data.__internal_use = 1;
+      data.__flags = __GCONV_IS_LAST;
+      data.__statep = &data.__state;
 
-  status = (*__wcsmbs_gconv_fcts.towc->fct) (__wcsmbs_gconv_fcts.towc,
-                                            &data, &inptr, inptr + 1,
-                                            &converted, 0);
-  /* The conversion failed.  */
-  if (status != GCONV_OK && status != GCONV_FULL_OUTPUT
-      && status != GCONV_EMPTY_INPUT)
-    return WEOF;
+      /* Make sure we start in the initial state.  */
+      memset (&data.__state, '\0', sizeof (mbstate_t));
+
+      /* Create the input string.  */
+      inbuf[0] = c;
+
+      __gconv_fct fct = fcts->towc->__fct;
+#ifdef PTR_DEMANGLE
+      if (fcts->towc->__shlib_handle != NULL)
+       PTR_DEMANGLE (fct);
+#endif
+      status = DL_CALL_FCT (fct, (fcts->towc, &data, &inptr, inptr + 1,
+                                 NULL, &dummy, 0, 1));
+
+      if (status != __GCONV_OK && status != __GCONV_FULL_OUTPUT
+         && status != __GCONV_EMPTY_INPUT)
+       /* The conversion failed.  */
+       result = WEOF;
 
-  return *(wchar_t *)buf;
+      return result;
+    }
 }
 weak_alias (__btowc, btowc)