From 8d269ef85984f6476e7fdbec2c5a70f3b5c48a72 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 12 Jul 2021 11:27:11 +0200 Subject: awk: fix printf "%-10c", 0 function old new delta awk_printf 596 626 +30 Signed-off-by: Denys Vlasenko --- editors/awk.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'editors') diff --git a/editors/awk.c b/editors/awk.c index 465033f5f..437d87ecf 100644 --- a/editors/awk.c +++ b/editors/awk.c @@ -2360,10 +2360,11 @@ static char *awk_printf(node *n, size_t *len) */ if (c == 'c') { char cc = is_numeric(arg) ? getvar_i(arg) : *getvar_s(arg); - s = xasprintf(s, cc); - /* + 1 if cc == NUL: handle printf "%c" 0 case - * (and printf "%22c" 0 etc, but still fails for e.g. printf "%-22c" 0) */ - slen = strlen(s) + (cc == '\0'); + char *r = xasprintf(s, cc ? cc : '^' /* else strlen will be wrong */); + slen = strlen(r); + if (cc == '\0') /* if cc is NUL, re-format the string with it */ + sprintf(r, s, cc); + s = r; } else { if (c == 's') { s = xasprintf(s, getvar_s(arg)); -- cgit v1.2.1