init: escape description option string

[fio.git] / parse.c

diff --git a/parse.c b/parse.c
index b8ec3aa86a4262849726ba3f3a5e4591b61c990c..e3f431edcc5a3bccdcb0a70173c181fcea1323a4 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -380,7 +380,7 @@ static int str_match_len(const struct value_pair *vp, const char *str)
 static int __handle_option(struct fio_option *o, const char *ptr, void *data,
                           int first, int more, int curr)
 {
-       int il, *ilp;
+       int il=0, *ilp;
        fio_fp64_t *flp;
        long long ull, *ullp;
        long ul1, ul2;
@@ -788,6 +788,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
        }
        case FIO_OPT_DEPRECATED:
                log_info("Option %s is deprecated\n", o->name);
+               ret = 1;
                break;
        default:
                log_err("Bad option type %u\n", o->type);
@@ -943,7 +944,8 @@ int parse_cmd_option(const char *opt, const char *val,
 }
 
 int parse_option(char *opt, const char *input,
-                struct fio_option *options, struct fio_option **o, void *data)
+                struct fio_option *options, struct fio_option **o, void *data,
+                int dump_cmdline)
 {
        char *post;
 
@@ -964,11 +966,25 @@ int parse_option(char *opt, const char *input,
                return 1;
        }
 
-       if (!handle_option(*o, post, data))
-               return 0;
+       if (handle_option(*o, post, data)) {
+               log_err("fio: failed parsing %s\n", input);
+               return 1;
+       }
 
-       log_err("fio: failed parsing %s\n", input);
-       return 1;
+       if (dump_cmdline) {
+               const char *delim;
+
+               if (!strcmp("description", (*o)->name))
+                       delim = "\"";
+               else
+                       delim = "";
+
+               log_info("--%s%s", (*o)->name, post ? "" : " ");
+               if (post)
+                       log_info("=%s%s%s ", delim, post, delim);
+       }
+
+       return 0;
 }
 
 /*
@@ -1086,6 +1102,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
                        continue;
                if (!exec_profile && o->prof_name)
                        continue;
+               if (exec_profile && !(o->prof_name && !strcmp(exec_profile, o->prof_name)))
+                       continue;
 
                if (name) {
                        if (!strcmp(name, o->name) ||