poll: break on EINTR without complaining

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 425411e9860bbada8be0c02988fd71beea3c2c43..239e37141c0fb5be468d9f841844c0ca4c64ba19 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -26,14 +26,11 @@ static int vp_cmp(const void *p1, const void *p2)
        return strlen(vp2->ival) - strlen(vp1->ival);
 }
 
-static int posval_sort(struct fio_option *o, struct value_pair *vpmap)
+static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
 {
        const struct value_pair *vp;
        int entries;
 
-       if (!o->posval[0].ival)
-               return 0;
-
        memset(vpmap, 0, PARSE_MAX_VP * sizeof(struct value_pair));
 
        for (entries = 0; entries < PARSE_MAX_VP; entries++) {
@@ -45,7 +42,6 @@ static int posval_sort(struct fio_option *o, struct value_pair *vpmap)
        }
 
        qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
-       return 1;
 }
 
 static void show_option_range(struct fio_option *o, FILE *out)
@@ -191,6 +187,7 @@ 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);
@@ -199,8 +196,10 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data,
          * Go forward until we hit a non-digit, or +/- sign
          */
        while ((p - str) <= len) {
-               if (!isdigit((int) *p) && (*p != '+') && (*p != '-'))
+               if (!isdigit((int) *p) &&
+                   (((*p != '+') && (*p != '-')) || digit_seen))
                        break;
+               digit_seen |= isdigit((int) *p);
                p++;
        }
 
@@ -491,8 +490,12 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        case FIO_OPT_STR_STORE: {
                fio_opt_str_fn *fn = o->cb;
 
-               if (!posval_sort(o, posval))
+               posval_sort(o, posval);
+
+               if (!o->posval[0].ival) {
+                       vp = NULL;
                        goto match;
+               }
 
                ret = 1;
                for (i = 0; i < PARSE_MAX_VP; i++) {
@@ -516,7 +519,7 @@ match:
                                if (rest) {
                                        *rest = '\0';
                                        ptr = rest + 1;
-                               } else
+                               } else if (vp && vp->cb)
                                        ptr = NULL;
                                break;
                        }