From dace1947ddb6a9ecbfcad216e784e8e74df60967 Mon Sep 17 00:00:00 2001 From: CYFS <2805686936@qq.com> Date: Mon, 2 Nov 2026 13:33:19 +0800 Subject: [PATCH] [klibc] Fix tiny vsnprintf long long formatting --- src/klibc/rt_vsnprintf_tiny.c | 17 ++++++++++++++++- src/klibc/utest/TC_rt_sprintf.c | 6 ++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/klibc/rt_vsnprintf_tiny.c b/src/klibc/rt_vsnprintf_tiny.c index 0d4fdda67f..3abf41d0d4 100644 --- a/src/klibc/rt_vsnprintf_tiny.c +++ b/src/klibc/rt_vsnprintf_tiny.c @@ -109,7 +109,15 @@ static char *print_number(char *buf, num = (rt_uint16_t)-num; } break; +#ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG case 'L': + if (num > (~0ULL >> 1)) + { + sign = '-'; + num = 0ULL - num; + } + break; +#endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */ case 'l': if ((long)num < 0) { @@ -595,7 +603,14 @@ int rt_vsnprintf(char *buf, size_t size, const char *fmt, va_list args) if (qualifier == 'L') { - num = va_arg(args, unsigned long long); + if (flags & SIGN) + { + num = (unsigned long long)va_arg(args, long long); + } + else + { + num = va_arg(args, unsigned long long); + } } else if (qualifier == 'l') { diff --git a/src/klibc/utest/TC_rt_sprintf.c b/src/klibc/utest/TC_rt_sprintf.c index 5b3fe5c0d7..0c32865d6e 100644 --- a/src/klibc/utest/TC_rt_sprintf.c +++ b/src/klibc/utest/TC_rt_sprintf.c @@ -913,10 +913,12 @@ SPRINTF_TEST_CASE(integer_types) SPRINTF_CHECK("2147483647", buffer, "%li", 2147483647L); #ifdef RT_KLIBC_USING_VSNPRINTF_LONGLONG SPRINTF_CHECK("30", buffer, "%lli", 30LL); -#ifdef RT_KLIBC_USING_VSNPRINTF_STANDARD SPRINTF_CHECK("-9223372036854775807", buffer, "%lli", -9223372036854775807LL); SPRINTF_CHECK("9223372036854775807", buffer, "%lli", 9223372036854775807LL); -#endif /* RT_KLIBC_USING_VSNPRINTF_STANDARD */ + SPRINTF_CHECK("-2147483648", buffer, "%lld", (long long)(rt_int64_t)-2147483648LL); + SPRINTF_CHECK("4294967295", buffer, "%lld", (long long)(rt_int64_t)RT_UINT32_MAX); + SPRINTF_CHECK("-9223372036854775808", buffer, "%lld", (long long)(-9223372036854775807LL - 1LL)); + SPRINTF_CHECK("9223372036854775807", buffer, "%lld", 9223372036854775807LL); #endif /* RT_KLIBC_USING_VSNPRINTF_LONGLONG */ SPRINTF_CHECK("100000", buffer, "%lu", 100000L); SPRINTF_CHECK("4294967295", buffer, "%lu", 0xFFFFFFFFL);