Changes in kernel/generic/src/console/kconsole.c [aca4a04:feeac0d] in mainline

File:

• kernel/generic/src/console/kconsole.c (modified) (11 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>
@@ -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. */
@@ -202 +199 @@
  *
  */
-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)
 {
         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 */
+        
+        /*
+         * 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;
@@ -229 +229 @@
         }
         
-        /* If possible completions are more than MAX_TAB_HINTS, ask user whether to display them or not. */
+        /*
+         * 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);
+                continue_showing_hints =
+                    console_prompt_display_all_hints(indev, found);
         }
         
@@ -240 +244 @@
                 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) { /* Time to ask user to continue */
-                                        continue_showing_hints = console_prompt_more_hints(indev, &hints_to_show);
+                                
+                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
+                                        /* Ask user to continue */
+                                        continue_showing_hints =
+                                            console_prompt_more_hints(indev, &hints_to_show);
                                 }
                         }
-
+                        
                         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);
+                        
+                        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 */
+                
+                /* Keep only the characters common in all completions */
                 output[max_match_len] = 0;
         }
@@ -310 +321 @@
                                 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]));
@@ -333 +346 @@
                                 continue;
 
-                        /* We have hints, may be many. In case of more than one hint,
-                           tmp will contain the common prefix. */
+                        /*
+                         * We have hints, possibly many. In case of more than one hint,
+                         * tmp will contain the common prefix.
+                         */
                         size_t off = 0;
                         size_t i = 0;
@@ -340 +355 @@
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
                                         break;
+                                
                                 i++;
                         }
@@ -505 +521 @@
                 /* It's a number - convert it */
                 uint64_t value;
-                int rc = str_uint64_t(text, NULL, 0, true, &value);
+                char *end;
+                int rc = str_uint64_t(text, &end, 0, false, &value);
+                if (end != text + len)
+                        rc = EINVAL;
                 switch (rc) {
                 case EINVAL:
-                        printf("Invalid number.\n");
+                        printf("Invalid number '%s'.\n", text);
                         return false;
                 case EOVERFLOW:
-                        printf("Integer overflow.\n");
+                        printf("Integer overflow in '%s'.\n", text);
                         return false;
                 case EOK:
@@ -519 +538 @@
                         break;
                 default:
-                        printf("Unknown error.\n");
+                        printf("Unknown error parsing '%s'.\n", text);
                         return false;
                 }
@@ -591 +610 @@
         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);