Changeset 36b0490e in mainline

Timestamp:

2016-03-08T09:16:26Z (9 years ago)

Author:

Aurelio Colosimo <aurelio@…>

Branches:

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

Children:

83b2e73

Parents:

b6bbc74

Message:

kernel: cmdtab_compl rewritten by using a enum callback

This is the first step to obtain a multi-purpose tab completion function,
based on enum callbacks; a typedef for them, called hints_enum_func_t,
is defined in kernel/generic/include/console/kconsole.h.

Location:

kernel/generic

Files:

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

kernel/generic/include/console/kconsole.h

@@ -42 +42 @@
 #define MAX_CMDLINE       256
 #define KCONSOLE_HISTORY  10
+
+/** Callback to be used to enum hints for cmd tab completion. */
+typedef const char *(*hints_enum_func_t)(const char *, const char **, void **);
 
 typedef enum {

kernel/generic/src/console/kconsole.c

@@ -165 +165 @@
 
 /** Try to find a command beginning with prefix */
-NO_TRACE static const char *cmdtab_search_one(const char *name,
-    link_t **startpos)
-{
+NO_TRACE static const char *cmdtab_enum(const char *name,
+    const char **h, void **ctx)
+{
+        link_t **startpos = (link_t**)ctx;
         size_t namelen = str_length(name);
         
@@ -183 +184 @@
                 
                 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));
@@ -200 +205 @@
  *
  */
-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;
@@ -212 +218 @@
         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;
@@ -222 +228 @@
         output[0] = 0;
         
-        while ((hint = cmdtab_search_one(name, &pos))) {
+        while ((hint = hints_enum(name, NULL, &pos))) {
                 if ((found == 0) || (str_length(output) > str_length(hint)))
                         str_cpy(output, MAX_CMDLINE, hint);
                 
-                pos = pos->next;
                 found++;
         }
@@ -243 +248 @@
                 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;
@@ -258 +267 @@
                         }
                         
-                        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);
                         
@@ -338 +345 @@
                         if (beg == 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 */