parser: always match the correct option length for posval options

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 8aaf7992754f1de3e42211a1e3b9c1ef05eddb06..18c4530183dbb7b74ca4b97a2e6edf3e181c9595 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -14,6 +14,7 @@
 #include "parse.h"
 #include "debug.h"
 #include "options.h"
+#include "minmax.h"
 
 static struct fio_option *fio_options;
 extern unsigned int fio_get_kb_base(void *);
@@ -180,6 +181,7 @@ static unsigned long long __get_mult_bytes(const char *p, void *data,
                pow = 1;
        else if (!strcmp("%", c)) {
                *percent = 1;
+               free(c);
                return ret;
        }
 
@@ -342,6 +344,11 @@ static int opt_len(const char *str)
        return (int)(postfix - str);
 }
 
+static int str_match_len(const struct value_pair *vp, const char *str)
+{
+       return max(strlen(vp->ival), opt_len(str));
+}
+
 #define val_store(ptr, val, off, or, data)             \
        do {                                            \
                ptr = td_var((data), (off));            \
@@ -359,7 +366,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        long long ull, *ullp;
        long ul1, ul2;
        double uf;
-       char **cp;
+       char **cp = NULL;
        int ret = 0, is_time = 0;
        const struct value_pair *vp;
        struct value_pair posval[PARSE_MAX_VP];
@@ -386,7 +393,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                        if (!vp->ival || vp->ival[0] == '\0')
                                continue;
                        all_skipped = 0;
-                       if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+                       if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
                                ret = 0;
                                if (o->roff1) {
                                        if (vp->or)
@@ -413,23 +420,29 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        case FIO_OPT_INT:
        case FIO_OPT_STR_VAL: {
                fio_opt_str_val_fn *fn = o->cb;
+               char tmp[128], *p;
+
+               strncpy(tmp, ptr, sizeof(tmp) - 1);
+               p = strchr(tmp, ',');
+               if (p)
+                       *p = '\0';
 
                if (is_time)
-                       ret = check_str_time(ptr, &ull);
+                       ret = check_str_time(tmp, &ull);
                else
-                       ret = check_str_bytes(ptr, &ull, data);
+                       ret = check_str_bytes(tmp, &ull, data);
 
                if (ret)
                        break;
 
                if (o->maxval && ull > o->maxval) {
-                       log_err("max value out of range: %lld"
-                                       " (%d max)\n", ull, o->maxval);
+                       log_err("max value out of range: %llu"
+                                       " (%u max)\n", ull, o->maxval);
                        return 1;
                }
                if (o->minval && ull < o->minval) {
-                       log_err("min value out of range: %lld"
-                                       " (%d min)\n", ull, o->minval);
+                       log_err("min value out of range: %llu"
+                                       " (%u min)\n", ull, o->minval);
                        return 1;
                }
 
@@ -443,12 +456,32 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                        else
                                                val_store(ilp, ull, o->off1, 0, data);
                                }
-                               if (!more) {
+                               if (curr == 1) {
                                        if (o->roff2)
                                                *(unsigned int *) o->roff2 = ull;
                                        else if (o->off2)
                                                val_store(ilp, ull, o->off2, 0, data);
                                }
+                               if (curr == 2) {
+                                       if (o->roff3)
+                                               *(unsigned int *) o->roff3 = ull;
+                                       else if (o->off3)
+                                               val_store(ilp, ull, o->off3, 0, data);
+                               }
+                               if (!more) {
+                                       if (curr < 1) {
+                                               if (o->roff2)
+                                                       *(unsigned int *) o->roff2 = ull;
+                                               else if (o->off2)
+                                                       val_store(ilp, ull, o->off2, 0, data);
+                                       }
+                                       if (curr < 2) {
+                                               if (o->roff3)
+                                                       *(unsigned int *) o->roff3 = ull;
+                                               else if (o->off3)
+                                                       val_store(ilp, ull, o->off3, 0, data);
+                                       }
+                               }
                        } else {
                                if (first) {
                                        if (o->roff1)
@@ -478,7 +511,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                        o->maxlen);
                        return 1;
                }
-               if(!str_to_float(ptr, &uf)){
+               if (!str_to_float(ptr, &uf)){
                        log_err("not a floating point value: %s\n", ptr);
                        return 1;
                }
@@ -508,8 +541,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                cp = td_var(data, o->off1);
 
                        *cp = strdup(ptr);
-               } else {
-                       cp = NULL;
                }
 
                if (fn)
@@ -523,7 +554,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                if (!vp->ival || vp->ival[0] == '\0')
                                        continue;
                                all_skipped = 0;
-                               if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+                               if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
                                        char *rest;
 
                                        ret = 0;
@@ -597,12 +628,43 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                else
                                        val_store(ilp, ul2, o->off2, 0, data);
                        }
-                       if (o->roff3 && o->roff4) {
-                               *(unsigned int *) o->roff3 = ul1;
-                               *(unsigned int *) o->roff4 = ul2;
-                       } else if (o->off3 && o->off4) {
-                               val_store(ilp, ul1, o->off3, 0, data);
-                               val_store(ilp, ul2, o->off4, 0, data);
+                       if (curr == 1) {
+                               if (o->roff3 && o->roff4) {
+                                       *(unsigned int *) o->roff3 = ul1;
+                                       *(unsigned int *) o->roff4 = ul2;
+                               } else if (o->off3 && o->off4) {
+                                       val_store(ilp, ul1, o->off3, 0, data);
+                                       val_store(ilp, ul2, o->off4, 0, data);
+                               }
+                       }
+                       if (curr == 2) {
+                               if (o->roff5 && o->roff6) {
+                                       *(unsigned int *) o->roff5 = ul1;
+                                       *(unsigned int *) o->roff6 = ul2;
+                               } else if (o->off5 && o->off6) {
+                                       val_store(ilp, ul1, o->off5, 0, data);
+                                       val_store(ilp, ul2, o->off6, 0, data);
+                               }
+                       }
+                       if (!more) {
+                               if (curr < 1) {
+                                       if (o->roff3 && o->roff4) {
+                                               *(unsigned int *) o->roff3 = ul1;
+                                               *(unsigned int *) o->roff4 = ul2;
+                                       } else if (o->off3 && o->off4) {
+                                               val_store(ilp, ul1, o->off3, 0, data);
+                                               val_store(ilp, ul2, o->off4, 0, data);
+                                       }
+                               }
+                               if (curr < 2) {
+                                       if (o->roff5 && o->roff6) {
+                                               *(unsigned int *) o->roff5 = ul1;
+                                               *(unsigned int *) o->roff6 = ul2;
+                                       } else if (o->off5 && o->off6) {
+                                               val_store(ilp, ul1, o->off5, 0, data);
+                                               val_store(ilp, ul2, o->off6, 0, data);
+                                       }
+                               }
                        }
                }
 
@@ -706,7 +768,7 @@ static int handle_option(struct fio_option *o, const char *__ptr, void *data)
                        ptr2 = strchr(ptr, ',');
                        if (ptr2 && *(ptr2 + 1) == '\0')
                                *ptr2 = '\0';
-                       if (o->type != FIO_OPT_STR_MULTI) {
+                       if (o->type != FIO_OPT_STR_MULTI && o->type != FIO_OPT_RANGE) {
                                if (!ptr2)
                                        ptr2 = strchr(ptr, ':');
                                if (!ptr2)
@@ -1029,6 +1091,10 @@ void option_init(struct fio_option *o)
                o->minval = 0;
                o->maxval = 1;
        }
+       if (o->type == FIO_OPT_INT) {
+               if (!o->maxval)
+                       o->maxval = UINT_MAX;
+       }
        if (o->type == FIO_OPT_FLOAT_LIST) {
                o->minfp = NAN;
                o->maxfp = NAN;