All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] tools/nolibc: add support zero pad (0) in printf
@ 2026-01-30  8:37 licheng.li
  2026-01-30  8:37 ` [PATCH 2/2] selftests/nolibc: add tests for printf zero padding (0) licheng.li
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: licheng.li @ 2026-01-30  8:37 UTC (permalink / raw)
  To: Willy Tarreau, David Laight
  Cc: Thomas Weißschuh, linux-kernel, im.lechain

From: Cheng Li <im.lechain@gmail.com>

This patch correctly implements the '0' flag in __nolibc_printf() to
allow zero-padding for numeric and pointer outputs.

Thanks to David for pointing out the errors in the previous implementation.

The logic ensures that the sign ('-') for negative numbers or the prefix
('0x') for pointers is printed before the padding zeros, adhering to
standard printf behavior (e.g., producing "-0005" instead of "000-5").

Examples of the corrected padding logic:
 - ("%05d", -5)  -> "-0005"
 - ("%05p", ptr)  -> "0x00..."

Signed-off-by: Cheng Li <im.lechain@gmail.com>
---
 tools/include/nolibc/stdio.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h
index f31b77f61d3b..8a4af259a31b 100644
--- a/tools/include/nolibc/stdio.h
+++ b/tools/include/nolibc/stdio.h
@@ -267,7 +267,7 @@ int __nolibc_printf(__nolibc_printf_cb cb, intptr_t state, size_t n, const char
 			/* we're in an escape sequence, ofs == 1 */
 			escape = 0;
 
-			if (c == '-') {
+			if (c == '-' || c == '0') {
 				padc = c;
 				c = fmt[ofs++];
 			}
@@ -364,9 +364,21 @@ int __nolibc_printf(__nolibc_printf_cb cb, intptr_t state, size_t n, const char
 			if (n) {
 				w = len < n ? len : n;
 				n -= w;
+				if (padc == '0') {
+					if (outstr[0] == '-') {
+						if (cb(state, outstr, 1) != 0)
+							return -1;
+						outstr++;
+					}
+					if (outstr[0] == '0' && outstr[1] == 'x') {
+						if (cb(state, outstr, 2) != 0)
+							return -1;
+						outstr += 2;
+					}
+				}
 				while (width > w && padc != '-') {
 					written += 1;
-					if (cb(state, " ", 1) != 0)
+					if (cb(state, &padc, 1) != 0)
 						return -1;
 					width--;
 				}
-- 
2.52.0


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2026-02-01  8:56 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-30  8:37 [PATCH 1/2] tools/nolibc: add support zero pad (0) in printf licheng.li
2026-01-30  8:37 ` [PATCH 2/2] selftests/nolibc: add tests for printf zero padding (0) licheng.li
2026-01-30 10:02 ` [PATCH 1/2] tools/nolibc: add support zero pad (0) in printf David Laight
2026-01-30 10:12   ` Cheng Li
2026-01-30 14:58     ` David Laight
2026-01-31  3:44       ` Cheng Li
2026-01-31 10:18 ` Thomas Weißschuh
2026-01-31 12:32   ` David Laight
2026-02-01  0:49     ` Cheng Li
2026-02-01  8:56       ` David Laight

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.