Fix bug in parser with postfix and truncated direction values

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index f838a1f625e111f6aa55a5bdf221a4f6352319a4..c2d744b3088f5a4d74f1e94e9ea9631f9b2859e4 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -112,13 +112,18 @@ static unsigned long get_mult_bytes(char c)
  */
 int str_to_decimal(const char *str, long long *val, int kilo)
 {
-       int len;
+       int len, base;
 
        len = strlen(str);
        if (!len)
                return 1;
 
-       *val = strtoll(str, NULL, 10);
+       if (strstr(str, "0x") || strstr(str, "0X"))
+               base = 16;
+       else
+               base = 10;
+
+       *val = strtoll(str, NULL, base);
        if (*val == LONG_MAX && errno == ERANGE)
                return 1;
 
@@ -152,7 +157,7 @@ void strip_blank_front(char **p)
 
 void strip_blank_end(char *p)
 {
-       char *s;
+       char *start = p, *s;
 
        s = strchr(p, ';');
        if (s)
@@ -164,7 +169,7 @@ void strip_blank_end(char *p)
                p = s;
 
        s = p + strlen(p);
-       while ((isspace(*s) || iscntrl(*s)) && (s > p))
+       while ((isspace(*s) || iscntrl(*s)) && (s > start))
                s--;
 
        *(s + 1) = '\0';
@@ -272,6 +277,7 @@ 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_INT:
        case FIO_OPT_STR_VAL:
        case FIO_OPT_STR_VAL_INT: {
                fio_opt_str_val_fn *fn = o->cb;
@@ -298,7 +304,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                if (fn)
                        ret = fn(data, &ull);
                else {
-                       if (o->type == FIO_OPT_STR_VAL_INT) {
+                       if (o->type == FIO_OPT_STR_VAL_INT ||
+                           o->type == FIO_OPT_INT) {
                                if (first)
                                        val_store(ilp, ull, o->off1, data);
                                if (!more && o->off2)
@@ -368,7 +375,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                break;
        }
-       case FIO_OPT_INT:
        case FIO_OPT_BOOL: {
                fio_opt_int_fn *fn = o->cb;
 
@@ -424,12 +430,16 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        return ret;
 }
 
-static int handle_option(struct fio_option *o, const char *ptr, void *data)
+static int handle_option(struct fio_option *o, const char *__ptr, void *data)
 {
-       const char *ptr2 = NULL;
+       char *ptr, *ptr2 = NULL;
        int r1, r2;
 
-       dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, ptr);
+       dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, __ptr);
+
+       ptr = NULL;
+       if (__ptr)
+               ptr = strdup(__ptr);
 
        /*
         * See if we have a second set of parameters, hidden after a comma.
@@ -440,6 +450,8 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
            (o->type != FIO_OPT_STR_STORE) &&
            (o->type != FIO_OPT_STR)) {
                ptr2 = strchr(ptr, ',');
+               if (ptr2 && *(ptr2 + 1) == '\0')
+                       *ptr2 = '\0';
                if (!ptr2)
                        ptr2 = strchr(ptr, ':');
                if (!ptr2)
@@ -453,12 +465,17 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
         */
        r1 = __handle_option(o, ptr, data, 1, !!ptr2);
 
-       if (!ptr2)
+       if (!ptr2) {
+               if (ptr)
+                       free(ptr);
                return r1;
+       }
 
        ptr2++;
        r2 = __handle_option(o, ptr2, data, 0, 0);
 
+       if (ptr)
+               free(ptr);
        return r1 && r2;
 }