doc: use ASCII in .texi files where UTF-8 isn't needed

[gnulib.git] / lib / strtol.c

diff --git a/lib/strtol.c b/lib/strtol.c
index 025287a..2e015dc 100644 (file)
--- a/lib/strtol.c
+++ b/lib/strtol.c
@@ -1,11 +1,14 @@
-/* strtol - Convert string representation of a number into an integer value.
-   Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
+/* Convert string representation of a number into an integer value.
+
+   Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2014 Free Software
+   Foundation, Inc.
+

    NOTE: The canonical source of this file is maintained with the GNU C
    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.
+   Library.  Bugs can be reported to bug-glibc@gnu.org.

 
 

-   This program is free software; you can redistribute it and/or modify it
+   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,47 +17,30 @@
    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,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if 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;
-#endif

 #ifndef __set_errno
 # define __set_errno(Val) errno = (Val)
 #endif
 
 #ifndef __set_errno
 # define __set_errno(Val) errno = (Val)
 #endif
 

-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
-#ifdef STDC_HEADERS
-# include <stddef.h>
-# include <stdlib.h>
-# include <string.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
    unsigned integers.  */
 #ifndef UNSIGNED
 # define UNSIGNED 0


@@ -64,59 +50,140 @@ extern int errno;
 #endif
 
 /* Determine the name.  */
 #endif
 
 /* Determine the name.  */

-#if UNSIGNED
-# ifdef USE_WIDE_CHAR
-#  ifdef QUAD
-#   define strtol wcstouq
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# if UNSIGNED
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoull_l
+#   else
+#    define strtol __wcstoul_l
+#   endif

 #  else
 #  else

-#   define strtol wcstoul
+#   ifdef QUAD
+#    define strtol __strtoull_l
+#   else
+#    define strtol __strtoul_l
+#   endif

 #  endif
 # else
 #  endif
 # else

-#  ifdef QUAD
-#   define strtol strtouq
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoll_l
+#   else
+#    define strtol __wcstol_l
+#   endif

 #  else
 #  else

-#   define strtol strtoul
+#   ifdef QUAD
+#    define strtol __strtoll_l
+#   else
+#    define strtol __strtol_l
+#   endif

 #  endif
 # endif
 #else
 #  endif
 # endif
 #else

-# ifdef USE_WIDE_CHAR
-#  ifdef QUAD
-#   define strtol wcstoq
+# if UNSIGNED
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoull
+#   else
+#    define strtol wcstoul
+#   endif

 #  else
 #  else

-#   define strtol wcstol
+#   ifdef QUAD
+#    define strtol strtoull
+#   else
+#    define strtol strtoul
+#   endif

 #  endif
 # else
 #  endif
 # else

-#  ifdef QUAD
-#   define strtol strtoq
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoll
+#   else
+#    define strtol wcstol
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol strtoll
+#   endif

 #  endif
 # endif
 #endif
 
 #  endif
 # endif
 #endif
 

-/* If QUAD is defined, we are defining `strtoq' or `strtouq',
-   operating on `long long int's.  */
+/* If QUAD is defined, we are defining 'strtoll' or 'strtoull',
+   operating on 'long long int's.  */

 #ifdef QUAD
 # define LONG long long
 #ifdef QUAD
 # 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 LLONG_MIN
