projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(mkdir): Use pid_t instead of int; check status
[gnulib.git]
/
lib
/
strtol.c
diff --git
a/lib/strtol.c
b/lib/strtol.c
index
025287a
..
6d5f4ac
100644
(file)
--- a/
lib/strtol.c
+++ b/
lib/strtol.c
@@
-1,5
+1,5
@@
/* strtol - Convert string representation of a number into an integer value.
/* strtol - Convert string representation of a number into an integer value.
- Copyright (C) 1991, 92, 94, 95, 96 Free Software Foundation, Inc.
+ Copyright (C) 1991, 92, 94, 95, 96
, 97
Free Software Foundation, Inc.
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.
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.
@@
-129,12
+129,17
@@
extern int errno;
# define ISALPHA(Ch) iswalpha (Ch)
# define TOUPPER(Ch) towupper (Ch)
#else
# define ISALPHA(Ch) iswalpha (Ch)
# define TOUPPER(Ch) towupper (Ch)
#else
+# if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+# else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
+# endif
# define L_(Ch) Ch
# define UCHAR_TYPE unsigned char
# define STRING_TYPE char
# 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
)
+# define ISSPACE(Ch)
(IN_CTYPE_DOMAIN (Ch) && isspace (Ch)
)
+# define ISALPHA(Ch)
(IN_CTYPE_DOMAIN (Ch) && isalpha (Ch)
)
+# define TOUPPER(Ch)
(IN_CTYPE_DOMAIN (Ch) ? toupper (Ch) : (Ch)
)
#endif
#ifdef __STDC__
#endif
#ifdef __STDC__
@@
-201,7
+206,10
@@
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;
+ }
save = s = nptr;
save = s = nptr;
@@
-309,6
+317,8
@@
INTERNAL (strtol) (nptr, endptr, base, group)
? -((unsigned LONG int) (LONG_MIN + 1)) + 1
: (unsigned LONG int) LONG_MAX))
overflow = 1;
? -((unsigned LONG int) (LONG_MIN + 1)) + 1
: (unsigned LONG int) LONG_MAX))
overflow = 1;
+#else
+ overflow |= negative;
#endif
if (overflow)
#endif
if (overflow)