X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=b09f20d714d4a8475dcaac682dbcf4ba0e385b36;hp=03856dc298f163e6f91e28f8b148b84e3130eced;hb=07e4b620ecb7f64dc75ac288928f073fb42f4441;hpb=70df2f19d2a456224fee54e17066298b307c3667 diff --git a/parse.c b/parse.c index 03856dc2..b09f20d7 100644 --- a/parse.c +++ b/parse.c @@ -56,7 +56,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 +218,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 +312,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