X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=e09b1bbe42998655125d23b00c3b0b7d35214489;hp=d300a219dbef9fcb8a2be1aa643429027916d6ae;hb=ebb1415f729c123b8a13bcbd667bf4b4cc95b4d4;hpb=b1ec1da670aab645e32303ea5ffaa1e5ca336936

diff --git a/parse.c b/parse.c
index d300a219..e09b1bbe 100644
--- a/parse.c
+++ b/parse.c
@@ -16,7 +16,7 @@ static void show_option_range(struct fio_option *o)
 	if (!o->minval && !o->maxval)
 		return;
 
-	printf("%16s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+	printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
 }
 
 static void show_option_values(struct fio_option *o)
@@ -30,7 +30,7 @@ static void show_option_values(struct fio_option *o)
 			break;
 
 		if (!i)
-			printf("%16s: ", "valid values");
+			printf("%20s: ", "valid values");
 
 		printf("%s,", msg);
 		i++;
@@ -197,11 +197,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		const struct value_pair *vp;
 		int i;
 
-		ret = 1;
 		for (i = 0; i < PARSE_MAX_VP; i++) {
 			vp = &o->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)
@@ -257,10 +257,20 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		}
 		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;
@@ -363,7 +373,9 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 	 * Do this before parsing the first round, to check if we should
 	 * copy set 1 options to set 2.
 	 */
-	if (ptr && (o->type != FIO_OPT_STR_STORE)) {
+	if (ptr &&
+	    (o->type != FIO_OPT_STR_STORE) &&
+	    (o->type != FIO_OPT_STR)) {
 		ptr2 = strchr(ptr, ',');
 		if (!ptr2)
 			ptr2 = strchr(ptr, ':');
@@ -435,9 +447,47 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 	return 1;
 }
 
-int show_cmd_help(struct fio_option *options, const char *name)
+/*
+ * Option match, levenshtein distance. Handy for not quite remembering what
+ * the option name is.
+ */
+static int string_distance(const char *s1, const char *s2)
+{
+	unsigned int s1_len = strlen(s1);
+	unsigned int s2_len = strlen(s2);
+	unsigned int *p, *q, *r;
+	unsigned int i, j;
+
+	p = malloc(sizeof(unsigned int) * (s2_len + 1));
+	q = malloc(sizeof(unsigned int) * (s2_len + 1));
+
+	p[0] = 0;
+	for (i = 1; i <= s2_len; i++)
+		p[i] = p[i - 1] + 1;
+
+	for (i = 1; i <= s1_len; i++) {
+		q[0] = p[0] + 1;
+		for (j = 1; j <= s2_len; j++) {
+			unsigned int sub = p[j - 1];
+
+			if (s1[i - 1] != s2[j - 1])
+				sub++;
+
+			q[j] = min(p[j] + 1, min(q[j - 1] + 1, sub));
+		}
+		r = p;
+		p = q;
+		q = r;
+	}
+
+	i = p[s2_len];
+	free(p);
+	free(q);
+	return i;
+}
+
+static void show_option_help(struct fio_option *o)
 {
-	int show_all = !strcmp(name, "all");
 	const char *typehelp[] = {
 		"string (opt=bla)",
 		"string with possible k/m/g postfix (opt=4k)",
@@ -449,15 +499,45 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		"boolean value (opt=1)",
 		"no argument (opt)",
 	};
-	struct fio_option *o;
+
+	printf("%20s: %s\n", "type", typehelp[o->type]);
+	printf("%20s: %s\n", "default", o->def ? o->def : "no default");
+	show_option_range(o);
+	show_option_values(o);
+}
+
+int show_cmd_help(struct fio_option *options, const char *name)
+{
+	struct fio_option *o, *closest;
+	unsigned int best_dist;
 	int found = 0;
+	int show_all = 0;
+
+	if (!name || !strcmp(name, "all"))
+		show_all = 1;
 
+	closest = NULL;
+	best_dist = -1;
 	for (o = &options[0]; o->name; o++) {
-		int match = !strcmp(name, o->name);
+		int match = 0;
+
+		if (name) {
+			if (!strcmp(name, o->name))
+				match = 1;
+			else {
+				unsigned int dist;
+
+				dist = string_distance(name, o->name);
+				if (dist < best_dist) {
+					best_dist = dist;
+					closest = o;
+				}
+			}
+		}
 
 		if (show_all || match) {
 			found = 1;
-			printf("%16s: %s\n", o->name, o->help);
+			printf("%20s: %s\n", o->name, o->help);
 			if (show_all)
 				continue;
 		}
@@ -465,16 +545,20 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		if (!match)
 			continue;
 
-		printf("%16s: %s\n", "type", typehelp[o->type]);
-		printf("%16s: %s\n", "default", o->def ? o->def : "no default");
-		show_option_range(o);
-		show_option_values(o);
+		show_option_help(o);
 	}
 
 	if (found)
 		return 0;
 
-	printf("No such command: %s\n", name);
+	printf("No such command: %s", name);
+	if (closest) {
+		printf(" - showing closest match\n");
+		printf("%20s: %s\n", closest->name, closest->help);
+		show_option_help(closest);
+	} else
+		printf("\n");
+
 	return 1;
 }
 
@@ -505,7 +589,7 @@ void options_init(struct fio_option *options)
 		}
 		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);