From 3db4e7f84cf795de8559ea0d96eaa491999ccf24 Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Fri, 19 Oct 2018 15:25:41 +0200
Subject: [PATCH] printf: fix printing +-prefixed numbers

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>
---
 coreutils/printf.c     |  5 +++--
 libbb/bb_strtonum.c    |  2 +-
 testsuite/printf.tests | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/coreutils/printf.c b/coreutils/printf.c
index a666ff7ac..b2429c5cf 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -191,6 +191,7 @@ static void print_direc(char *format, unsigned fmt_length,
 	if (have_width - 1 == have_prec)
 		have_width = NULL;
 
+	/* multiconvert sets errno = 0, but %s needs it cleared */
 	errno = 0;
 
 	switch (format[fmt_length - 1]) {
@@ -199,7 +200,7 @@ static void print_direc(char *format, unsigned fmt_length,
 		break;
 	case 'd':
 	case 'i':
-		llv = my_xstrtoll(argument);
+		llv = my_xstrtoll(skip_whitespace(argument));
  print_long:
 		if (!have_width) {
 			if (!have_prec)
@@ -217,7 +218,7 @@ static void print_direc(char *format, unsigned fmt_length,
 	case 'u':
 	case 'x':
 	case 'X':
-		llv = my_xstrtoull(argument);
+		llv = my_xstrtoull(skip_whitespace(argument));
 		/* cheat: unsigned long and long have same width, so... */
 		goto print_long;
 	case 's':
diff --git a/libbb/bb_strtonum.c b/libbb/bb_strtonum.c
index 2185017b0..cb70f1053 100644
--- a/libbb/bb_strtonum.c
+++ b/libbb/bb_strtonum.c
@@ -81,7 +81,7 @@ long long FAST_FUNC bb_strtoll(const char *arg, char **endp, int base)
 	/* Check for the weird "feature":
 	 * a "-" string is apparently a valid "number" for strto[u]l[l]!
 	 * 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();
 
 	errno = 0;
diff --git a/testsuite/printf.tests b/testsuite/printf.tests
index 963ded94b..34a65926e 100755
--- a/testsuite/printf.tests
+++ b/testsuite/printf.tests
@@ -79,6 +79,39 @@ testing "printf understands %Ld" \
 	"-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
 ## We are "more correct" here than bash/coreutils: they happily print -2
 ## as if it is a huge unsigned number
-- 
2.25.1