/*
* convert string into decimal value, noting any size suffix
*/
-static int str_to_decimal(const char *str, unsigned long long *val, int kilo)
+static int str_to_decimal(const char *str, long long *val, int kilo)
{
int len;
if (!len)
return 1;
- *val = strtoul(str, NULL, 10);
- if (*val == ULONG_MAX && errno == ERANGE)
+ *val = strtol(str, NULL, 10);
+ if (*val == LONG_MAX && errno == ERANGE)
return 1;
if (kilo)
return 0;
}
-static int check_str_bytes(const char *p, unsigned long long *val)
+static int check_str_bytes(const char *p, long long *val)
{
return str_to_decimal(p, val, 1);
}
-static int check_str_time(const char *p, unsigned long long *val)
+static int check_str_time(const char *p, long long *val)
{
return str_to_decimal(p, val, 0);
}
*(s + 1) = '\0';
}
-static int check_range_bytes(const char *str, unsigned long *val)
+static int check_range_bytes(const char *str, long *val)
{
char suffix;
return 1;
}
-static int check_int(const char *p, unsigned int *val)
+static int check_int(const char *p, int *val)
{
if (!strlen(p))
return 1;
while (o->name) {
if (!strcmp(o->name, opt))
return o;
+ else if (o->alias && !strcmp(o->alias, opt))
+ return o;
o++;
}
static int __handle_option(struct fio_option *o, const char *ptr, void *data,
int first, int more)
{
- unsigned int il, *ilp;
- unsigned long long ull, *ullp;
- unsigned long ul1, ul2;
+ int il, *ilp;
+ long long ull, *ullp;
+ long ul1, ul2;
char **cp;
int ret = 0, is_time = 0;
if (ret)
break;
- if (o->maxval && ull > o->maxval)
- ull = o->maxval;
- if (o->minval && ull < o->minval)
- ull = o->minval;
+ if (o->maxval && ull > o->maxval) {
+ fprintf(stderr, "max value out of range: %lld (%d max)\n", ull, o->maxval);
+ return 1;
+ }
+ if (o->minval && ull < o->minval) {
+ fprintf(stderr, "min value out of range: %lld (%d min)\n", ull, o->minval);
+ return 1;
+ }
if (fn)
ret = fn(data, &ull);
if (ret)
break;
- if (o->maxval && il > o->maxval)
- il = o->maxval;
- if (o->minval && il < o->minval)
- il = o->minval;
+ if (o->maxval && il > (int) o->maxval) {
+ fprintf(stderr, "max value out of range: %d (%d max)\n", il, o->maxval);
+ return 1;
+ }
+ if (o->minval && il < o->minval) {
+ fprintf(stderr, "min value out of range: %d (%d min)\n", il, o->minval);
+ return 1;
+ }
+
+ if (o->neg)
+ il = !il;
if (fn)
ret = fn(data, &il);