Scramble fix

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 445812159585cf1dc490f6a294e278dbe4d2ffca..f52139f5cb0eff2cf85ca10b99db743b567ef174 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -187,16 +187,19 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data,
                                         int *percent)
 {
        const char *p = str;
+       int digit_seen = 0;
 
        if (len < 2)
                return __get_mult_bytes(str, data, percent);
 
         /*
-         * Go forward until we hit a non-digit
+         * Go forward until we hit a non-digit, or +/- sign
          */
        while ((p - str) <= len) {
-               if (!isdigit((int) *p))
+               if (!isdigit((int) *p) &&
+                   (((*p != '+') && (*p != '-')) || digit_seen))
                        break;
+               digit_seen |= isdigit(*p);
                p++;
        }
 
@@ -489,6 +492,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
                posval_sort(o, posval);
 
+               if (!o->posval[0].ival) {
+                       vp = NULL;
+                       goto match;
+               }
+
                ret = 1;
                for (i = 0; i < PARSE_MAX_VP; i++) {
                        vp = &posval[i];
@@ -501,6 +509,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                ret = 0;
                                if (vp->cb)
                                        fn = vp->cb;
+match:
                                if (o->roff1)
                                        cp = (char **) o->roff1;
                                else
@@ -510,7 +519,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                                if (rest) {
                                        *rest = '\0';
                                        ptr = rest + 1;
-                               } else
+                               } else if (vp && vp->cb)
                                        ptr = NULL;
                                break;
                        }