X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=50d8ae5e5f4fe56ea12ba5ff33ca76fe48e114a4;hp=48703b6938a3af666b38e3c8f3ed6c9feaa2b94b;hb=726f6ff06acd3a70b66c1badbc67cb833709b13c;hpb=b46928282e0a890f49250e79b81af773a2b7108f diff --git a/parse.c b/parse.c index 48703b69..50d8ae5e 100644 --- a/parse.c +++ b/parse.c @@ -53,6 +53,8 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo) int len; len = strlen(str); + if (!len) + return 1; *val = strtoul(str, NULL, 10); if (*val == ULONG_MAX && errno == ERANGE) @@ -62,6 +64,7 @@ static int str_to_decimal(const char *str, unsigned long long *val, int kilo) *val *= get_mult_bytes(str[len - 1]); else *val *= get_mult_time(str[len - 1]); + return 0; } @@ -93,10 +96,13 @@ void strip_blank_end(char *p) *(s + 1) = '\0'; } -static int check_range_bytes(char *str, unsigned long *val) +static int check_range_bytes(const char *str, unsigned long *val) { char suffix; + if (!strlen(str)) + return 1; + if (sscanf(str, "%lu%c", val, &suffix) == 2) { *val *= get_mult_bytes(suffix); return 0; @@ -110,6 +116,8 @@ static int check_range_bytes(char *str, unsigned long *val) static int check_int(const char *p, unsigned int *val) { + if (!strlen(p)) + return 1; if (sscanf(p, "%u", val) == 1) return 0; @@ -131,14 +139,26 @@ static struct fio_option *find_option(struct fio_option *options, return NULL; } -static int handle_option(struct fio_option *o, const char *ptr, void *data) +#define val_store(ptr, val, off, data) \ + do { \ + ptr = td_var((data), (off)); \ + *ptr = (val); \ + } while (0) + +static int __handle_option(struct fio_option *o, const char *ptr, void *data, + int first, int more) { unsigned int il, *ilp; unsigned long long ull, *ullp; - unsigned long ul1, ul2, *ulp1, *ulp2; + unsigned long ul1, ul2; char **cp; int ret = 0, is_time = 0; + if (!ptr && o->type != FIO_OPT_STR_SET) { + fprintf(stderr, "Option %s requires an argument\n", o->name); + return 1; + } + switch (o->type) { case FIO_OPT_STR: { fio_opt_str_fn *fn = o->cb; @@ -148,7 +168,8 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) } case FIO_OPT_STR_VAL_TIME: is_time = 1; - case FIO_OPT_STR_VAL: { + case FIO_OPT_STR_VAL: + case FIO_OPT_STR_VAL_INT: { fio_opt_str_val_fn *fn = o->cb; if (is_time) @@ -165,8 +186,17 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) if (fn) ret = fn(data, &ull); else { - ullp = td_var(data, o->off1); - *ullp = ull; + if (o->type == FIO_OPT_STR_VAL_INT) { + if (first) + val_store(ilp, ull, o->off1, data); + if (!more && o->off2) + val_store(ilp, ull, o->off2, data); + } else { + if (first) + val_store(ullp, ull, o->off1, data); + if (!more && o->off2) + val_store(ullp, ull, o->off2, data); + } } break; } @@ -175,9 +205,12 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) *cp = strdup(ptr); break; case FIO_OPT_RANGE: { + char tmp[128]; char *p1, *p2; - p1 = strchr(ptr, '-'); + strncpy(tmp, ptr, sizeof(tmp) - 1); + + p1 = strchr(tmp, '-'); if (!p1) { ret = 1; break; @@ -185,21 +218,28 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) p2 = p1 + 1; *p1 = '\0'; + p1 = tmp; ret = 1; if (!check_range_bytes(p1, &ul1) && !check_range_bytes(p2, &ul2)) { ret = 0; - ulp1 = td_var(data, o->off1); - ulp2 = td_var(data, o->off2); if (ul1 > ul2) { - *ulp1 = ul2; - *ulp2 = ul1; - } else { - *ulp2 = ul2; - *ulp1 = ul1; + unsigned long foo = ul1; + + ul1 = ul2; + ul2 = foo; } - } - + + if (first) { + val_store(ilp, ul1, o->off1, data); + val_store(ilp, ul2, o->off2, data); + } + if (!more && o->off3 && o->off4) { + val_store(ilp, ul1, o->off3, data); + val_store(ilp, ul2, o->off4, data); + } + } + break; } case FIO_OPT_INT: { @@ -215,8 +255,10 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) if (fn) ret = fn(data, &il); else { - ilp = td_var(data, o->off1); - *ilp = il; + if (first) + val_store(ilp, il, o->off1, data); + if (!more && o->off2) + val_store(ilp, il, o->off2, data); } break; } @@ -226,19 +268,50 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data) if (fn) ret = fn(data); else { - ilp = td_var(data, o->off1); - *ilp = 1; + if (first) + val_store(ilp, 1, o->off1, data); + if (!more && o->off2) + val_store(ilp, 1, o->off2, data); } break; } default: - fprintf(stderr, "Bad option type %d\n", o->type); + fprintf(stderr, "Bad option type %u\n", o->type); ret = 1; } return ret; } +static int handle_option(struct fio_option *o, const char *ptr, void *data) +{ + const char *ptr2 = NULL; + int r1, r2; + + /* + * See if we have a second set of parameters, hidden after a comma. + * Do this before parsing the first round, to check if we should + * copy set 1 options to set 2. + */ + if (ptr) + ptr2 = strchr(ptr, ','); + + /* + * Don't return early if parsing the first option fails - if + * we are doing multiple arguments, we can allow the first one + * being empty. + */ + r1 = __handle_option(o, ptr, data, 1, !!ptr2); + + if (!ptr2) + return r1; + + ptr2++; + r2 = __handle_option(o, ptr2, data, 0, 0); + + return r1 && r2; +} + int parse_cmd_option(const char *opt, const char *val, struct fio_option *options, void *data) { @@ -250,7 +323,11 @@ int parse_cmd_option(const char *opt, const char *val, return 1; } - return handle_option(o, val, data); + if (!handle_option(o, val, data)) + return 0; + + fprintf(stderr, "fio: failed parsing %s=%s\n", opt, val); + return 1; } int parse_option(const char *opt, struct fio_option *options, void *data) @@ -259,7 +336,7 @@ int parse_option(const char *opt, struct fio_option *options, void *data) char *pre, *post; char tmp[64]; - strcpy(tmp, opt); + strncpy(tmp, opt, sizeof(tmp) - 1); pre = strchr(tmp, '='); if (pre) { @@ -278,5 +355,9 @@ int parse_option(const char *opt, struct fio_option *options, void *data) return 1; } - return handle_option(o, post, data); + if (!handle_option(o, post, data)) + return 0; + + fprintf(stderr, "fio: failed parsing %s\n", opt); + return 1; }