X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=7fb2bb6399cc564b038f6889a5f2fb3f603b5719;hp=03856dc298f163e6f91e28f8b148b84e3130eced;hb=433afcb4fe81e775c15af9d39a6f4db8a53d693a;hpb=70df2f19d2a456224fee54e17066298b307c3667

diff --git a/parse.c b/parse.c
index 03856dc2..7fb2bb63 100644
--- a/parse.c
+++ b/parse.c
@@ -40,6 +40,9 @@ static unsigned long get_mult_bytes(char c)
 		case 'g':
 		case 'G':
 			return 1024 * 1024 * 1024;
+		case 'e':
+		case 'E':
+			return 1024 * 1024 * 1024 * 1024UL;
 		default:
 			return 1;
 	}
@@ -56,7 +59,7 @@ static int str_to_decimal(const char *str, long long *val, int kilo)
 	if (!len)
 		return 1;
 
-	*val = strtol(str, NULL, 10);
+	*val = strtoll(str, NULL, 10);
 	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
@@ -218,8 +221,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 		p1 = strchr(tmp, '-');
 		if (!p1) {
-			ret = 1;
-			break;
+			p1 = strchr(tmp, ':');
+			if (!p1) {
+				ret = 1;
+				break;
+			}
 		}
 
 		p2 = p1 + 1;
@@ -309,8 +315,11 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 	 * Do this before parsing the first round, to check if we should
 	 * copy set 1 options to set 2.
 	 */
-	if (ptr)
+	if (ptr && (o->type != FIO_OPT_STR_STORE)) {
 		ptr2 = strchr(ptr, ',');
+		if (!ptr2)
+			ptr2 = strchr(ptr, ':');
+	}
 
 	/*
 	 * Don't return early if parsing the first option fails - if