Changeset 0cfc18d3 in mainline

Timestamp:

2016-03-16T09:10:42Z (8 years ago)

Author:

Aurelio Colosimo <aurelio@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b00876

Parents:

722bb5a

Message:

kconsole tab completion: count arguments while tabbing them

This avoids tab completion hints when current argument exceeds arguments
count (argc) declared by current command.

File:

• kernel/generic/src/console/kconsole.c (modified) (3 diffs)

kernel/generic/src/console/kconsole.c

@@ -370 +370 @@
                          */
                         size_t beg;
+                        unsigned sp = 0, narg = 0;
                         for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
                             beg--);
@@ -378 +379 @@
                         wstr_to_str(tmp, position - beg + 1, current + beg);
                         
+                        /* Count which argument number are we tabbing (narg=0 is cmd) */
+                        for (; beg > 0; beg--) {
+                                if (isspace(current[beg])) {
+                                        if (!sp) {
+                                                narg++;
+                                                sp = 1;
+                                        }
+                                }
+                                else
+                                        sp = 0;
+                        }
+                        if (narg && isspace(current[0]))
+                                narg--;
+
                         int found;
-                        if (beg == 0) {
+                        if (narg == 0) {
                                 /* Command completion */
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
@@ -386 +401 @@
                                 /* Arguments completion */
                                 cmd_info_t *cmd = parse_cmd(current);
-                                if (!cmd || !cmd->hints_enum)
+                                if (!cmd || !cmd->hints_enum || cmd->argc < narg)
                                         continue;
                                 found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,