regex: avoid compilation failure with upcoming gcc-4.4

[gnulib.git] / lib / strtol.c

diff --git a/lib/strtol.c b/lib/strtol.c
index 9984083..0b2c82a 100644 (file)
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,11 +1,15 @@
-/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc.
+/* Convert string representation of a number into an integer value.

 
 

-   NOTE: The canonical source of this file is maintained with the GNU C Library.
-   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   Copyright (C) 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2005,
+   2006, 2007
+   Free Software Foundation, Inc.

 
 

-   This program is free software; you can redistribute it and/or modify it
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to bug-glibc@gnu.org.
+
+   This program is free software: you can redistribute it and/or modify it

    under the terms of the GNU General Public License as published by the
    under the terms of the GNU General Public License as published by the

-   Free Software Foundation; either version 2, or (at your option) any
+   Free Software Foundation; either version 3 of the License, or any

    later version.
 
    This program is distributed in the hope that it will be useful,
    later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,90 +18,217 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING
 
 #ifdef _LIBC
 # define USE_NUMBER_GROUPING

-# define STDC_HEADERS
-# define HAVE_LIMITS_H
+#else
+# include <config.h>

 #endif
 
 #include <ctype.h>
 #include <errno.h>
 #endif
 
 #include <ctype.h>
 #include <errno.h>

-#ifndef errno
-extern int errno;
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)

 #endif
 
 #endif
 

-#if HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-#else
-# ifndef NULL
-#  define NULL 0
-# endif
-#endif
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>

 
 #ifdef USE_NUMBER_GROUPING
 # include "../locale/localeinfo.h"
 #endif
 
 
 #ifdef USE_NUMBER_GROUPING
 # include "../locale/localeinfo.h"
 #endif
 

-/* Nonzero if we are defining `strtoul' or `strtouq', operating on
+/* Nonzero if we are defining `strtoul' or `strtoull', operating on

    unsigned integers.  */
 #ifndef UNSIGNED
 # define UNSIGNED 0
 # define INT LONG int
 #else
    unsigned integers.  */
 #ifndef UNSIGNED
 # define UNSIGNED 0
 # define INT LONG int
 #else

-# define strtol strtoul

 # define INT unsigned LONG int
 #endif
 
 # define INT unsigned LONG int
 #endif
 

-/* If QUAD is defined, we are defining `strtoq' or `strtouq',
-   operating on `long long int's.  */
-#ifdef QUAD
+/* Determine the name.  */
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL

 # if UNSIGNED
 # if UNSIGNED

-#  define strtoul strtouq
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoull_l
+#   else
+#    define strtol __wcstoul_l
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol __strtoull_l
+#   else
+#    define strtol __strtoul_l
+#   endif
+#  endif

 # else
 # else

-#  define strtol strtoq
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoll_l
+#   else
+#    define strtol __wcstol_l
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol __strtoll_l
+#   else
+#    define strtol __strtol_l
+#   endif
+#  endif

 # endif
 # endif

+#else
+# if UNSIGNED
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoull
+#   else
+#    define strtol wcstoul
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol strtoull
+#   else
+#    define strtol strtoul
+#   endif
+#  endif
+# else
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoll
+#   else
+#    define strtol wcstol
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol strtoll
+#   endif
+#  endif
+# endif
+#endif
+
+/* If QUAD is defined, we are defining `strtoll' or `strtoull',
+   operating on `long long int's.  */
+#ifdef QUAD

 # define LONG long long
 # define LONG long long