+# define STRTOL_LONG_MAX LLONG_MAX
+# define STRTOL_ULONG_MAX ULLONG_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 \
+         : ~ TYPE_MAXIMUM (t)))
+# define TYPE_MAXIMUM(t) \
+   ((t) (! TYPE_SIGNED (t) \
+         ? (t) -1 \
+         : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+
+# ifndef ULLONG_MAX
+#  define ULLONG_MAX TYPE_MAXIMUM (unsigned long long)
+# endif
+# ifndef LLONG_MAX
+#  define LLONG_MAX TYPE_MAXIMUM (long long int)
+# endif
+# ifndef LLONG_MIN
+#  define LLONG_MIN TYPE_MINIMUM (long long int)
+# endif
+

 # if __GNUC__ == 2 && __GNUC_MINOR__ < 7
    /* Work around gcc bug with using this constant.  */
 # 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
+   static const unsigned long long int maxquad = ULLONG_MAX;
+#  undef STRTOL_ULONG_MAX
+#  define STRTOL_ULONG_MAX maxquad

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

-
-#ifndef ULONG_MAX
-# define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
-#endif
-#ifndef LONG_MAX
-# define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# define STRTOL_LONG_MIN LONG_MIN
+# define STRTOL_LONG_MAX LONG_MAX
+# define STRTOL_ULONG_MAX ULONG_MAX

 #endif
 #endif

+
+
+/* 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
+# define LOCALE_PARAM
+# define LOCALE_PARAM_PROTO

 #endif
 
 #ifdef USE_WIDE_CHAR
 #endif
 
 #ifdef USE_WIDE_CHAR


@@ -125,25 +192,33 @@ extern int errno;
 # define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
 # define STRING_TYPE wchar_t
 # define L_(Ch) L##Ch
 # define UCHAR_TYPE wint_t
 # define STRING_TYPE wchar_t

-# define ISSPACE(Ch) iswspace (Ch)
-# define ISALPHA(Ch) iswalpha (Ch)
-# define TOUPPER(Ch) towupper (Ch)
+# 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
 #else
 # define L_(Ch) Ch
 # define UCHAR_TYPE unsigned char
 # define STRING_TYPE char

-# define ISSPACE(Ch) isspace (Ch)
-# define ISALPHA(Ch) isalpha (Ch)
-# define TOUPPER(Ch) toupper (Ch)
+# 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
 
 #endif
 

-#ifdef __STDC__
-# define INTERNAL(X) INTERNAL1(X)
-# define INTERNAL1(X) __##X##_internal
-# define WEAKNAME(X) WEAKNAME1(X)
-#else
-# define INTERNAL(X) __/**/X/**/_internal
-#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.  */
 
 #ifdef USE_NUMBER_GROUPING
 /* This file defines a function to check for correct grouping.  */


@@ -151,7 +226,8 @@ extern int errno;
 #endif
 
 
 #endif
 
 

-/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
+
+/* 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.
    If BASE is < 2 or > 36, it is reset to 10.
    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.
    If BASE is < 2 or > 36, it is reset to 10.


@@ -159,11 +235,8 @@ extern int errno;
    one converted is stored in *ENDPTR.  */
 
 INT
    one converted is stored in *ENDPTR.  */
 
 INT

-INTERNAL (strtol) (nptr, endptr, base, group)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **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;
 {
   int negative;
   register unsigned LONG int cutoff;


@@ -175,8 +248,11 @@ INTERNAL (strtol) (nptr, endptr, base, group)
   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;


@@ -185,23 +261,28 @@ INTERNAL (strtol) (nptr, endptr, base, group)
     {
       grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
       if (*grouping <= 0 || *grouping == CHAR_MAX)
     {
       grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
       if (*grouping <= 0 || *grouping == CHAR_MAX)

-       grouping = NULL;
+        grouping = NULL;

       else
       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 (thousands == L'\0')
-           grouping = NULL;
-       }
+        {
+          /* Figure out the thousands separator character.  */
+# 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;
+        }

     }
   else
     grouping = NULL;
 #endif
 
   if (base < 0 || base == 1 || base > 36)
     }
   else
     grouping = NULL;
 #endif
 
   if (base < 0 || base == 1 || base > 36)

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

 
   save = s = nptr;
 
 
   save = s = nptr;
 


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

-  if (base == 16 && s[0] == L_('0') && TOUPPER (s[1]) == L_('X'))
-    s += 2;
-
-  /* If BASE is zero, figure it out ourselves.  */
-  if (base == 0)
-    if (*s == L_('0'))
-      {
-       if (TOUPPER (s[1]) == L_('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;


@@ -252,44 +329,44 @@ INTERNAL (strtol) (nptr, endptr, base, group)
       /* Find the end of the digit string and check its grouping.  */
       end = s;
       for (c = *end; c != L_('\0'); c = *++end)
       /* Find the end of the digit string and check its grouping.  */
       end = s;
       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 ((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)
       if (*s == thousands)

-       end = s;
+        end = s;

       else
       else

-       end = correctly_grouped_prefix (s, end, thousands, grouping);
+        end = correctly_grouped_prefix (s, end, thousands, grouping);

     }
   else
 #endif
     end = NULL;
 
     }
   else
 #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;
   for (c = *s; c != L_('\0'); c = *++s)
     {
       if (s == end)
 
   overflow = 0;
   i = 0;
   for (c = *s; c != L_('\0'); c = *++s)
     {
       if (s == end)

-       break;
+        break;

       if (c >= L_('0') && c <= L_('9'))
       if (c >= L_('0') && c <= L_('9'))

-       c -= L_('0');
+        c -= L_('0');

       else if (ISALPHA (c))
       else if (ISALPHA (c))

-       c = TOUPPER (c) - L_('A') + 10;
+        c = TOUPPER (c) - L_('A') + 10;

       else
       else

-       break;
+        break;

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

-       break;
+        break;

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

-       overflow = 1;
+        overflow = 1;

       else
       else

-       {
-         i *= (unsigned LONG int) base;
-         i += c;
-       }
+        {
+          i *= (unsigned LONG int) base;
+          i += c;
+        }

     }
 
   /* Check if anything actually happened.  */
     }
 
   /* Check if anything actually happened.  */


@@ -303,11 +380,11 @@ INTERNAL (strtol) (nptr, endptr, base, group)
 
 #if !UNSIGNED
   /* Check for a value that is within the range of
 
 #if !UNSIGNED
   /* Check for a value that is within the range of

-     `unsigned LONG int', but outside the range of `LONG int'.  */
+     'unsigned LONG int', but outside the range of 'LONG int'.  */

   if (overflow == 0
       && i > (negative
   if (overflow == 0
       && i > (negative

-             ? -((unsigned LONG int) (LONG_MIN + 1)) + 1
-             : (unsigned LONG int) LONG_MAX))
+              ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
+              : (unsigned LONG int) STRTOL_LONG_MAX))

     overflow = 1;
 #endif
 
     overflow = 1;
 #endif
 


@@ -315,54 +392,42 @@ INTERNAL (strtol) (nptr, endptr, base, group)
     {
       __set_errno (ERANGE);
 #if UNSIGNED
     {
       __set_errno (ERANGE);
 #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:
   /* 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
 
 noconv:
   /* 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`.  */
+     ENDPTR points to the 'x'.  */

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

-    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;
+    {
+      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.  */
 

-#if _LIBC - 0 == 0
-# undef PARAMS
-# if defined (__STDC__) && __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-
-/* Prototype.  */
-INT strtol PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, int base));
-#endif
-

 
 INT
 #ifdef weak_function
 weak_function
 #endif
 
 INT
 #ifdef weak_function
 weak_function
 #endif

-strtol (nptr, endptr, base)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     int base;
+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);

 }
 }