X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=e6d9406e1612231a295516eab1bde32e72bd8a37;hb=1b06fdb4fa31b6aa6e7baec5c73926870480623f;hp=079f19e3d32754f53ebfb3d9ca0ff5a8c707fc15;hpb=0de5b26f6e177aacac0683306c47e0cbaf58b0b6;p=fio.git

diff --git a/parse.c b/parse.c
index 079f19e3..e6d9406e 100644
--- a/parse.c
+++ b/parse.c
@@ -608,6 +608,9 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 	case FIO_OPT_STR_STORE: {
 		fio_opt_str_fn *fn = o->cb;
 
+		if (!strlen(ptr))
+			return 1;
+
 		if (o->off1) {
 			cp = td_var(data, o, o->off1);
 			*cp = strdup(ptr);
@@ -621,7 +624,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
 			ret = 1;
 			for (i = 0; i < PARSE_MAX_VP; i++) {
 				vp = &posval[i];
-				if (!vp->ival || vp->ival[0] == '\0')
+				if (!vp->ival || vp->ival[0] == '\0' || !cp)
 					continue;
 				all_skipped = 0;
 				if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
@@ -1164,7 +1167,7 @@ void option_init(struct fio_option *o)
 		o->minfp = DBL_MIN;
 		o->maxfp = DBL_MAX;
 	}
-	if (o->type == FIO_OPT_STR_SET && o->def) {
+	if (o->type == FIO_OPT_STR_SET && o->def && !o->no_warn_def) {
 		log_err("Option %s: string set option with"
 				" default will always be true\n", o->name);
 	}