From: Jim Meyering <jim@meyering.net>
Date: Sat, 26 Sep 1998 19:11:23 +0000 (+0000)
Subject: (__xstrtol) [STRING_TO_UNSIGNED]: Return
X-Git-Tag: cvs-readonly~7673
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3bf75404dc0cddbe6bc48df4a02fcaabecfcf791;p=gnulib.git

(__xstrtol) [STRING_TO_UNSIGNED]: Return
LONGINT_INVALID for strings that begin with `-'.
---

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 00d4b117b..f4ba50ba2 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -69,6 +69,18 @@ extern int errno;
 # 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 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
 
   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)