-# undef LONG_MIN
-# define LONG_MIN LONG_LONG_MIN
-# undef LONG_MAX
-# define LONG_MAX LONG_LONG_MAX
-# undef ULONG_MAX
-# define ULONG_MAX ULONG_LONG_MAX
+# define STRTOL_LONG_MIN LONG_LONG_MIN
+# define STRTOL_LONG_MAX LONG_LONG_MAX
+# define STRTOL_ULONG_MAX ULONG_LONG_MAX
+
+/* The extra casts in the following macros work around compiler bugs,
+   e.g., in Cray C 5.0.3.0.  */
+
+/* True if negative values of the signed integer type T use two's
+   complement, ones' complement, or signed magnitude representation,
+   respectively.  Much GNU code assumes two's complement, but some
+   people like to be portable to all possible C hosts.  */
+# define TYPE_TWOS_COMPLEMENT(t) ((t) ~ (t) 0 == (t) -1)
+# define TYPE_ONES_COMPLEMENT(t) ((t) ~ (t) 0 == 0)
+# define TYPE_SIGNED_MAGNITUDE(t) ((t) ~ (t) 0 < (t) -1)
+
+/* True if the arithmetic type T is signed.  */
+# define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+/* The maximum and minimum values for the integer type T.  These
+   macros have undefined behavior if T is signed and has padding bits.
+   If this is a problem for you, please let us know how to fix it for
+   your host.  */
+# define TYPE_MINIMUM(t) \
+   ((t) (! TYPE_SIGNED (t) \
+        ? (t) 0 \
+        : TYPE_SIGNED_MAGNITUDE (t) \
+        ? ~ (t) 0 \
+        : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))
+# define TYPE_MAXIMUM(t) \
+   ((t) (! TYPE_SIGNED (t) \
+        ? (t) -1 \
+        : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))
+
+# ifndef ULONG_LONG_MAX
+#  define ULONG_LONG_MAX TYPE_MAXIMUM (unsigned long long)
+# endif
+# ifndef LONG_LONG_MAX
+#  define LONG_LONG_MAX TYPE_MAXIMUM (long long int)
+# endif
+# ifndef LONG_LONG_MIN
+#  define LONG_LONG_MIN TYPE_MINIMUM (long long int)
+# endif
+

 # if __GNUC__ == 2 && __GNUC_MINOR__ < 7
    /* Work around gcc bug with using this constant.  */
    static const unsigned long long int maxquad = ULONG_LONG_MAX;
 # if __GNUC__ == 2 && __GNUC_MINOR__ < 7
    /* Work around gcc bug with using this constant.  */
    static const unsigned long long int maxquad = ULONG_LONG_MAX;

-#  undef ULONG_MAX
-#  define ULONG_MAX maxquad
+#  undef STRTOL_ULONG_MAX
+#  define STRTOL_ULONG_MAX maxquad

 # endif
 #else
 # define LONG long
 # endif
 #else
 # define LONG long

+# define STRTOL_LONG_MIN LONG_MIN
+# define STRTOL_LONG_MAX LONG_MAX
+# define STRTOL_ULONG_MAX ULONG_MAX

 #endif
 
 #endif
 

-#ifdef __STDC__
-# define INTERNAL(x) INTERNAL1(x)
-# define INTERNAL1(x) __##x##_internal
+
+/* We use this code also for the extended locale handling where the
+   function gets as an additional argument the locale which has to be
+   used.  To access the values we have to redefine the _NL_CURRENT
+   macro.  */
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# undef _NL_CURRENT
+# define _NL_CURRENT(category, item) \
+  (current->values[_NL_ITEM_INDEX (item)].string)
+# define LOCALE_PARAM , loc
+# define LOCALE_PARAM_PROTO , __locale_t loc

 #else
 #else

-# define INTERNAL(x) __/**/x/**/_internal
+# define LOCALE_PARAM
+# define LOCALE_PARAM_PROTO

 #endif
 
 #endif
 

+#include <wchar.h>
+
+#ifdef USE_WIDE_CHAR
+# include <wctype.h>
+# define L_(Ch) L##Ch
+# define UCHAR_TYPE wint_t
+# define STRING_TYPE wchar_t
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#  define ISSPACE(Ch) __iswspace_l ((Ch), loc)
+#  define ISALPHA(Ch) __iswalpha_l ((Ch), loc)
+#  define TOUPPER(Ch) __towupper_l ((Ch), loc)
+# else
+#  define ISSPACE(Ch) iswspace (Ch)
+#  define ISALPHA(Ch) iswalpha (Ch)
+#  define TOUPPER(Ch) towupper (Ch)
+# endif
+#else
+# define L_(Ch) Ch
+# define UCHAR_TYPE unsigned char
+# define STRING_TYPE char
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#  define ISSPACE(Ch) __isspace_l ((Ch), loc)
+#  define ISALPHA(Ch) __isalpha_l ((Ch), loc)
+#  define TOUPPER(Ch) __toupper_l ((Ch), loc)
+# else
+#  define ISSPACE(Ch) isspace (Ch)
+#  define ISALPHA(Ch) isalpha (Ch)
+#  define TOUPPER(Ch) toupper (Ch)
+# endif
+#endif
+
+#define INTERNAL(X) INTERNAL1(X)
+#define INTERNAL1(X) __##X##_internal
+#define WEAKNAME(X) WEAKNAME1(X)
+

 #ifdef USE_NUMBER_GROUPING
 /* This file defines a function to check for correct grouping.  */
 # include "grouping.h"
 #endif
 
 
 #ifdef USE_NUMBER_GROUPING
 /* This file defines a function to check for correct grouping.  */
 # include "grouping.h"
 #endif
 
 

