[klibc] [klibc:update-dash] Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"

klibc-bot for Herbert Xu herbert at gondor.apana.org.au
Thu Jan 24 19:15:53 PST 2019


Commit-ID:  eabc3f03d180c057167d3b9032410e5be2e51b32
Gitweb:     http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=eabc3f03d180c057167d3b9032410e5be2e51b32
Author:     Herbert Xu <herbert at gondor.apana.org.au>
AuthorDate: Sun, 25 Mar 2018 10:33:38 +0800
Committer:  Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 25 Jan 2019 02:57:21 +0000

[klibc] Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"

This reverts commit 7bb413255368e94395237d789f522891093c5774.

The commit breaks printf with more than argument.

Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>

---
 usr/dash/bltin/printf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/dash/bltin/printf.c b/usr/dash/bltin/printf.c
index 9da4ffef..1f1fbde7 100644
--- a/usr/dash/bltin/printf.c
+++ b/usr/dash/bltin/printf.c
@@ -211,6 +211,7 @@ pc:
 				if (print_escape_str(start, param, array,
 						     getstr()))
 					goto out;
+				*fmt = 'b';
 				break;
 			case 'c': {
 				int p = getchr();


More information about the klibc mailing list