emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awk: fix corner case in awk_printf

Browse Source 
Example where it wasn't working:
    awk 'BEGIN { printf "qwe %s rty %c uio\n", "a", 0, "c" }'
- the NUL printing in %c caused premature stop of printing.

function                                             old     new   delta
awk_printf                                           593     596      +3

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2021-07-11 18:16:10 +02:00
parent f5f336e787
commit caa93ecdd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editors/awk.c
View File

@ -2359,11 +2359,11 @@ static char *awk_printf(node *n, size_t *len)
* printf "%99999s", "BOOM"
*/
if (c == 'c') {
c = is_numeric(arg) ? getvar_i(arg) : *getvar_s(arg);
s = xasprintf(s, c);
/* + 1 if c == NUL: handle printf "%c" 0 case
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) + (c == '\0');
slen = strlen(s) + (cc == '\0');
} else {
if (c == 's') {
s = xasprintf(s, getvar_s(arg));