stdlib/FreeBSD/strtoimax.c.patch

   1 --- strtoimax.c.bsdnew  2009-11-13 14:11:51.000000000 -0800
   2 +++ strtoimax.c 2009-11-13 14:11:51.000000000 -0800
   3 @@ -33,6 +33,8 @@ static char sccsid[] = "from @(#)strtol.
   4  #include <sys/cdefs.h>
   5  __FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.12 2007/01/09 00:28:10 imp Exp $");
   6
   7 +#include "xlocale_private.h"
   8 +
   9  #include <ctype.h>
  10  #include <errno.h>
  11  #include <stdlib.h>
  12 @@ -45,7 +47,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
  13   * alphabets and digits are each contiguous.
  14   */
  15  intmax_t
  16 -strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
  17 +strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
  18 +    locale_t loc)
  19  {
  20         const char *s;
  21         uintmax_t acc;
  22 @@ -53,6 +56,7 @@ strtoimax(const char * __restrict nptr,
  23         uintmax_t cutoff;
  24         int neg, any, cutlim;
  25
  26 +       NORMALIZE_LOCALE(loc);
  27         /*
  28          * Skip white space and pick up leading +/- sign if any.
  29          * If base is 0, allow 0x for hex and 0 for octal, else
  30 @@ -61,7 +65,7 @@ strtoimax(const char * __restrict nptr,
  31         s = nptr;
  32         do {
  33                 c = *s++;
  34 -       } while (isspace((unsigned char)c));
  35 +       } while (isspace_l((unsigned char)c, loc));
  36         if (c == '-') {
  37                 neg = 1;
  38                 c = *s++;
  39 @@ -138,3 +142,9 @@ noconv:
  40                 *endptr = (char *)(any ? s - 1 : nptr);
  41         return (acc);
  42  }
  43 +
  44 +intmax_t
  45 +strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
  46 +{
  47 +       return strtoimax_l(nptr, endptr, base, __current_locale());
  48 +}