X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=parse.c;h=7fb2bb6399cc564b038f6889a5f2fb3f603b5719;hp=1e709ddbcb0dda56383ed557954e83d388aed3c1;hb=755200a326a33e5e19b16dfd5e013dd98bcf1916;hpb=7e75f648444ce3ee1694792134826ee89c7a29eb

diff --git a/parse.c b/parse.c
index 1e709ddb..7fb2bb63 100644
--- a/parse.c
+++ b/parse.c
@@ -40,6 +40,9 @@ static unsigned long get_mult_bytes(char c)
 		case 'g':
 		case 'G':
 			return 1024 * 1024 * 1024;
+		case 'e':
+		case 'E':
+			return 1024 * 1024 * 1024 * 1024UL;
 		default:
 			return 1;
 	}
@@ -56,8 +59,8 @@ static int str_to_decimal(const char *str, long long *val, int kilo)
 	if (!len)
 		return 1;
 
-	*val = strtoul(str, NULL, 10);
-	if (*val == ULONG_MAX && errno == ERANGE)
+	*val = strtoll(str, NULL, 10);
+	if (*val == LONG_MAX && errno == ERANGE)
 		return 1;
 
 	if (kilo)
@@ -127,13 +130,13 @@ static int check_int(const char *p, int *val)
 static struct fio_option *find_option(struct fio_option *options,
 				      const char *opt)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		if (!strcmp(o->name, opt))
 			return o;
-
-		o++;
+		else if (o->alias && !strcmp(o->alias, opt))
+			return o;
 	}
 
 	return NULL;
@@ -218,8 +221,11 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 
 		p1 = strchr(tmp, '-');
 		if (!p1) {
-			ret = 1;
-			break;
+			p1 = strchr(tmp, ':');
+			if (!p1) {
+				ret = 1;
+				break;
+			}
 		}
 
 		p2 = p1 + 1;
@@ -265,6 +271,9 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			return 1;
 		}
 
+		if (o->neg)
+			il = !il;
+
 		if (fn)
 			ret = fn(data, &il);
 		else {
@@ -306,8 +315,11 @@ 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)
+	if (ptr && (o->type != FIO_OPT_STR_STORE)) {
 		ptr2 = strchr(ptr, ',');
+		if (!ptr2)
+			ptr2 = strchr(ptr, ':');
+	}
 
 	/*
 	 * Don't return early if parsing the first option fails - if
@@ -410,7 +422,6 @@ static void show_option_values(struct fio_option *o)
 int show_cmd_help(struct fio_option *options, const char *name)
 {
 	int show_all = !strcmp(name, "all");
-	struct fio_option *o = &options[0];
 	const char *typehelp[] = {
 		"string (opt=bla)",
 		"string with possible k/m/g postfix (opt=4k)",
@@ -422,23 +433,26 @@ int show_cmd_help(struct fio_option *options, const char *name)
 		"boolean value (opt=1)",
 		"no argument (opt)",
 	};
+	struct fio_option *o;
 	int found = 0;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		int match = !strcmp(name, o->name);
 
 		if (show_all || match) {
 			found = 1;
 			printf("%16s: %s\n", o->name, o->help);
-			if (match) {
-				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);
-			}
+			if (show_all)
+				continue;
 		}
 
-		o++;
+		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);
 	}
 
 	if (found)
@@ -453,28 +467,27 @@ int show_cmd_help(struct fio_option *options, const char *name)
  */
 void fill_default_options(void *data, struct fio_option *options)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++)
 		if (o->def)
 			handle_option(o, o->def, data);
-		o++;
-	}
 }
 
 /*
  * Sanitize the options structure. For now it just sets min/max for bool
- * values.
+ * values and whether both callback and offsets are given.
  */
 void options_init(struct fio_option *options)
 {
-	struct fio_option *o = &options[0];
+	struct fio_option *o;
 
-	while (o->name) {
+	for (o = &options[0]; o->name; o++) {
 		if (o->type == FIO_OPT_BOOL) {
 			o->minval = 0;
 			o->maxval = 1;
 		}
-		o++;
+		if (o->cb && (o->off1 || o->off2 || o->off3 || o->off4))
+			fprintf(stderr, "Option %s: both cb and offset given\n", o->name);
 	}
 }