+

 /* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
    If BASE is 0 the base is determined by the presence of a leading
    zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
 /* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
    If BASE is 0 the base is determined by the presence of a leading
    zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.


@@ -106,24 +237,24 @@ extern int errno;
    one converted is stored in *ENDPTR.  */
 
 INT
    one converted is stored in *ENDPTR.  */
 
 INT

-INTERNAL (strtol) (nptr, endptr, base, group)
-     const char *nptr;
-     char **endptr;
-     int base;
-     int group;
+INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+                  int base, int group LOCALE_PARAM_PROTO)

 {
   int negative;
   register unsigned LONG int cutoff;
   register unsigned int cutlim;
   register unsigned LONG int i;
 {
   int negative;
   register unsigned LONG int cutoff;
   register unsigned int cutlim;
   register unsigned LONG int i;

-  register const char *s;
-  register unsigned char c;
-  const char *save, *end;
+  register const STRING_TYPE *s;
+  register UCHAR_TYPE c;
+  const STRING_TYPE *save, *end;

   int overflow;
 
 #ifdef USE_NUMBER_GROUPING
   int overflow;
 
 #ifdef USE_NUMBER_GROUPING

+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+  struct locale_data *current = loc->__locales[LC_NUMERIC];
+# endif

   /* The thousands character of the current locale.  */
   /* The thousands character of the current locale.  */

-  wchar_t thousands;
+  wchar_t thousands = L'\0';

   /* The numeric grouping specification of the current locale,
      in the format described in <locale.h>.  */
   const char *grouping;
   /* The numeric grouping specification of the current locale,
      in the format described in <locale.h>.  */
   const char *grouping;


@@ -136,9 +267,11 @@ INTERNAL (strtol) (nptr, endptr, base, group)
       else
        {
          /* Figure out the thousands separator character.  */
       else
        {
          /* Figure out the thousands separator character.  */

-         if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
-                     strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
-           thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
+# if defined _LIBC || defined _HAVE_BTOWC
+         thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP));
+         if (thousands == WEOF)
+           thousands = L'\0';
+# endif

          if (thousands == L'\0')
            grouping = NULL;
        }
          if (thousands == L'\0')
            grouping = NULL;
        }


@@ -148,23 +281,26 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 #endif
 
   if (base < 0 || base == 1 || base > 36)
 #endif
 
   if (base < 0 || base == 1 || base > 36)

-    base = 10;
+    {
+      __set_errno (EINVAL);
+      return 0;
+    }

 
 

-  s = nptr;
+  save = s = nptr;

 
   /* Skip white space.  */
 
   /* Skip white space.  */

-  while (isspace (*s))
+  while (ISSPACE (*s))

     ++s;
     ++s;

-  if (*s == '\0')
+  if (*s == L_('\0'))

     goto noconv;
 
   /* Check for a sign.  */
     goto noconv;
 
   /* Check for a sign.  */

-  if (*s == '-')
+  if (*s == L_('-'))

     {
       negative = 1;
       ++s;
     }
     {
       negative = 1;
       ++s;
     }

