diff options
| author | ache <ache@FreeBSD.org> | 2001-09-04 16:39:11 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2001-09-04 16:39:11 +0000 |
| commit | cd61d5ab4817c934f249aeb6e7b6ccf8ee382706 (patch) | |
| tree | 7bcee0477a1db7819fa0b437d2bfb0714a1119df /lib/libc/stdlib/strtoll.c | |
| parent | 29e117e97875b5c4c297c48dae32a287e46e1785 (diff) | |
| download | FreeBSD-src-cd61d5ab4817c934f249aeb6e7b6ccf8ee382706.zip FreeBSD-src-cd61d5ab4817c934f249aeb6e7b6ccf8ee382706.tar.gz | |
Locale *is* used in strto*l*(), at least for isspace(), so remove
'locale not used' statement from comments and BUGS section of manpage.
strtol(): fix non-portable 'cutoff' calculation using the same method as
in strtoll().
Cleanup 'cutoff' calculation, remove unneded casts. Misc. cleanup to
make all functions looks the same.
Implement EINVAL reaction per POSIX, document it in manpage, corresponding
POSIX example quotes here:
------------------------------------------------
If the subject sequence is empty or does not have the expected form, no
conversion is performed; the value of str is stored in the object pointed
to by endptr, provided that endptr is not a null pointer.
If no conversion could be performed, 0 shall be returned and errno may be
set to [EINVAL].
[EINVAL] The value of base is not supported.
Since 0, {LONG_MIN} or {LLONG_MIN}, and {LONG_MAX} or {LLONG_MAX} are
returned on error and are also valid returns on success, an application
wishing to check for error situations should set errno to 0, then call
strtol( ) or strtoll ( ), then check errno.
-----------------------------------------------------
Diffstat (limited to 'lib/libc/stdlib/strtoll.c')
| -rw-r--r-- | lib/libc/stdlib/strtoll.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c index b7a7590..08d4f05 100644 --- a/lib/libc/stdlib/strtoll.c +++ b/lib/libc/stdlib/strtoll.c @@ -50,7 +50,7 @@ static const char rcsid[] = /* * Convert a string to a long long integer. * - * Ignores `locale' stuff. Assumes that the upper and lower case + * Assumes that the upper and lower case * alphabets and digits are each contiguous. */ long long @@ -62,7 +62,7 @@ strtoll(nptr, endptr, base) register const char *s; register unsigned long long acc; register unsigned char c; - register unsigned long long qbase, cutoff; + register unsigned long long cutoff; register int neg, any, cutlim; /* @@ -90,6 +90,9 @@ strtoll(nptr, endptr, base) } if (base == 0) base = c == '0' ? 8 : 10; + any = 0; + if (base < 2 || base > 36) + goto noconv; /* * Compute the cutoff value between legal numbers and illegal @@ -106,15 +109,14 @@ strtoll(nptr, endptr, base) * next digit is > 7 (or 8), the number is too big, and we will * return a range error. * - * Set any if any `digits' consumed; make it negative to indicate + * Set 'any' if any `digits' consumed; make it negative to indicate * overflow. */ - qbase = (unsigned)base; cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX : LLONG_MAX; - cutlim = cutoff % qbase; - cutoff /= qbase; - for (acc = 0, any = 0;; c = *s++) { + cutlim = cutoff % base; + cutoff /= base; + for (acc = 0; ; c = *s++) { if (!isascii(c)) break; if (isdigit(c)) @@ -129,16 +131,19 @@ strtoll(nptr, endptr, base) any = -1; else { any = 1; - acc *= qbase; + acc *= base; acc += c; } } if (any < 0) { acc = neg ? LLONG_MIN : LLONG_MAX; errno = ERANGE; + } else if (!any) { +noconv: + errno = EINVAL; } else if (neg) acc = -acc; - if (endptr != 0) + if (endptr != NULL) *endptr = (char *)(any ? s - 1 : nptr); return (acc); } |
