poll: break on EINTR without complaining

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index c2c5bf29a51e8dbd0a5fbe99808e7e9ac277dbdc..239e37141c0fb5be468d9f841844c0ca4c64ba19 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((int) *p);
                p++;
        }
 
@@ -346,6 +349,9 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        double uf;
        char **cp;
        int ret = 0, is_time = 0;
+       const struct value_pair *vp;
+       struct value_pair posval[PARSE_MAX_VP];
+       int i, all_skipped = 1;
 
        dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
                                                        o->type, ptr);
@@ -359,9 +365,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        case FIO_OPT_STR:
        case FIO_OPT_STR_MULTI: {
                fio_opt_str_fn *fn = o->cb;
-               const struct value_pair *vp;
-               struct value_pair posval[PARSE_MAX_VP];
-               int i, all_skipped = 1;
 
                posval_sort(o, posval);
 
@@ -487,19 +490,46 @@ 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 (o->roff1)
-                       cp = (char **) o->roff1;
-               else
-                       cp = td_var(data, o->off1);
+               posval_sort(o, posval);
 
-               *cp = strdup(ptr);
-               if (fn) {
-                       ret = fn(data, ptr);
-                       if (ret) {
-                               free(*cp);
-                               *cp = NULL;
+               if (!o->posval[0].ival) {
+                       vp = NULL;
+                       goto match;
+               }
+
+               ret = 1;
+               for (i = 0; i < PARSE_MAX_VP; i++) {
+                       vp = &posval[i];
+                       if (!vp->ival || vp->ival[0] == '\0')
+                               continue;
+                       all_skipped = 0;
+                       if (!strncmp(vp->ival, ptr, opt_len(ptr))) {
+                               char *rest;
+
+                               ret = 0;
+                               if (vp->cb)
+                                       fn = vp->cb;
+match:
+                               if (o->roff1)
+                                       cp = (char **) o->roff1;
+                               else
+                                       cp = td_var(data, o->off1);
+                               *cp = strdup(ptr);
+                               rest = strstr(*cp, ":");
+                               if (rest) {
+                                       *rest = '\0';
+                                       ptr = rest + 1;
+                               } else if (vp && vp->cb)
+                                       ptr = NULL;
+                               break;
                        }
                }
+
+               if (ret && !all_skipped)
+                       show_option_values(o);
+               else if (fn && ptr)
+                       ret = fn(data, ptr);
+
                break;
        }
        case FIO_OPT_RANGE: {