X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=7fb2bb6399cc564b038f6889a5f2fb3f603b5719;hp=29e2ff1ce9d347a8017f1685711264bcdd6900e0;hb=a64181472b3556b6e7b95443d94869f6b61ca7ad;hpb=0c9baf913d6d251973798048d29c60507f486ee6

diff --git a/parse.c b/parse.c
index 29e2ff1c..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;
 
@@ -312,7 +315,7 @@ 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, ':');