Changeset 6a75c134 in mainline

Timestamp:

2016-03-08T09:21:14Z (9 years ago)

Author:

Aurelio Colosimo <aurelio@…>

Branches:

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

Children:

a363016

Parents:

83b2e73

Message:

tab arguments completion: defined and handled hints_enum callback in cmd_info_t

Location:

kernel/generic

Files:

• include/console/kconsole.h (modified) (1 diff)
• src/console/kconsole.c (modified) (2 diffs)

kernel/generic/include/console/kconsole.h

@@ -88 +88 @@
         /** Function for printing detailed help. */
         void (* help)(void);
+        /** Function for enumerating hints for arguments. */
+        hints_enum_func_t hints_enum;
 } cmd_info_t;
 

kernel/generic/src/console/kconsole.c

@@ -286 +286 @@
 }
 
+NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+{
+        size_t start = 0;
+        size_t end;
+        char *tmp;
+        
+        while (isspace(cmdline[start]))
+                start++;
+        end = start + 1;
+        while (!isspace(cmdline[end]))
+                end++;
+        
+        tmp = malloc(STR_BOUNDS(end - start + 1), 0);
+        
+        wstr_to_str(tmp, end - start + 1, &cmdline[start]);
+        
+        spinlock_lock(&cmd_lock);
+        
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+                spinlock_lock(&hlp->lock);
+                
+                if (str_cmp(hlp->name, tmp) == 0) {
+                        spinlock_unlock(&hlp->lock);
+                        spinlock_unlock(&cmd_lock);
+                        free(tmp);
+                        return hlp;
+                }
+                
+                spinlock_unlock(&hlp->lock);
+        }
+        
+        free(tmp);
+        spinlock_unlock(&cmd_lock);
+        
+        return NULL;
+}
+
 NO_TRACE static wchar_t *clever_readline(const char *prompt, indev_t *indev)
 {
@@ -345 +382 @@
                         if (beg == 0) {
                                 /* Command completion */
-                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev, cmdtab_enum);
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
+                                    cmdtab_enum);
                         } else {
-                                /* Symbol completion */
-                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
+                                /* Arguments completion */
+                                cmd_info_t *cmd = parse_cmd(current);
+                                if (!cmd || !cmd->hints_enum)
+                                        continue;
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
+                                    cmd->hints_enum);
                         }