X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=5043374405d8a1e262687a5a1bdcac90f18990cf;hp=8a2e6f215f0ba1f3df53abb2e3e9774a7180af17;hb=29d43ff9b1f342fe6658b17f0e349afcb6b76014;hpb=8cdabc1df71ec546d47ba4eb1190b8c7b6e62f9a

diff --git a/parse.c b/parse.c
index 8a2e6f21..50433744 100644
--- a/parse.c
+++ b/parse.c
@@ -46,7 +46,10 @@ static void show_option_range(struct fio_option *o)
 	if (!o->minval && !o->maxval)
 		return;
 
-	printf("%20s: min=%d, max=%d\n", "range", o->minval, o->maxval);
+	printf("%20s: min=%d", "range", o->minval);
+	if (o->maxval)
+		printf(", max=%d", o->maxval);
+	printf("\n");
 }
 
 static void show_option_values(struct fio_option *o)
@@ -112,13 +115,18 @@ static unsigned long get_mult_bytes(char c)
  */
 int str_to_decimal(const char *str, long long *val, int kilo)
 {
-	int len;
+	int len, base;
 
 	len = strlen(str);
 	if (!len)
 		return 1;
 
-	*val = strtoll(str, NULL, 10);
+	if (strstr(str, "0x") || strstr(str, "0X"))
+		base = 16;
+	else
+		base = 10;
+
+	*val = strtoll(str, NULL, base);
 	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
@@ -152,7 +160,7 @@ void strip_blank_front(char **p)
 
 void strip_blank_end(char *p)
 {
-	char *s;
+	char *start = p, *s;
 
 	s = strchr(p, ';');
 	if (s)
@@ -164,7 +172,7 @@ void strip_blank_end(char *p)
 		p = s;
 
 	s = p + strlen(p);
-	while ((isspace(*s) || iscntrl(*s)) && (s > p))
+	while ((isspace(*s) || iscntrl(*s)) && (s > start))
 		s--;
 
 	*(s + 1) = '\0';
@@ -236,7 +244,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	dprint(FD_PARSE, "__handle_option=%s, type=%d, ptr=%s\n", o->name,
 							o->type, ptr);
 
-	if (!ptr && o->type != FIO_OPT_STR_SET) {
+	if (!ptr && o->type != FIO_OPT_STR_SET && o->type != FIO_OPT_STR) {
 		fprintf(stderr, "Option %s requires an argument\n", o->name);
 		return 1;
 	}
@@ -272,8 +280,8 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	}
 	case FIO_OPT_STR_VAL_TIME:
 		is_time = 1;
-	case FIO_OPT_STR_VAL:
-	case FIO_OPT_STR_VAL_INT: {
+	case FIO_OPT_INT:
+	case FIO_OPT_STR_VAL: {
 		fio_opt_str_val_fn *fn = o->cb;
 
 		if (is_time)
@@ -298,7 +306,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		if (fn)
 			ret = fn(data, &ull);
 		else {
-			if (o->type == FIO_OPT_STR_VAL_INT) {
+			if (o->type == FIO_OPT_INT) {
 				if (first)
 					val_store(ilp, ull, o->off1, data);
 				if (!more && o->off2)
@@ -368,7 +376,6 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 		break;
 	}
-	case FIO_OPT_INT:
 	case FIO_OPT_BOOL: {
 		fio_opt_int_fn *fn = o->cb;
 
@@ -421,15 +428,25 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 		ret = 1;
 	}
 
+	if (ret)
+		return ret;
+
+	if (o->verify)
+		ret = o->verify(o, data);
+
 	return ret;
 }
 
-static int handle_option(struct fio_option *o, const char *ptr, void *data)
+static int handle_option(struct fio_option *o, const char *__ptr, void *data)
 {
-	const char *ptr2 = NULL;
+	char *ptr, *ptr2 = NULL;
 	int r1, r2;
 
-	dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, ptr);
+	dprint(FD_PARSE, "handle_option=%s, ptr=%s\n", o->name, __ptr);
+
+	ptr = NULL;
+	if (__ptr)
+		ptr = strdup(__ptr);
 
 	/*
 	 * See if we have a second set of parameters, hidden after a comma.
@@ -440,6 +457,8 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 	    (o->type != FIO_OPT_STR_STORE) &&
 	    (o->type != FIO_OPT_STR)) {
 		ptr2 = strchr(ptr, ',');
+		if (ptr2 && *(ptr2 + 1) == '\0')
+			*ptr2 = '\0';
 		if (!ptr2)
 			ptr2 = strchr(ptr, ':');
 		if (!ptr2)
@@ -453,12 +472,17 @@ static int handle_option(struct fio_option *o, const char *ptr, void *data)
 	 */
 	r1 = __handle_option(o, ptr, data, 1, !!ptr2);
 
-	if (!ptr2)
+	if (!ptr2) {
+		if (ptr)
+			free(ptr);
 		return r1;
+	}
 
 	ptr2++;
 	r2 = __handle_option(o, ptr2, data, 0, 0);
 
+	if (ptr)
+		free(ptr);
 	return r1 && r2;
 }
 
@@ -474,6 +498,7 @@ static struct fio_option *get_option(const char *opt,
 		*ret = '\0';
 		ret = (char *) opt;
 		(*post)++;
+		strip_blank_end(ret);
 		o = find_option(options, ret);
 	} else {
 		o = find_option(options, opt);
@@ -520,7 +545,7 @@ int parse_cmd_option(const char *opt, const char *val,
 
 	o = find_option(options, opt);
 	if (!o) {
-		fprintf(stderr, "Bad option %s\n", opt);
+		fprintf(stderr, "Bad option <%s>\n", opt);
 		return 1;
 	}
 
@@ -589,7 +614,7 @@ int parse_option(const char *opt, struct fio_option *options, void *data)
 
 	o = get_option(tmp, options, &post);
 	if (!o) {
-		fprintf(stderr, "Bad option %s\n", tmp);
+		fprintf(stderr, "Bad option <%s>\n", tmp);
 		free(tmp);
 		return 1;
 	}
@@ -648,7 +673,6 @@ static void show_option_help(struct fio_option *o)
 	const char *typehelp[] = {
 		"string (opt=bla)",
 		"string with possible k/m/g postfix (opt=4k)",
-		"string with range and postfix (opt=1k-4k)",
 		"string with time postfix (opt=10s)",
 		"string (opt=bla)",
 		"string with dual range (opt=1k-4k,4k-8k)",