poll: break on EINTR without complaining

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index 55de4f0b8fa3643703294e640c39ee5b32819ae8..239e37141c0fb5be468d9f841844c0ca4c64ba19 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -184,9 +184,10 @@ 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,
-                                        int *percent, int is_range)
+                                        int *percent)
 {
        const char *p = str;
+       int digit_seen = 0;
 
        if (len < 2)
                return __get_mult_bytes(str, data, percent);
@@ -195,10 +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 != '+'))
-                       break;
-               if (!is_range && (*p != '-'))
+               if (!isdigit((int) *p) &&
+                   (((*p != '+') && (*p != '-')) || digit_seen))
                        break;
+               digit_seen |= isdigit((int) *p);
                p++;
        }
 
@@ -219,7 +220,7 @@ int str_to_float(const char *str, double *val)
 /*
  * convert string into decimal value, noting any size suffix
  */
-int str_to_decimal(const char *str, long long *val, int kilo, int is_range, void *data)
+int str_to_decimal(const char *str, long long *val, int kilo, void *data)
 {
        int len, base;
 
@@ -240,7 +241,7 @@ int str_to_decimal(const char *str, long long *val, int kilo, int is_range, void
                unsigned long long mult;
                int perc = 0;
 
-               mult = get_mult_bytes(str, len, data, &perc, is_range);
+               mult = get_mult_bytes(str, len, data, &perc);
                if (perc)
                        *val = -1ULL - *val;
                else
@@ -251,14 +252,14 @@ int str_to_decimal(const char *str, long long *val, int kilo, int is_range, void
        return 0;
 }
 
-static int check_str_bytes(const char *p, long long *val, int is_range, void *data)
+static int check_str_bytes(const char *p, long long *val, void *data)
 {
-       return str_to_decimal(p, val, 1, is_range, data);
+       return str_to_decimal(p, val, 1, data);
 }
 
 static int check_str_time(const char *p, long long *val)
 {
-       return str_to_decimal(p, val, 0, 0, NULL);
+       return str_to_decimal(p, val, 0, NULL);
 }
 
 void strip_blank_front(char **p)
@@ -295,7 +296,7 @@ static int check_range_bytes(const char *str, long *val, void *data)
 {
        long long __val;
 
-       if (!str_to_decimal(str, &__val, 1, 1, data)) {
+       if (!str_to_decimal(str, &__val, 1, data)) {
                *val = __val;
                return 0;
        }
@@ -404,7 +405,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                if (is_time)
                        ret = check_str_time(ptr, &ull);
                else
-                       ret = check_str_bytes(ptr, &ull, 0, data);
+                       ret = check_str_bytes(ptr, &ull, data);
 
                if (ret)
                        break;