From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 7 Feb 2020 12:04:10 +0000 (+0100)
Subject: lib: Improve _parse_integer_fixup_radix base 16 detection
X-Git-Tag: v2020.07-rc1~41^2~4^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0486497e2b5f4d36fa968a1a60fea358cbf70b65;p=oweals%2Fu-boot.git

lib: Improve _parse_integer_fixup_radix base 16 detection

Base autodetection is failing for this case:
if test 257 -gt 3ae; then echo first; else echo second; fi

It is because base for 3ae is recognized by _parse_integer_fixup_radix() as
10. The code detects the first char which is not between 'a'/'A' or 'f'/'F'
to change base from dec to hex.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Shiril Tichkule <shirilt@xlinx.com>
---

diff --git a/lib/strto.c b/lib/strto.c
index 55ff9f7437..1ac2b09c72 100644
--- a/lib/strto.c
+++ b/lib/strto.c
@@ -22,9 +22,22 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
 				*base = 16;
 			else
 				*base = 8;
-		} else
+		} else {
+			int i = 0;
+			char var;
+
 			*base = 10;
+
+			do {
+				var = tolower(s[i++]);
+				if (var >= 'a' && var <= 'f') {
+					*base = 16;
+					break;
+				}
+			} while (var);
+		}
 	}
+
 	if (*base == 16 && s[0] == '0' && tolower(s[1]) == 'x')
 		s += 2;
 	return s;