-  else if (*s == '+')
+  else if (*s == L_('+'))

     {
       negative = 0;
       ++s;
     {
       negative = 0;
       ++s;


@@ -172,23 +308,19 @@ INTERNAL (strtol) (nptr, endptr, base, group)
   else
     negative = 0;
 
   else
     negative = 0;
 

-  if (base == 16 && s[0] == '0' && toupper (s[1]) == 'X')
-    s += 2;
-
-  /* If BASE is zero, figure it out ourselves.  */
-  if (base == 0)
-    if (*s == '0')
-      {
-       if (toupper (s[1]) == 'X')
-         {
-           s += 2;
-           base = 16;
-         }
-       else
-         base = 8;
-      }
-    else
-      base = 10;
+  /* Recognize number prefix and if BASE is zero, figure it out ourselves.  */
+  if (*s == L_('0'))
+    {
+      if ((base == 0 || base == 16) && TOUPPER (s[1]) == L_('X'))
+       {
+         s += 2;
+         base = 16;
+       }
+      else if (base == 0)
+       base = 8;
+    }
+  else if (base == 0)
+    base = 10;

 
   /* Save the pointer so we can check later if anything happened.  */
   save = s;
 
   /* Save the pointer so we can check later if anything happened.  */
   save = s;


@@ -198,9 +330,10 @@ INTERNAL (strtol) (nptr, endptr, base, group)
     {
       /* Find the end of the digit string and check its grouping.  */
       end = s;
     {
       /* Find the end of the digit string and check its grouping.  */
       end = s;

-      for (c = *end; c != '\0'; c = *++end)
-       if (c != thousands && !isdigit (c) &&
-           (!isalpha (c) || toupper (c) - 'A' + 10 >= base))
+      for (c = *end; c != L_('\0'); c = *++end)
+       if ((wchar_t) c != thousands
+           && ((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
+           && (!ISALPHA (c) || (int) (TOUPPER (c) - L_('A') + 10) >= base))

          break;
       if (*s == thousands)
        end = s;
          break;
       if (*s == thousands)
        end = s;


@@ -211,22 +344,22 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 #endif
     end = NULL;
 
 #endif
     end = NULL;
 

-  cutoff = ULONG_MAX / (unsigned LONG int) base;
-  cutlim = ULONG_MAX % (unsigned LONG int) base;
+  cutoff = STRTOL_ULONG_MAX / (unsigned LONG int) base;
+  cutlim = STRTOL_ULONG_MAX % (unsigned LONG int) base;

 
   overflow = 0;
   i = 0;
 
   overflow = 0;
   i = 0;

-  for (c = *s; c != '\0'; c = *++s)
+  for (c = *s; c != L_('\0'); c = *++s)

     {
       if (s == end)
        break;
     {
       if (s == end)
        break;

-      if (isdigit (c))
-       c -= '0';
-      else if (isalpha (c))
-       c = toupper (c) - 'A' + 10;
+      if (c >= L_('0') && c <= L_('9'))
+       c -= L_('0');
+      else if (ISALPHA (c))
+       c = TOUPPER (c) - L_('A') + 10;

       else
        break;
       else
        break;

-      if (c >= base)
+      if ((int) c >= base)

        break;
       /* Check for overflow.  */
       if (i > cutoff || (i == cutoff && c > cutlim))
        break;
       /* Check for overflow.  */
       if (i > cutoff || (i == cutoff && c > cutlim))


@@ -245,47 +378,58 @@ INTERNAL (strtol) (nptr, endptr, base, group)
   /* Store in ENDPTR the address of one character
      past the last character we converted.  */
   if (endptr != NULL)
   /* Store in ENDPTR the address of one character
      past the last character we converted.  */
   if (endptr != NULL)

-    *endptr = (char *) s;
+    *endptr = (STRING_TYPE *) s;

 
 #if !UNSIGNED
   /* Check for a value that is within the range of
      `unsigned LONG int', but outside the range of `LONG int'.  */
 
 #if !UNSIGNED
   /* Check for a value that is within the range of
      `unsigned LONG int', but outside the range of `LONG int'.  */

-  if (i > (negative ?
-          -(unsigned LONG int) LONG_MIN : (unsigned LONG int) LONG_MAX))
+  if (overflow == 0
+      && i > (negative
+             ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
+             : (unsigned LONG int) STRTOL_LONG_MAX))

     overflow = 1;
 #endif
 
   if (overflow)
     {
     overflow = 1;
 #endif
 
   if (overflow)
     {

-      errno = ERANGE;
+      __set_errno (ERANGE);

 #if UNSIGNED
 #if UNSIGNED

-      return ULONG_MAX;
+      return STRTOL_ULONG_MAX;

 #else
 #else

-      return negative ? LONG_MIN : LONG_MAX;
+      return negative ? STRTOL_LONG_MIN : STRTOL_LONG_MAX;

 #endif
     }
 
   /* Return the result of the appropriate sign.  */
 #endif
     }
 
   /* Return the result of the appropriate sign.  */

-  return (negative ? -i : i);
+  return negative ? -i : i;

 
 noconv:
 
 noconv:

-  /* There was no number to convert.  */
+  /* We must handle a special case here: the base is 0 or 16 and the
+     first two characters are '0' and 'x', but the rest are no
+     hexadecimal digits.  This is no error case.  We return 0 and
+     ENDPTR points to the `x`.  */

   if (endptr != NULL)
   if (endptr != NULL)

-    *endptr = (char *) nptr;
+    {
+      if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
+         && save[-2] == L_('0'))
+       *endptr = (STRING_TYPE *) &save[-1];
+      else
+       /*  There was no number to convert.  */
+       *endptr = (STRING_TYPE *) nptr;
+    }
+

   return 0L;
 }
 \f
 /* External user entry point.  */
 
   return 0L;
 }
 \f
 /* External user entry point.  */
 

-#ifdef weak_symbol
-weak_symbol (strtol)
-#endif

 
 INT
 
 INT

-strtol (nptr, endptr, base)
-     const char *nptr;
-     char **endptr;
-     int base;
+#ifdef weak_function
+weak_function
+#endif
+strtol (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+       int base LOCALE_PARAM_PROTO)

 {
 {

-  return INTERNAL (strtol) (nptr, endptr, base, 0);
+  return INTERNAL (strtol) (nptr, endptr, base, 0 LOCALE_PARAM);

 }
 }