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

File:

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

kernel/generic/src/console/kconsole.c

@@ -43 +43 @@
 #include <console/chardev.h>
 #include <console/cmd.h>
-#include <console/prompt.h>
 #include <print.h>
 #include <panic.h>
@@ -202 +201 @@
  *
  */
-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)
 {
         const char *name = input;
         
         size_t found = 0;
-        
-        /*
-         * Maximum Match Length: Length of longest matching common
-         * substring in case more than one match is found.
-         */
-        size_t max_match_len = size;
-        size_t max_match_len_tmp = size;
-        size_t input_len = str_length(input);
         link_t *pos = NULL;
         const char *hint;
         char *output = malloc(MAX_CMDLINE, 0);
-        size_t hints_to_show = MAX_TAB_HINTS - 1;
-        size_t total_hints_shown = 0;
-        bool continue_showing_hints = true;
         
         output[0] = 0;
@@ -230 +218 @@
                 pos = pos->next;
                 found++;
-        }
-        
-        /*
-         * If the number of possible completions is more than MAX_TAB_HINTS,
-         * ask the user whether to display them or not.
-         */
-        if (found > MAX_TAB_HINTS) {
-                printf("\n");
-                continue_showing_hints =
-                    console_prompt_display_all_hints(indev, found);
         }
         
@@ -247 +225 @@
                 while (cmdtab_search_one(name, &pos)) {
                         cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
-                        
-                        if (continue_showing_hints) {
-                                printf("%s (%s)\n", hlp->name, hlp->description);
-                                --hints_to_show;
-                                ++total_hints_shown;
-                                
-                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
-                                        /* Ask user to continue */
-                                        continue_showing_hints =
-                                            console_prompt_more_hints(indev, &hints_to_show);
-                                }
-                        }
-                        
+                        printf("%s (%s)\n", hlp->name, hlp->description);
                         pos = pos->next;
-                        
-                        for (max_match_len_tmp = 0;
-                            (output[max_match_len_tmp] ==
-                            hlp->name[input_len + max_match_len_tmp]) &&
-                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
-                        
-                        max_match_len = max_match_len_tmp;
-                }
-                
-                /* Keep only the characters common in all completions */
-                output[max_match_len] = 0;
+                }
         }
         
@@ -324 +280 @@
                                 continue;
                         
-                        /*
-                         * Find the beginning of the word
-                         * and copy it to tmp
-                         */
+                        /* Find the beginning of the word
+                           and copy it to tmp */
                         size_t beg;
                         for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
@@ -340 +294 @@
                         if (beg == 0) {
                                 /* Command completion */
-                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
                         } else {
                                 /* Symbol completion */
-                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
+                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
                         }
                         
                         if (found == 0)
                                 continue;
-
-                        /*
-                         * We have hints, possibly many. In case of more than one hint,
-                         * tmp will contain the common prefix.
-                         */
+                        
+                        if (found > 1) {
+                                /* No unique hint, list was printed */
+                                printf("%s> ", prompt);
+                                printf("%ls", current);
+                                print_cc('\b', wstr_length(current) - position);
+                                continue;
+                        }
+                        
+                        /* We have a hint */
+                        
                         size_t off = 0;
                         size_t i = 0;
@@ -358 +318 @@
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
                                         break;
-                                
                                 i++;
                         }
-                        
-                        if (found > 1) {
-                                /* No unique hint, list was printed */
-                                printf("%s> ", prompt);
-                                printf("%ls", current);
-                                position += str_length(tmp);
-                                print_cc('\b', wstr_length(current) - position);
-                                continue;
-                        }
-                        
-                        /* We have a hint */
                         
                         printf("%ls", current + position);
@@ -524 +472 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                char *end;
-                int rc = str_uint64_t(text, &end, 0, false, &value);
-                if (end != text + len)
-                        rc = EINVAL;
+                int rc = str_uint64_t(text, NULL, 0, true, &value);
                 switch (rc) {
                 case EINVAL:
-                        printf("Invalid number '%s'.\n", text);
+                        printf("Invalid number.\n");
                         return false;
                 case EOVERFLOW:
-                        printf("Integer overflow in '%s'.\n", text);
+                        printf("Integer overflow.\n");
                         return false;
                 case EOK:
@@ -541 +486 @@
                         break;
                 default:
-                        printf("Unknown error parsing '%s'.\n", text);
+                        printf("Unknown error.\n");
                         return false;
                 }
@@ -595 +540 @@
 /** Parse command line.
  *
- * @param cmdline Command line as read from input device.
+ * @param cmdline Command line as read from input device. 
  * @param size    Size (in bytes) of the string.
  *