tools/nolibc: handle intmax_t/uintmax_t in printf

In nolibc intmax_t and uintmax_t are always the same as
(unsigned) long long/uint64_t as 128bit numbers are not supported.
Even libcs that do support 128bit numbers often fix intmax_t to 64bit
as it is used in ABIs and any change would break those.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>

diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h
index a403351dbf6098ac8292b9589ed8a054b4c5669f..b32b8b794015276ab6242c2be18f860c095f90a3 100644 (file)
--- a/tools/include/nolibc/stdio.h
+++ b/tools/include/nolibc/stdio.h
@@ -286,6 +286,8 @@ int vfprintf(FILE *stream, const char *fmt, va_list args)
                                if (c == 'l') {
                                        /* long format prefix, maintain the escape */
                                        lpref++;
+                               } else if (c == 'j') {
+                                       lpref = 2;
                                }
                                escape = 1;
                                goto do_escape;

diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
index b176a706609b7641dd1d743c8a02b6b6e7a4c746..143dddfcd01a4b35ae7642387911e0f3a3ca606c 100644 (file)
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -1429,6 +1429,8 @@ static int run_vfprintf(int min, int max)
                CASE_TEST(char);         EXPECT_VFPRINTF(1, "c", "%c", 'c'); break;
                CASE_TEST(hex);          EXPECT_VFPRINTF(1, "f", "%x", 0xf); break;
                CASE_TEST(pointer);      EXPECT_VFPRINTF(3, "0x1", "%p", (void *) 0x1); break;
+               CASE_TEST(uintmax_t);    EXPECT_VFPRINTF(20, "18446744073709551615", "%ju", 0xffffffffffffffffULL); break;
+               CASE_TEST(intmax_t);     EXPECT_VFPRINTF(20, "-9223372036854775807", "%jd", 0x8000000000000001LL); break;
                CASE_TEST(scanf);        EXPECT_ZR(1, test_scanf()); break;
                case __LINE__:
                        return ret; /* must be last */