# HG changeset patch # User Jim Meyering # Date 906837083 0 # Node ID ed7ad3597c870cbe959d758a8e5d1ace1bf37bb6 # Parent ad218135edca9112ac9517ea0eaeef082f0bbb21 (__xstrtol) [STRING_TO_UNSIGNED]: Return LONGINT_INVALID for strings that begin with `-'. diff --git a/lib/xstrtol.c b/lib/xstrtol.c --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -69,6 +69,18 @@ # define LONG_MAX TYPE_MAXIMUM (long int) #endif +#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) +# define IN_CTYPE_DOMAIN(c) 1 +#else +# define IN_CTYPE_DOMAIN(c) isascii(c) +#endif + +#ifdef isblank +# define ISBLANK(c) (IN_CTYPE_DOMAIN (c) && isblank (c)) +#else +# define ISBLANK(c) ((c) == ' ' || (c) == '\t') +#endif + #include "xstrtol.h" __unsigned long int __strtol (); @@ -107,6 +119,18 @@ p = (ptr ? ptr : &t_ptr); +#if STRING_TO_UNSIGNED + { + const char *q = s; + while (ISBLANK (*q)) + { + ++q; + } + if (*q == '-') + return LONGINT_INVALID; + } +#endif + errno = 0; tmp = __strtol (s, p, strtol_base); if (errno != 0)