mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-29 08:42:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Set errno in strtol family of functions (#110)

Browse source
This commit is contained in:
Alison Winters 2021-03-07 14:18:08 -08:00 • committed by GitHub
parent b16b332539
commit f5da4efcaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libc/fmt/strtol.c
View file

@ -17,6 +17,7 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/fmt/conv.h"
#include "libc/errno.h"
#include "libc/limits.h"
/**
@ -25,5 +26,15 @@
* @param optional_base is recommended as 0 for flexidecimal
*/
long strtol(const char *s, char **opt_out_end, int optional_base) {
return strtoimax(s, opt_out_end, optional_base);
intmax_t res;
res = strtoimax(s, opt_out_end, optional_base);
if (res < LONG_MIN) {
errno = ERANGE;
return LONG_MIN;
}
if (res > LONG_MAX) {
errno = ERANGE;
return LONG_MAX;
}
return res;
}

13
libc/fmt/strtoll.c
View file

@ -17,12 +17,19 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/fmt/conv.h"
#include "libc/errno.h"
#include "libc/limits.h"
long long strtoll(const char *s, char **endptr, int optional_base) {
long long res;
intmax_t res;
res = strtoimax(s, endptr, optional_base);
if (res < LONG_LONG_MIN) return LONG_LONG_MIN;
if (res > LONG_LONG_MAX) return LONG_LONG_MAX;
if (res < LONG_LONG_MIN) {
errno = ERANGE;
return LONG_LONG_MIN;
}
if (res > LONG_LONG_MAX) {
errno = ERANGE;
return LONG_LONG_MAX;
}
return res;
}

13
libc/fmt/strtoul.c
View file

@ -17,12 +17,19 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/fmt/conv.h"
#include "libc/errno.h"
#include "libc/limits.h"
unsigned long strtoul(const char *s, char **endptr, int optional_base) {
unsigned long long res;
intmax_t res;
res = strtoimax(s, endptr, optional_base);
if (res < ULONG_MIN) return ULONG_MIN;
if (res > ULONG_MAX) return ULONG_MAX;
if (res < ULONG_MIN) {
errno = ERANGE;
return ULONG_MIN;
}
if (res > ULONG_MAX) {
errno = ERANGE;
return ULONG_MAX;
}
return res;
}

13
libc/fmt/strtoull.c
View file

@ -17,12 +17,19 @@
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/fmt/conv.h"
#include "libc/errno.h"
#include "libc/limits.h"
unsigned long long strtoull(const char *s, char **endptr, int optional_base) {
unsigned long long res;
intmax_t res;
res = strtoimax(s, endptr, optional_base);
if (res < ULONG_LONG_MIN) return ULONG_LONG_MIN;
if (res > ULONG_LONG_MAX) return ULONG_LONG_MAX;
if (res < ULONG_LONG_MIN) {
errno = ERANGE;
return ULONG_LONG_MIN;
}
if (res > ULONG_LONG_MAX) {
errno = ERANGE;
return ULONG_LONG_MAX;
}
return res;
}

16
test/libc/fmt/strtoimax_test.c
View file

@ -19,6 +19,7 @@
#include "libc/bits/bits.h"
#include "libc/fmt/conv.h"
#include "libc/testlib/testlib.h"
#include "libc/errno.h"
TEST(strtoimax, testZero) {
EXPECT_EQ(0, strtoimax("0", NULL, 0));
@ -57,6 +58,17 @@ TEST(strtoimax, testTwosBane) {
strtoimax("0x80000000000000000000000000000000", NULL, 0));
}
TEST(strtol, neghex) {
ASSERT_EQ(-16, strtol("0xfffffffffffffff0", NULL, 0));
TEST(strtoul, neghex) {
errno = 0;
ASSERT_EQ(-16, (long) strtoul("0xfffffffffffffff0", NULL, 0));
EXPECT_EQ(0, errno);
}
TEST(strtol, testOutsideLimit) {
errno = 0;
EXPECT_EQ(0x7fffffffffffffff, strtol("0x8000000000000000", NULL, 0));
EXPECT_EQ(ERANGE, errno);
errno = 0;
EXPECT_EQ(0x8000000000000000, strtol("-0x8000000000000001", NULL, 0));
EXPECT_EQ(ERANGE, errno);
}

2
third_party/chibicc/as.c vendored
View file

@ -782,7 +782,7 @@ static void Tokenize(struct As *a, int path) {
a->things.p[a->things.n - 1].t = TT_FLOAT;
} else {
APPEND(a->ints);
a->ints.p[a->ints.n - 1] = strtol(p, NULL, 0);
a->ints.p[a->ints.n - 1] = strtoul(p, NULL, 0);
a->things.p[a->things.n - 1].i = a->ints.n - 1;
if (p[i] == 'f' || p[i] == 'F') {
a->things.p[a->things.n - 1].t = TT_FORWARD;