Parent options didn't recurse properly

It only displayed the first found. Add a ->parent_seen and
find all matches.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/parse.c b/parse.c
index 962538c066ecace330da6ebb1a946b4294a003e2..ffe435a44f2b86a9e9463b2933431dcb1ddc46f1 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -566,30 +566,35 @@ static struct fio_option *find_child(struct fio_option *options,
 {
        struct fio_option *__o;
 
-       for (__o = &options[0]; __o->name; __o++)
-               if (__o->parent && !strcmp(__o->parent, o->name))
+       for (__o = &options[0]; __o->name; __o++) {
+               if (__o->parent && !strcmp(__o->parent, o->name)
+                   && !__o->parent_seen) {
+                       __o->parent_seen = 1;
                        return __o;
+               }
+       }
 
        return NULL;
 }
 
 static void print_option(struct fio_option *options, struct fio_option *o,
-                        int level)
+                        struct fio_option *org, int level)
 {
        char name[256], *p;
-       int i;
 
        if (!o)
                return;
+       if (!org)
+               org = o;
        
        p = name;
-       for (i = 0; i < level; i++)
+       if (level)
                p += sprintf(p, "%s", "    ");
 
        sprintf(p, "%s", o->name);
 
        printf("%-24s: %s\n", name, o->help);
-       print_option(options, find_child(options, o), level + 1);
+       print_option(options, find_child(options, org), org, level + 1);
 }
 
 int show_cmd_help(struct fio_option *options, const char *name)
@@ -628,7 +633,7 @@ int show_cmd_help(struct fio_option *options, const char *name)
                                printf("%24s: %s\n", o->name, o->help);
                        if (show_all) {
                                if (!o->parent)
-                                       print_option(options, o, 0);
+                                       print_option(options, o, NULL, 0);
                                continue;
                        }
                }

diff --git a/parse.h b/parse.h
index c3b66d75be34216ff1f3df33b85db9d7779ef6c6..36ff2b2357d673cd07134bbe7751a441b8ea4462 100644 (file)
--- a/parse.h
+++ b/parse.h
@@ -46,6 +46,7 @@ struct fio_option {
        const char *def;                /* default setting */
        const struct value_pair posval[PARSE_MAX_VP];/* possible values */
        const char *parent;             /* parent option */
+       char parent_seen;
 };
 
 typedef int (str_cb_fn)(void *, char *);