X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=4c6a9ea984ee28475c0f47eeabec549d68e7c55e;hp=d653f5e489458236a6d441a1157fab15396314ed;hb=b347f9daece7d65a6e596cd3bd0ef3602e40b059;hpb=853ee7fc686293cd45fbb177c75114ed2489144d

diff --git a/parse.c b/parse.c
index d653f5e4..4c6a9ea9 100644
--- a/parse.c
+++ b/parse.c
@@ -112,13 +112,18 @@ static unsigned long get_mult_bytes(char c)
  */
 int str_to_decimal(const char *str, long long *val, int kilo)
 {
-	int len;
+	int len, base;
 
 	len = strlen(str);
 	if (!len)
 		return 1;
 
-	*val = strtoll(str, NULL, 10);
+	if (strstr(str, "0x") || strstr(str, "0X"))
+		base = 16;
+	else
+		base = 10;
+
+	*val = strtoll(str, NULL, base);
 	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;