github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tools/nolibc: implement width padding in printf()

Browse Source 
printf can pad each argument to a certain width.
Implement this for compatibility with the kselftest harness.
Currently only padding with spaces is supported.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Acked-by: Willy Tarreau <w@1wt.eu>
This commit is contained in:
Thomas Weißschuh 2025-04-11 11:00:55 +02:00 committed by Thomas Weißschuh
parent b0bd7760df
commit e90ce42e81
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/include/nolibc/stdio.h
View File

@ -220,7 +220,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, intptr_t state, size_t n, const char
{ {
char escape, lpref, c; char escape, lpref, c;
unsigned long long v; unsigned long long v;
unsigned int written; unsigned int written, width;
size_t len, ofs, w; size_t len, ofs, w;
char tmpbuf[21]; char tmpbuf[21];
const char *outstr; const char *outstr;
@ -228,10 +228,20 @@ int __nolibc_printf(__nolibc_printf_cb cb, intptr_t state, size_t n, const char
written = ofs = escape = lpref = 0; written = ofs = escape = lpref = 0;
while (1) { while (1) {
c = fmt[ofs++]; c = fmt[ofs++];
width = 0;
if (escape) { if (escape) {
/* we're in an escape sequence, ofs == 1 */ /* we're in an escape sequence, ofs == 1 */
escape = 0; escape = 0;
/* width */
while (c >= '0' && c <= '9') {
width *= 10;
width += c - '0';
c = fmt[ofs++];
}
if (c == 'c' || c == 'd' || c == 'u' || c == 'x' || c == 'p') { if (c == 'c' || c == 'd' || c == 'u' || c == 'x' || c == 'p') {
char *out = tmpbuf; char *out = tmpbuf;
@ -309,6 +319,11 @@ int __nolibc_printf(__nolibc_printf_cb cb, intptr_t state, size_t n, const char
if (n) { if (n) {
w = len < n ? len : n; w = len < n ? len : n;
n -= w; n -= w;
while (width-- > w) {
if (cb(state, " ", 1) != 0)
break;
written += 1;
}
if (cb(state, outstr, w) != 0) if (cb(state, outstr, w) != 0)
break; break;
} }

3
tools/testing/selftests/nolibc/nolibc-test.c
View File

@ -1414,6 +1414,9 @@ static int run_printf(int min, int max)
CASE_TEST(uintmax_t); EXPECT_VFPRINTF(20, "18446744073709551615", "%ju", 0xffffffffffffffffULL); 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(intmax_t); EXPECT_VFPRINTF(20, "-9223372036854775807", "%jd", 0x8000000000000001LL); break;
CASE_TEST(truncation); EXPECT_VFPRINTF(25, "01234567890123456789", "%s", "0123456789012345678901234"); break; CASE_TEST(truncation); EXPECT_VFPRINTF(25, "01234567890123456789", "%s", "0123456789012345678901234"); break;
CASE_TEST(string_width); EXPECT_VFPRINTF(10, " 1", "%10s", "1"); break;
CASE_TEST(number_width); EXPECT_VFPRINTF(10, " 1", "%10d", 1); break;
CASE_TEST(width_trunc); EXPECT_VFPRINTF(25, " ", "%25d", 1); break;
CASE_TEST(scanf); EXPECT_ZR(1, test_scanf()); break; CASE_TEST(scanf); EXPECT_ZR(1, test_scanf()); break;
case __LINE__: case __LINE__:
return ret; /* must be last */ return ret; /* must be last */