diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c --- a/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c +++ b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c @@ -94,6 +94,12 @@ { "01234567", 342391, 0, NULL }, { "0123456789", 123456789, 10, NULL }, { "0x75bcd15", 123456789, 0, NULL }, +#ifdef __FreeBSD__ + { "0x", 0, 0, "x" }, + { "0b111010110111100110100010101", 123456789, 0, NULL }, + { "0b0123", 1, 0, "23" }, + { "0b", 0, 0, "b" }, +#endif }; long long int lli; diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -17,6 +17,8 @@ ATF_TESTS_C+= printbasic_test ATF_TESTS_C+= printfloat_test ATF_TESTS_C+= scanfloat_test +ATF_TESTS_C+= snprintf_test +ATF_TESTS_C+= sscanf_test SRCS.fopen2_test= fopen_test.c diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c new file mode 100644 --- /dev/null +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -0,0 +1,138 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include + +#define SNPRINTF_TEST(output, format, ...) \ + do { \ + char buf[256]; \ + assert(output == NULL || strlen(output) < sizeof(buf)); \ + int ret = snprintf(buf, sizeof(buf), format, __VA_ARGS__); \ + if (output == NULL) { \ + ATF_CHECK_EQ(-1, ret); \ + } else { \ + ATF_CHECK_EQ(strlen(output), ret); \ + if (ret > 0) { \ + ATF_CHECK_STREQ(output, buf); \ + } \ + } \ + } while (0) + +ATF_TC_WITHOUT_HEAD(snprintf_b); +ATF_TC_BODY(snprintf_b, tc) +{ + SNPRINTF_TEST("0", "%b", 0); + SNPRINTF_TEST(" 0", "%12b", 0); + SNPRINTF_TEST("000000000000", "%012b", 0); + SNPRINTF_TEST("1", "%b", 1); + SNPRINTF_TEST(" 1", "%12b", 1); + SNPRINTF_TEST("000000000001", "%012b", 1); + SNPRINTF_TEST("1111111111111111111111111111111", "%b", INT_MAX); + SNPRINTF_TEST("0", "%#b", 0); + SNPRINTF_TEST(" 0", "%#12b", 0); + SNPRINTF_TEST("000000000000", "%#012b", 0); + SNPRINTF_TEST("0b1", "%#b", 1); + SNPRINTF_TEST(" 0b1", "%#12b", 1); + SNPRINTF_TEST("0b0000000001", "%#012b", 1); + SNPRINTF_TEST("0b1111111111111111111111111111111", "%#b", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(snprintf_B); +ATF_TC_BODY(snprintf_B, tc) +{ + SNPRINTF_TEST("0", "%B", 0); + SNPRINTF_TEST(" 0", "%12B", 0); + SNPRINTF_TEST("000000000000", "%012B", 0); + SNPRINTF_TEST("1", "%B", 1); + SNPRINTF_TEST(" 1", "%12B", 1); + SNPRINTF_TEST("000000000001", "%012B", 1); + SNPRINTF_TEST("1111111111111111111111111111111", "%B", INT_MAX); + SNPRINTF_TEST("0", "%#B", 0); + SNPRINTF_TEST(" 0", "%#12B", 0); + SNPRINTF_TEST("000000000000", "%#012B", 0); + SNPRINTF_TEST("0B1", "%#B", 1); + SNPRINTF_TEST(" 0B1", "%#12B", 1); + SNPRINTF_TEST("0B0000000001", "%#012B", 1); + SNPRINTF_TEST("0B1111111111111111111111111111111", "%#B", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(snprintf_d); +ATF_TC_BODY(snprintf_d, tc) +{ + SNPRINTF_TEST("0", "%d", 0); + SNPRINTF_TEST(" 0", "%12d", 0); + SNPRINTF_TEST("000000000000", "%012d", 0); + SNPRINTF_TEST("1", "%d", 1); + SNPRINTF_TEST(" 1", "%12d", 1); + SNPRINTF_TEST("000000000001", "%012d", 1); + SNPRINTF_TEST("2147483647", "%d", INT_MAX); + SNPRINTF_TEST(" 2147483647", "%12d", INT_MAX); + SNPRINTF_TEST("002147483647", "%012d", INT_MAX); + SNPRINTF_TEST("2,147,483,647", "%'d", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(snprintf_x); +ATF_TC_BODY(snprintf_x, tc) +{ + SNPRINTF_TEST("0", "%x", 0); + SNPRINTF_TEST(" 0", "%12x", 0); + SNPRINTF_TEST("000000000000", "%012x", 0); + SNPRINTF_TEST("1", "%x", 1); + SNPRINTF_TEST(" 1", "%12x", 1); + SNPRINTF_TEST("000000000001", "%012x", 1); + SNPRINTF_TEST("7fffffff", "%x", INT_MAX); + SNPRINTF_TEST(" 7fffffff", "%12x", INT_MAX); + SNPRINTF_TEST("00007fffffff", "%012x", INT_MAX); + SNPRINTF_TEST("0", "%#x", 0); + SNPRINTF_TEST(" 0", "%#12x", 0); + SNPRINTF_TEST("000000000000", "%#012x", 0); + SNPRINTF_TEST("0x1", "%#x", 1); + SNPRINTF_TEST(" 0x1", "%#12x", 1); + SNPRINTF_TEST("0x0000000001", "%#012x", 1); + SNPRINTF_TEST("0x7fffffff", "%#x", INT_MAX); + SNPRINTF_TEST(" 0x7fffffff", "%#12x", INT_MAX); + SNPRINTF_TEST("0x007fffffff", "%#012x", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(snprintf_X); +ATF_TC_BODY(snprintf_X, tc) +{ + SNPRINTF_TEST("0", "%X", 0); + SNPRINTF_TEST(" 0", "%12X", 0); + SNPRINTF_TEST("000000000000", "%012X", 0); + SNPRINTF_TEST("1", "%X", 1); + SNPRINTF_TEST(" 1", "%12X", 1); + SNPRINTF_TEST("000000000001", "%012X", 1); + SNPRINTF_TEST("7FFFFFFF", "%X", INT_MAX); + SNPRINTF_TEST(" 7FFFFFFF", "%12X", INT_MAX); + SNPRINTF_TEST("00007FFFFFFF", "%012X", INT_MAX); + SNPRINTF_TEST("0", "%#X", 0); + SNPRINTF_TEST(" 0", "%#12X", 0); + SNPRINTF_TEST("000000000000", "%#012X", 0); + SNPRINTF_TEST("0X1", "%#X", 1); + SNPRINTF_TEST(" 0X1", "%#12X", 1); + SNPRINTF_TEST("0X0000000001", "%#012X", 1); + SNPRINTF_TEST("0X7FFFFFFF", "%#X", INT_MAX); + SNPRINTF_TEST(" 0X7FFFFFFF", "%#12X", INT_MAX); + SNPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); +} + +ATF_TP_ADD_TCS(tp) +{ + setlocale(LC_NUMERIC, "en_US.UTF-8"); + ATF_TP_ADD_TC(tp, snprintf_b); + ATF_TP_ADD_TC(tp, snprintf_B); + ATF_TP_ADD_TC(tp, snprintf_d); + ATF_TP_ADD_TC(tp, snprintf_x); + ATF_TP_ADD_TC(tp, snprintf_X); + return (atf_no_error()); +} diff --git a/lib/libc/tests/stdio/sscanf_test.c b/lib/libc/tests/stdio/sscanf_test.c new file mode 100644 --- /dev/null +++ b/lib/libc/tests/stdio/sscanf_test.c @@ -0,0 +1,117 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include + +#define SSCANF_TEST(string, format, expret, expval, explen) \ + do { \ + int ret, val, len; \ + ret = sscanf(string, format "%n", &val, &len); \ + ATF_CHECK_EQ(expret, ret); \ + if (expret && ret) { \ + ATF_CHECK_EQ(expval, val); \ + ATF_CHECK_EQ(explen, len); \ + } \ + } while (0) + +ATF_TC_WITHOUT_HEAD(sscanf_b); +ATF_TC_BODY(sscanf_b, tc) +{ + SSCANF_TEST("0", "%b", 1, 0, 1); + SSCANF_TEST("1", "%b", 1, 1, 1); + SSCANF_TEST("01", "%b", 1, 1, 2); + SSCANF_TEST("012", "%b", 1, 1, 2); + SSCANF_TEST("0b0", "%b", 1, 0, 3); + SSCANF_TEST("0b1", "%b", 1, 1, 3); + SSCANF_TEST("0b01", "%b", 1, 1, 4); + SSCANF_TEST("0b012", "%b", 1, 1, 4); + SSCANF_TEST("0B0", "%b", 1, 0, 3); + SSCANF_TEST("0B1", "%b", 1, 1, 3); + SSCANF_TEST("0B01", "%b", 1, 1, 4); + SSCANF_TEST("0B012", "%b", 1, 1, 4); + SSCANF_TEST("0b", "%b", 1, 0, 1); + SSCANF_TEST("0B", "%b", 1, 0, 1); +} + +ATF_TC_WITHOUT_HEAD(sscanf_x); +ATF_TC_BODY(sscanf_x, tc) +{ + SSCANF_TEST("0", "%x", 1, 0, 1); + SSCANF_TEST("1", "%x", 1, 1, 1); + SSCANF_TEST("a", "%x", 1, 0xa, 1); + SSCANF_TEST("f", "%x", 1, 0xf, 1); + SSCANF_TEST("0b", "%x", 1, 0xb, 2); + SSCANF_TEST("0b0", "%x", 1, 0xb0, 3); + SSCANF_TEST("7fffffff", "%x", 1, INT_MAX, 8); + SSCANF_TEST("A", "%x", 1, 0xa, 1); + SSCANF_TEST("F", "%x", 1, 0xf, 1); + SSCANF_TEST("0B", "%X", 1, 0xb, 2); + SSCANF_TEST("0B0", "%x", 1, 0xb0, 3); + SSCANF_TEST("7FFFFFFF", "%x", 1, INT_MAX, 8); + SSCANF_TEST("80000000", "%x", 1, INT_MIN, 8); + SSCANF_TEST("0x0", "%x", 1, 0, 3); + SSCANF_TEST("0x1", "%x", 1, 1, 3); + SSCANF_TEST("0xa", "%x", 1, 0xa, 3); + SSCANF_TEST("0xf", "%x", 1, 0xf, 3); + SSCANF_TEST("0x7fffffff", "%x", 1, INT_MAX, 10); + SSCANF_TEST("0x80000000", "%x", 1, INT_MIN, 10); + SSCANF_TEST("0x", "%x", 1, 0, 1); + SSCANF_TEST("0X0", "%x", 1, 0, 3); + SSCANF_TEST("0X1", "%x", 1, 1, 3); + SSCANF_TEST("0XA", "%x", 1, 0xa, 3); + SSCANF_TEST("0XF", "%x", 1, 0xf, 3); + SSCANF_TEST("0X7FFFFFFF", "%x", 1, INT_MAX, 10); + SSCANF_TEST("0X80000000", "%x", 1, INT_MIN, 10); + SSCANF_TEST("0X", "%x", 1, 0, 1); +} + +ATF_TC_WITHOUT_HEAD(sscanf_i); +ATF_TC_BODY(sscanf_i, tc) +{ + SSCANF_TEST("0", "%i", 1, 0, 1); + SSCANF_TEST("01", "%i", 1, 1, 2); + SSCANF_TEST("07", "%i", 1, 7, 2); + SSCANF_TEST("08", "%i", 1, 0, 1); + SSCANF_TEST("0b0", "%i", 1, 0, 3); + SSCANF_TEST("0b1", "%i", 1, 1, 3); + SSCANF_TEST("0b01", "%i", 1, 1, 4); + SSCANF_TEST("0b012", "%i", 1, 1, 4); + SSCANF_TEST("0B0", "%i", 1, 0, 3); + SSCANF_TEST("0B1", "%i", 1, 1, 3); + SSCANF_TEST("0B01", "%i", 1, 1, 4); + SSCANF_TEST("0B012", "%i", 1, 1, 4); + SSCANF_TEST("0b", "%i", 1, 0, 1); + SSCANF_TEST("0B", "%i", 1, 0, 1); + SSCANF_TEST("0x0", "%i", 1, 0, 3); + SSCANF_TEST("0x1", "%i", 1, 1, 3); + SSCANF_TEST("0xa", "%i", 1, 0xa, 3); + SSCANF_TEST("0xf", "%i", 1, 0xf, 3); + SSCANF_TEST("0x7fffffff", "%i", 1, INT_MAX, 10); + SSCANF_TEST("0x80000000", "%i", 1, INT_MIN, 10); + SSCANF_TEST("0x", "%i", 1, 0, 1); + SSCANF_TEST("0X0", "%i", 1, 0, 3); + SSCANF_TEST("0X1", "%i", 1, 1, 3); + SSCANF_TEST("0XA", "%i", 1, 0xa, 3); + SSCANF_TEST("0XF", "%i", 1, 0xf, 3); + SSCANF_TEST("0X7FFFFFFF", "%i", 1, INT_MAX, 10); + SSCANF_TEST("0X80000000", "%i", 1, INT_MIN, 10); + SSCANF_TEST("0X", "%i", 1, 0, 1); +} + +ATF_TP_ADD_TCS(tp) +{ + setlocale(LC_NUMERIC, "en_US.UTF-8"); + ATF_TP_ADD_TC(tp, sscanf_b); + ATF_TP_ADD_TC(tp, sscanf_x); + ATF_TP_ADD_TC(tp, sscanf_i); + return (atf_no_error()); +}