#include "parse.h"
+static int vp_cmp(const void *p1, const void *p2)
+{
+ const struct value_pair *vp1 = p1;
+ const struct value_pair *vp2 = p2;
+
+ return strlen(vp2->ival) - strlen(vp1->ival);
+}
+
+static void posval_sort(struct fio_option *o, struct value_pair *vpmap)
+{
+ const struct value_pair *vp;
+ int entries;
+
+ memset(vpmap, 0, PARSE_MAX_VP * sizeof(struct value_pair));
+
+ for (entries = 0; entries < PARSE_MAX_VP; entries++) {
+ vp = &o->posval[entries];
+ if (!vp->ival || vp->ival[0] == '\0')
+ break;
+
+ memcpy(&vpmap[entries], vp, sizeof(*vp));
+ }
+
+ qsort(vpmap, entries, sizeof(struct value_pair), vp_cmp);
+}
+
static void show_option_range(struct fio_option *o)
{
if (!o->minval && !o->maxval)
static void show_option_values(struct fio_option *o)
{
- const char *msg;
int i = 0;
do {
- msg = o->posval[i].ival;
- if (!msg)
- break;
+ const struct value_pair *vp = &o->posval[i];
- if (!i)
- printf("%20s: ", "valid values");
+ if (!vp->ival)
+ break;
- printf("%s,", msg);
+ printf("%20s: %-10s", i == 0 ? "valid values" : "", vp->ival);
+ if (vp->help)
+ printf(" %s", vp->help);
+ printf("\n");
i++;
} while (i < PARSE_MAX_VP);
while (isspace(*s))
s++;
+
+ *p = s;
}
void strip_blank_end(char *p)
case FIO_OPT_STR: {
fio_opt_str_fn *fn = o->cb;
const struct value_pair *vp;
+ struct value_pair posval[PARSE_MAX_VP];
int i;
- ret = 1;
+ posval_sort(o, posval);
+
for (i = 0; i < PARSE_MAX_VP; i++) {
- vp = &o->posval[i];
+ vp = &posval[i];
if (!vp->ival || vp->ival[0] == '\0')
break;
+ ret = 1;
if (!strncmp(vp->ival, ptr, strlen(vp->ival))) {
ret = 0;
if (!o->off1)
}
break;
}
- case FIO_OPT_STR_STORE:
+ case FIO_OPT_STR_STORE: {
+ fio_opt_str_fn *fn = o->cb;
+
cp = td_var(data, o->off1);
*cp = strdup(ptr);
+ if (fn) {
+ ret = fn(data, ptr);
+ if (ret) {
+ free(*cp);
+ *cp = NULL;
+ }
+ }
break;
+ }
case FIO_OPT_RANGE: {
char tmp[128];
char *p1, *p2;
ptr2 = strchr(ptr, ',');
if (!ptr2)
ptr2 = strchr(ptr, ':');
+ if (!ptr2)
+ ptr2 = strchr(ptr, '-');
}
/*
"no argument (opt)",
};
+ if (o->alias)
+ printf("%20s: %s\n", "alias", o->alias);
+
printf("%20s: %s\n", "type", typehelp[o->type]);
printf("%20s: %s\n", "default", o->def ? o->def : "no default");
show_option_range(o);
int match = 0;
if (name) {
- if (!strcmp(name, o->name))
+ if (!strcmp(name, o->name) ||
+ (o->alias && !strcmp(name, o->alias)))
match = 1;
else {
unsigned int dist;
if (show_all || match) {
found = 1;
- printf("%20s: %s\n", o->name, o->help);
- if (show_all)
+ if (match)
+ printf("%20s: %s\n", o->name, o->help);
+ if (show_all) {
+ printf("%-20s: %s\n", o->name, o->help);
continue;
+ }
}
if (!match)
o->minval = 0;
o->maxval = 1;
}
+ if (o->type == FIO_OPT_STR_SET && o->def)
+ fprintf(stderr, "Option %s: string set option with default will always be true\n", o->name);
if (!o->cb && !o->off1)
fprintf(stderr, "Option %s: neither cb nor offset given\n", o->name);
- if (o->type == FIO_OPT_STR)
+ if (o->type == FIO_OPT_STR || o->type == FIO_OPT_STR_STORE)
continue;
if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
fprintf(stderr, "Option %s: both cb and offset given\n", o->name);