From: Jens Axboe <jens.axboe@oracle.com>
Date: Wed, 23 Dec 2009 07:55:54 +0000 (+0100)
Subject: Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
X-Git-Tag: fio-1.37~6
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=98061ac36a26e216635cba6cf348f36360bd206e;hp=e0c4a4691b78163e8dfca9221147b2b076819cf3

Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
---

diff --git a/parse.c b/parse.c
index 78218615..a55e52b0 100644
--- a/parse.c
+++ b/parse.c
@@ -162,9 +162,19 @@ int str_to_decimal(const char *str, long long *val, int kilo, void *data)
 	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
-	if (kilo)
-		*val *= get_mult_bytes(str[len - 1], data);
-	else
+	if (kilo) {
+		const char *p;
+		/*
+		 * if the last char is 'b' or 'B', the user likely used
+		 * "1gb" instead of just "1g". If the second to last is also
+		 * a letter, adjust.
+		 */
+		p = str + len - 1;
+		if ((*p == 'b' || *p == 'B') && isalpha(*(p - 1)))
+			--p;
+
+		*val *= get_mult_bytes(*p, data);
+	} else
 		*val *= get_mult_time(str[len - 1]);
 
 	return 0;