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)
while (o->name) {
if (!strcmp(o->name, opt))
return o;
+ else if (o->alias && !strcmp(o->alias, opt))
+ return o;
o++;
}
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 > (int) 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);