Fix bug in $mb_memory keyword

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index e03592d8bd4ee0b7850e2067a847f4caae814f70..97ea4aab47961115a97a16cbbe6b0034e429027d 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -79,6 +79,7 @@ static void show_option_help(struct fio_option *o, FILE *out)
        const char *typehelp[] = {
                "invalid",
                "string (opt=bla)",
+               "string (opt=bla)",
                "string with possible k/m/g postfix (opt=4k)",
                "string with time postfix (opt=10s)",
                "string (opt=bla)",
@@ -167,17 +168,21 @@ static unsigned long long __get_mult_bytes(const char *p, void *data)
 
 static unsigned long long get_mult_bytes(const char *str, int len, void *data)
 {
-       const char *p;
+       const char *p = str;
 
-       /*
-        * if the last char is 'b' or 'B', the user likely used
-        * "1gb" instead of just "1g". If the second to last is also
-        * a letter, adjust.
-        */
-       p = str + len - 1;
-       while (isalpha(*(p - 1)))
-               p--;
-       if (!isalpha(*p))
+       if (len < 2)
+               return __get_mult_bytes(str, data);
+
+        /*
+         * Go forward until we hit a non-digit
+         */
+       while ((p - str) <= len) {
+               if (!isdigit((int) *p))
+                       break;
+               p++;
+       }
+
+       if (!isalpha((int) *p))
                p = NULL;
 
        return __get_mult_bytes(p, data);
@@ -225,7 +230,7 @@ void strip_blank_front(char **p)
 {
        char *s = *p;
 
-       while (isspace(*s))
+       while (isspace((int) *s))
                s++;
 
        *p = s;
@@ -245,7 +250,7 @@ void strip_blank_end(char *p)
                p = s;
 
        s = p + strlen(p);
-       while ((isspace(*s) || iscntrl(*s)) && (s > start))
+       while ((isspace((int) *s) || iscntrl((int) *s)) && (s > start))
                s--;
 
        *(s + 1) = '\0';
@@ -278,6 +283,17 @@ static int check_int(const char *p, int *val)
        return 1;
 }
 
+static int opt_len(const char *str)
+{
+       char *postfix;
+
+       postfix = strchr(str, ':');
+       if (!postfix)
+               return strlen(str);
+
+       return (int)(postfix - str);
+}
+
 #define val_store(ptr, val, off, or, data)             \
        do {                                            \
                ptr = td_var((data), (off));            \
@@ -320,7 +336,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, strlen(ptr))) {
+                       if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
                                ret = 0;
                                if (o->roff1) {
                                        if (vp->or)