Changes in kernel/generic/src/console/kconsole.c [e98f1c3e:9b11a971] 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>
@@ -58 +59 @@
 #include <errno.h>
 #include <putchar.h>
-#include <mm/slab.h>
+#include <str.h>
 
 /** Simple kernel console.
@@ -118 +119 @@
          * Make sure the command is not already listed.
          */
-        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+        list_foreach(cmd_list, cur) {
+                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
+                
                 if (hlp == cmd) {
                         /* The command is already there. */
@@ -164 +167 @@
 
 /** Try to find a command beginning with prefix */
-const char *cmdtab_enum(const char *name, const char **h, void **ctx)
-{
-        link_t **startpos = (link_t**) ctx;
+NO_TRACE static const char *cmdtab_search_one(const char *name,
+    link_t **startpos)
+{
         size_t namelen = str_length(name);
         
@@ -182 +185 @@
                 
                 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));
@@ -203 +202 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
-    hints_enum_func_t hints_enum)
+NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev)
 {
         const char *name = input;
@@ -216 +214 @@
         size_t max_match_len = size;
         size_t max_match_len_tmp = size;
-        void *pos = NULL;
+        size_t input_len = str_length(input);
+        link_t *pos = NULL;
         const char *hint;
-        const char *help;
         char *output = malloc(MAX_CMDLINE, 0);
         size_t hints_to_show = MAX_TAB_HINTS - 1;
@@ -226 +224 @@
         output[0] = 0;
         
-        while ((hint = hints_enum(name, NULL, &pos))) {
-                if ((found == 0) || (str_length(hint) > str_length(output)))
+        while ((hint = cmdtab_search_one(name, &pos))) {
+                if ((found == 0) || (str_length(output) > str_length(hint)))
                         str_cpy(output, MAX_CMDLINE, hint);
                 
+                pos = pos->next;
                 found++;
         }
@@ -246 +245 @@
                 printf("\n");
                 pos = NULL;
-                while ((hint = hints_enum(name, &help, &pos))) {
+                while (cmdtab_search_one(name, &pos)) {
+                        cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
                         
                         if (continue_showing_hints) {
-                                if (help)
-                                        printf("%s%s (%s)\n", name, hint, help);
-                                else
-                                        printf("%s%s\n", name, hint);
-                                
+                                printf("%s (%s)\n", hlp->name, hlp->description);
                                 --hints_to_show;
                                 ++total_hints_shown;
@@ -264 +260 @@
                         }
                         
+                        pos = pos->next;
+                        
                         for (max_match_len_tmp = 0;
                             (output[max_match_len_tmp] ==
-                            hint[max_match_len_tmp]) &&
+                            hlp->name[input_len + max_match_len_tmp]) &&
                             (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
                         
@@ -281 +279 @@
         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;
 }
 
@@ -362 +321 @@
                                 putchar(current[position]);
                         
+                        if (position == 0)
+                                continue;
                         
                         /*
@@ -368 +329 @@
                          */
                         size_t beg;
-                        unsigned narg = 0;
-                        if (position == 0) {
-                                tmp[0] = '\0';
-                                beg = 0;
+                        for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
+                            beg--);
+                        
+                        if (isspace(current[beg]))
+                                beg++;
+                        
+                        wstr_to_str(tmp, position - beg + 1, current + beg);
+                        
+                        int found;
+                        if (beg == 0) {
+                                /* Command completion */
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
                         } 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 (narg == 0) {
-                                /* Command completion */
-                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
-                                    cmdtab_enum);
-                        } else {
-                                /* 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);
+                                /* Symbol completion */
+                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
                         }
                         
@@ -679 +613 @@
         cmd_info_t *cmd = NULL;
         
-        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+        list_foreach(cmd_list, cur) {
+                cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
                 spinlock_lock(&hlp->lock);