Changes in kernel/generic/src/console/kconsole.c [9b11a971:e98f1c3e] in mainline

File:

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

kernel/generic/src/console/kconsole.c

@@ -53 +53 @@
 #include <func.h>
 #include <str.h>
-#include <macros.h>
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
@@ -59 +58 @@
 #include <errno.h>
 #include <putchar.h>
-#include <str.h>
+#include <mm/slab.h>
 
 /** Simple kernel console.
@@ -119 +118 @@
          * Make sure the command is not already listed.
          */
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
-                
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 if (hlp == cmd) {
                         /* The command is already there. */
@@ -167 +164 @@
 
 /** Try to find a command beginning with prefix */
-NO_TRACE static const char *cmdtab_search_one(const char *name,
-    link_t **startpos)
-{
+const char *cmdtab_enum(const char *name, const char **h, void **ctx)
+{
+        link_t **startpos = (link_t**) ctx;
         size_t namelen = str_length(name);
         
@@ -185 +182 @@
                 
                 if (str_lcmp(curname, name, namelen) == 0) {
+                        *startpos = (*startpos)->next;
+                        if (h)
+                                *h = hlp->description;
+                        
                         spinlock_unlock(&cmd_lock);
                         return (curname + str_lsize(curname, namelen));
@@ -202 +203 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev)
+NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
+    hints_enum_func_t hints_enum)
 {
         const char *name = input;
@@ -214 +216 @@
         size_t max_match_len = size;
         size_t max_match_len_tmp = size;
-        size_t input_len = str_length(input);
-        link_t *pos = NULL;
+        void *pos = NULL;
         const char *hint;
+        const char *help;
         char *output = malloc(MAX_CMDLINE, 0);
         size_t hints_to_show = MAX_TAB_HINTS - 1;
@@ -224 +226 @@
         output[0] = 0;
         
-        while ((hint = cmdtab_search_one(name, &pos))) {
-                if ((found == 0) || (str_length(output) > str_length(hint)))
+        while ((hint = hints_enum(name, NULL, &pos))) {
+                if ((found == 0) || (str_length(hint) > str_length(output)))
                         str_cpy(output, MAX_CMDLINE, hint);
                 
-                pos = pos->next;
                 found++;
         }
@@ -245 +246 @@
                 printf("\n");
                 pos = NULL;
-                while (cmdtab_search_one(name, &pos)) {
-                        cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
+                while ((hint = hints_enum(name, &help, &pos))) {
                         
                         if (continue_showing_hints) {
-                                printf("%s (%s)\n", hlp->name, hlp->description);
+                                if (help)
+                                        printf("%s%s (%s)\n", name, hint, help);
+                                else
+                                        printf("%s%s\n", name, hint);
+                                
                                 --hints_to_show;
                                 ++total_hints_shown;
@@ -260 +264 @@
                         }
                         
-                        pos = pos->next;
-                        
                         for (max_match_len_tmp = 0;
                             (output[max_match_len_tmp] ==
-                            hlp->name[input_len + max_match_len_tmp]) &&
+                            hint[max_match_len_tmp]) &&
                             (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
                         
@@ -279 +281 @@
         free(output);
         return found;
+}
+
+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;
 }
 
@@ -321 +362 @@
                                 putchar(current[position]);
                         
-                        if (position == 0)
-                                continue;
                         
                         /*
@@ -329 +368 @@
                          */
                         size_t beg;
-                        for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
-                            beg--);
-                        
-                        if (isspace(current[beg]))
-                                beg++;
-                        
-                        wstr_to_str(tmp, position - beg + 1, current + beg);
+                        unsigned narg = 0;
+                        if (position == 0) {
+                                tmp[0] = '\0';
+                                beg = 0;
+                        } else {
+                                for (beg = position - 1;
+                                    (beg > 0) && (!isspace(current[beg]));
+                                    beg--);
+                                
+                                if (isspace(current[beg]))
+                                        beg++;
+                                
+                                wstr_to_str(tmp, position - beg + 1, current + beg);
+                        }
+                        
+                        /* Count which argument number are we tabbing (narg=0 is cmd) */
+                        bool sp = false;
+                        for (; beg > 0; beg--) {
+                                if (isspace(current[beg])) {
+                                        if (!sp) {
+                                                narg++;
+                                                sp = true;
+                                        }
+                                } else
+                                        sp = false;
+                        }
+                        
+                        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);
+                                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 || cmd->argc < narg)
+                                        continue;
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
+                                    cmd->hints_enum);
                         }
                         
@@ -613 +679 @@
         cmd_info_t *cmd = NULL;
         
-        list_foreach(cmd_list, cur) {
-                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);