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

printf: fix printing +-prefixed numbers

Browse Source 
Thanks to Cristian Ionescu-Idbohrn for noticing.

Also fix "%d" '  42' to skip leading whitespace.

function                                             old     new   delta
print_direc                                          435     454     +19
bb_strtoll                                            99     103      +4
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 23/0)               Total: 23 bytes

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
This commit is contained in:
Bernhard Reutner-Fischer 2018-10-19 15:25:41 +02:00
parent 7effa31cd4
commit 3db4e7f84c
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
coreutils/printf.c
View File

@ -191,6 +191,7 @@ static void print_direc(char *format, unsigned fmt_length,
if (have_width - 1 == have_prec) if (have_width - 1 == have_prec)
have_width = NULL; have_width = NULL;
/* multiconvert sets errno = 0, but %s needs it cleared */
errno = 0; errno = 0;
switch (format[fmt_length - 1]) { switch (format[fmt_length - 1]) {
@ -199,7 +200,7 @@ static void print_direc(char *format, unsigned fmt_length,
break; break;
case 'd': case 'd':
case 'i': case 'i':
llv = my_xstrtoll(argument); llv = my_xstrtoll(skip_whitespace(argument));
print_long: print_long:
if (!have_width) { if (!have_width) {
if (!have_prec) if (!have_prec)
@ -217,7 +218,7 @@ static void print_direc(char *format, unsigned fmt_length,
case 'u': case 'u':
case 'x': case 'x':
case 'X': case 'X':
llv = my_xstrtoull(argument); llv = my_xstrtoull(skip_whitespace(argument));
/* cheat: unsigned long and long have same width, so... */ /* cheat: unsigned long and long have same width, so... */
goto print_long; goto print_long;
case 's': case 's':

2
libbb/bb_strtonum.c
View File

@ -81,7 +81,7 @@ long long FAST_FUNC bb_strtoll(const char *arg, char **endp, int base)
/* Check for the weird "feature": /* Check for the weird "feature":
* a "-" string is apparently a valid "number" for strto[u]l[l]! * a "-" string is apparently a valid "number" for strto[u]l[l]!
* It returns zero and errno is 0! :( */ * It returns zero and errno is 0! :( */
first = (arg[0] != '-' ? arg[0] : arg[1]); first = (arg[0] != '-' && arg[0] != '+' ? arg[0] : arg[1]);
if (!isalnum(first)) return ret_ERANGE(); if (!isalnum(first)) return ret_ERANGE();
errno = 0; errno = 0;

33
testsuite/printf.tests
View File

@ -79,6 +79,39 @@ testing "printf understands %Ld" \
"-5\n""0\n" \ "-5\n""0\n" \
"" "" "" ""
testing "printf handles positive numbers for %d" \
"${bb}printf '%d\n' 3 +3 ' 3' ' +3' 2>&1; echo \$?" \
"3\n"\
"3\n"\
"3\n"\
"3\n""0\n" \
"" ""
testing "printf handles positive numbers for %i" \
"${bb}printf '%i\n' 3 +3 ' 3' ' +3' 2>&1; echo \$?" \
"3\n"\
"3\n"\
"3\n"\
"3\n""0\n" \
"" ""
testing "printf handles positive numbers for %x" \
"${bb}printf '%x\n' 42 +42 ' 42' ' +42' 2>&1; echo \$?" \
"2a\n"\
"2a\n"\
"2a\n"\
"2a\n""0\n" \
"" ""
testing "printf handles positive numbers for %f" \
"${bb}printf '%0.3f\n' .42 +.42 ' .42' ' +.42' 2>&1; echo \$?" \
"0.420\n"\
"0.420\n"\
"0.420\n"\
"0.420\n""0\n" \
"" ""
# "FIXED" now to act compatibly # "FIXED" now to act compatibly
## We are "more correct" here than bash/coreutils: they happily print -2 ## We are "more correct" here than bash/coreutils: they happily print -2
## as if it is a huge unsigned number ## as if it is a huge unsigned number