Changeset 8565a42 in mainline for kernel/generic/src/console

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (5 diffs)
• cmd.c (modified) (46 diffs)
• console.c (modified) (17 diffs)
• kconsole.c (modified) (44 diffs)
• prompt.c (modified) (5 diffs)

kernel/generic/src/console/chardev.c

@@ -68 +68 @@
 {
         assert(indev);
-        
+
         irq_spinlock_lock(&indev->lock, true);
         if (indev->counter == INDEV_BUFLEN - 1) {
@@ -75 +75 @@
                 return;
         }
-        
+
         indev->counter++;
         indev->buffer[indev->index++] = ch;
-        
+
         /* Index modulo size of buffer */
         indev->index = indev->index % INDEV_BUFLEN;
@@ -102 +102 @@
                 if (check_poll(indev))
                         return indev->op->poll(indev);
-                
+
                 /* No other way of interacting with user */
                 interrupts_disable();
-                
+
                 if (CPU)
                         printf("cpu%u: ", CPU->id);
                 else
                         printf("cpu: ");
-                
+
                 printf("halted (no polling input)\n");
                 cpu_halt();
         }
-        
+
         waitq_sleep(&indev->wq);
         irq_spinlock_lock(&indev->lock, true);
@@ -121 +121 @@
         indev->counter--;
         irq_spinlock_unlock(&indev->lock, true);
-        
+
         return ch;
 }
@@ -158 +158 @@
         if (indev == NULL)
                 return false;
-        
+
         if (indev->op == NULL)
                 return false;
-        
+
         return (indev->op->poll != NULL);
 }

kernel/generic/src/console/cmd.c

@@ -686 +686 @@
 {
         spinlock_lock(&cmd_lock);
-        
+
         size_t len = 0;
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
@@ -694 +694 @@
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
@@ -700 +700 @@
                 return 1;
         }
-        
+
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
@@ -706 +706 @@
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         spinlock_unlock(&cmd_lock);
-        
+
         return 1;
 }
@@ -721 +721 @@
 {
         uint8_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -729 +729 @@
                 ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint8_t val = pio_read_8(ptr);
         printf("read %" PRIxn ": %" PRIx8 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint8_t));
         return 1;
@@ -751 +751 @@
 {
         uint16_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -759 +759 @@
                 ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint16_t val = pio_read_16(ptr);
         printf("read %" PRIxn ": %" PRIx16 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint16_t));
         return 1;
@@ -781 +781 @@
 {
         uint32_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -789 +789 @@
                 ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         const uint32_t val = pio_read_32(ptr);
         printf("read %" PRIxn ": %" PRIx32 "\n", argv[0].intval, val);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint32_t));
         return 1;
@@ -811 +811 @@
 {
         uint8_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -819 +819 @@
                 ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx8 "\n", argv[0].intval,
             (uint8_t) argv[1].intval);
         pio_write_8(ptr, (uint8_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint8_t));
         return 1;
@@ -842 +842 @@
 {
         uint16_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -850 +850 @@
                 ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx16 "\n", argv[0].intval,
             (uint16_t) argv[1].intval);
         pio_write_16(ptr, (uint16_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint16_t));
         return 1;
@@ -873 +873 @@
 {
         uint32_t *ptr = NULL;
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
@@ -881 +881 @@
                 ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t),
                     PAGE_NOT_CACHEABLE);
-        
+
         printf("write %" PRIxn ": %" PRIx32 "\n", argv[0].intval,
             (uint32_t) argv[1].intval);
         pio_write_32(ptr, (uint32_t) argv[1].intval);
-        
+
 #ifdef IO_SPACE_BOUNDARY
         if ((void *) argv->intval < IO_SPACE_BOUNDARY)
                 return 1;
 #endif
-        
+
         km_unmap((uintptr_t) ptr, sizeof(uint32_t));
         return 1;
@@ -904 +904 @@
 {
         reboot();
-        
+
         /* Not reached */
         return 1;
@@ -918 +918 @@
 {
         assert(uptime);
-        
+
         /* This doesn't have to be very accurate */
         sysarg_t sec = uptime->seconds1;
-        
+
         printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
                 sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
-        
+
         return 1;
 }
@@ -937 +937 @@
 {
         spinlock_lock(&cmd_lock);
-        
+
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
-                
+
                 if (str_lcmp(hlp->name, (const char *) argv->buffer, str_length(hlp->name)) == 0) {
                         printf("%s - %s\n", hlp->name, hlp->description);
@@ -948 +948 @@
                         break;
                 }
-                
+
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         spinlock_unlock(&cmd_lock);
-        
+
         return 1;
 }
@@ -961 +961 @@
 {
         symtab_print_search((char *) argv->buffer);
-        
+
         return 1;
 }
@@ -1004 +1004 @@
          * call the function.
          */
-        
+
         unsigned int i;
         for (i = 0; i < config.cpu_count; i++) {
                 if (!cpus[i].active)
                         continue;
-                
+
                 thread_t *thread;
                 if ((thread = thread_create((void (*)(void *)) cmd_call0,
@@ -1021 +1021 @@
                         printf("Unable to create thread for cpu%u\n", i);
         }
-        
+
         return 1;
 }
@@ -1108 +1108 @@
         fncptr_t fptr;
         errno_t rc;
-        
+
         symbol = (char *) argv->buffer;
         rc = symtab_addr_lookup(symbol, &symaddr);
@@ -1183 +1183 @@
         bool pointer = false;
         errno_t rc;
-        
+
         if (((char *) argv->buffer)[0] == '*') {
                 rc = symtab_addr_lookup((char *) argv->buffer + 1, &addr);
@@ -1195 +1195 @@
         } else
                 rc = symtab_addr_lookup((char *) argv->buffer, &addr);
-        
+
         if (rc == ENOENT)
                 printf("Symbol %s not found.\n", (char *) argv->buffer);
@@ -1210 +1210 @@
         } else
                 printf("No symbol information available.\n");
-        
+
         return 1;
 }
@@ -1252 +1252 @@
         else
                 printf("Unknown argument \"%s\".\n", flag_buf);
-        
+
         return 1;
 }
@@ -1270 +1270 @@
         else
                 printf("Unknown argument \"%s\".\n", flag_buf);
-        
+
         return 1;
 }
@@ -1412 +1412 @@
         release_console();
         indev_pop_character(stdin);
-        
+
         return 1;
 }
@@ -1420 +1420 @@
 {
         printf("%s (%s)\n", test->name, test->desc);
-        
+
         /* Update and read thread accounting
            for benchmarking */
@@ -1427 +1427 @@
         task_get_accounting(TASK, &ucycles0, &kcycles0);
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         /* Execute the test */
         test_quiet = false;
         const char *ret = test->entry();
-        
+
         /* Update and read thread accounting */
         uint64_t ucycles1, kcycles1;
@@ -1437 +1437 @@
         task_get_accounting(TASK, &ucycles1, &kcycles1);
         irq_spinlock_unlock(&TASK->lock, true);
-        
+
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
         order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
         order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
-        
+
         printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
             ucycles, usuffix, kcycles, ksuffix);
-        
+
         if (ret == NULL) {
                 printf("Test passed\n");
                 return true;
         }
-        
+
         printf("%s\n", ret);
         return false;
@@ -1461 +1461 @@
         uint64_t ucycles, kcycles;
         char usuffix, ksuffix;
-        
+
         if (cnt < 1)
                 return true;
-        
+
         uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt, 0);
         if (data == NULL) {
@@ -1470 +1470 @@
                 return false;
         }
-        
+
         for (i = 0; i < cnt; i++) {
                 printf("%s (%u/%u) ... ", test->name, i + 1, cnt);
-                
+
                 /* Update and read thread accounting
                    for benchmarking */
@@ -1480 +1480 @@
                 task_get_accounting(TASK, &ucycles0, &kcycles0);
                 irq_spinlock_unlock(&TASK->lock, true);
-                
+
                 /* Execute the test */
                 test_quiet = true;
                 const char *test_ret = test->entry();
-                
+
                 /* Update and read thread accounting */
                 irq_spinlock_lock(&TASK->lock, true);
@@ -1490 +1490 @@
                 task_get_accounting(TASK, &ucycles1, &kcycles1);
                 irq_spinlock_unlock(&TASK->lock, true);
-                
+
                 if (test_ret != NULL) {
                         printf("%s\n", test_ret);
@@ -1496 +1496 @@
                         break;
                 }
-                
+
                 data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0;
                 order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
@@ -1503 +1503 @@
                     ucycles, usuffix, kcycles, ksuffix);
         }
-        
+
         if (ret) {
                 printf("\n");
-                
+
                 uint64_t sum = 0;
-                
+
                 for (i = 0; i < cnt; i++) {
                         sum += data[i];
                 }
-                
+
                 order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix);
                 printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix);
         }
-        
+
         free(data);
-        
+
         return ret;
 }
@@ -1526 +1526 @@
         size_t len = 0;
         test_t *test;
-        
+
         for (test = tests; test->name != NULL; test++) {
                 if (str_length(test->name) > len)
                         len = str_length(test->name);
         }
-        
+
         unsigned int _len = (unsigned int) len;
         if ((_len != len) || (((int) _len) < 0)) {
@@ -1537 +1537 @@
                 return;
         }
-        
+
         for (test = tests; test->name != NULL; test++)
                 printf("%-*s %s%s\n", _len, test->name, test->desc,
                     (test->safe ? "" : " (unsafe)"));
-        
+
         printf("%-*s Run all safe tests\n", _len, "*");
 }
@@ -1555 +1555 @@
 {
         test_t *test;
-        
+
         if (str_cmp((char *) argv->buffer, "*") == 0) {
                 for (test = tests; test->name != NULL; test++) {
@@ -1566 +1566 @@
         } else if (str_cmp((char *) argv->buffer, "") != 0) {
                 bool fnd = false;
-                
+
                 for (test = tests; test->name != NULL; test++) {
                         if (str_cmp(test->name, (char *) argv->buffer) == 0) {
@@ -1574 +1574 @@
                         }
                 }
-                
+
                 if (!fnd)
                         printf("Unknown test\n");
         } else
                 list_tests();
-        
+
         return 1;
 }
@@ -1593 +1593 @@
         test_t *test;
         uint32_t cnt = argv[1].intval;
-        
+
         if (str_cmp((char *) argv->buffer, "*") == 0) {
                 for (test = tests; test->name != NULL; test++) {
@@ -1603 +1603 @@
         } else {
                 bool fnd = false;
-                
+
                 for (test = tests; test->name != NULL; test++) {
                         if (str_cmp(test->name, (char *) argv->buffer) == 0) {
                                 fnd = true;
-                                
+
                                 if (test->safe)
                                         run_bench(test, cnt);
                                 else
                                         printf("Unsafe test\n");
-                                
+
                                 break;
                         }
                 }
-                
+
                 if (!fnd)
                         printf("Unknown test\n");
         }
-        
+
         return 1;
 }

kernel/generic/src/console/console.c

@@ -119 +119 @@
                 stdin = &stdin_sink;
         }
-        
+
         return stdin;
 }
@@ -143 +143 @@
                 stdout = &stdout_source;
         }
-        
+
         list_append(&outdev->link, &stdout->list);
 }
@@ -189 +189 @@
 {
         void *faddr = (void *) KA2PA(kio);
-        
+
         assert((uintptr_t) faddr % FRAME_SIZE == 0);
-        
+
         kio_parea.pbase = (uintptr_t) faddr;
         kio_parea.frames = SIZE2FRAMES(sizeof(kio));
@@ -197 +197 @@
         kio_parea.mapped = false;
         ddi_parea_register(&kio_parea);
-        
+
         sysinfo_set_item_val("kio.faddr", NULL, (sysarg_t) faddr);
         sysinfo_set_item_val("kio.pages", NULL, KIO_PAGES);
-        
+
         event_set_unmask_callback(EVENT_KIO, kio_update);
         atomic_set(&kio_inited, true);
@@ -209 +209 @@
         event_notify_1(EVENT_KCONSOLE, false, true);
         bool prev = console_override;
-        
+
         console_override = true;
         if ((stdout) && (stdout->op->redraw))
                 stdout->op->redraw(stdout);
-        
+
         if ((stdin) && (!prev)) {
                 /*
@@ -256 +256 @@
         size_t count = 0;
         buf[offset] = 0;
-        
+
         wchar_t ch;
         while ((ch = indev_pop_character(indev)) != '\n') {
@@ -265 +265 @@
                                 putchar(' ');
                                 putchar('\b');
-                                
+
                                 count--;
                                 offset = str_lsize(buf, count);
@@ -271 +271 @@
                         }
                 }
-                
+
                 if (chr_encode(ch, buf, &offset, buflen - 1) == EOK) {
                         putchar(ch);
@@ -278 +278 @@
                 }
         }
-        
+
         return count;
 }
@@ -294 +294 @@
         if (!atomic_get(&kio_inited))
                 return;
-        
+
         spinlock_lock(&kio_lock);
-        
+
         if (kio_uspace > 0) {
                 if (event_notify_3(EVENT_KIO, true, kio_start, kio_len,
@@ -302 +302 @@
                         kio_uspace = 0;
         }
-        
+
         spinlock_unlock(&kio_lock);
 }
@@ -312 +312 @@
 {
         bool ordy = ((stdout) && (stdout->op->write));
-        
+
         if (!ordy)
                 return;
@@ -347 +347 @@
         else
                 kio_start = (kio_start + 1) % KIO_LENGTH;
-        
+
         if (kio_stored < kio_len)
                 kio_stored++;
-        
+
         /* The character is stored for uspace */
         if (kio_uspace < kio_len)
@@ -359 +359 @@
 {
         bool ordy = ((stdout) && (stdout->op->write));
-        
+
         spinlock_lock(&kio_lock);
         kio_push_char(ch);
         spinlock_unlock(&kio_lock);
-        
+
         /* Output stored characters */
         kio_flush();
-        
+
         if (!ordy) {
                 /*
@@ -380 +380 @@
                 early_putchar(ch);
         }
-        
+
         /* Force notification on newline */
         if (ch == '\n')
@@ -409 +409 @@
         if (size > PAGE_SIZE)
                 return (sys_errno_t) ELIMIT;
-        
+
         if (size > 0) {
                 data = (char *) malloc(size + 1, 0);
                 if (!data)
                         return (sys_errno_t) ENOMEM;
-                
+
                 rc = copy_from_uspace(data, buf, size);
                 if (rc) {
@@ -421 +421 @@
                 }
                 data[size] = 0;
-                
+
                 switch (cmd) {
                 case KIO_WRITE:

kernel/generic/src/console/kconsole.c

@@ -98 +98 @@
 {
         unsigned int i;
-        
+
         cmd_init();
         for (i = 0; i < KCONSOLE_HISTORY; i++)
@@ -114 +114 @@
 {
         spinlock_lock(&cmd_lock);
-        
+
         /*
          * Make sure the command is not already listed.
@@ -124 +124 @@
                         return false;
                 }
-                
+
                 /* Avoid deadlock. */
                 if (hlp < cmd) {
@@ -133 +133 @@
                         spinlock_lock(&hlp->lock);
                 }
-                
+
                 if (str_cmp(hlp->name, cmd->name) == 0) {
                         /* The command is already there. */
@@ -141 +141 @@
                         return false;
                 }
-                
+
                 spinlock_unlock(&hlp->lock);
                 spinlock_unlock(&cmd->lock);
         }
-        
+
         /*
          * Now the command can be added.
          */
         list_append(&cmd->link, &cmd_list);
-        
+
         spinlock_unlock(&cmd_lock);
         return true;
@@ -168 +168 @@
         link_t **startpos = (link_t**) ctx;
         size_t namelen = str_length(name);
-        
+
         spinlock_lock(&cmd_lock);
-        
+
         if (*startpos == NULL)
                 *startpos = cmd_list.head.next;
-        
+
         for (; *startpos != &cmd_list.head; *startpos = (*startpos)->next) {
                 cmd_info_t *hlp = list_get_instance(*startpos, cmd_info_t, link);
-                
+
                 const char *curname = hlp->name;
                 if (str_length(curname) < namelen)
                         continue;
-                
+
                 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));
                 }
         }
-        
+
         spinlock_unlock(&cmd_lock);
         return NULL;
@@ -207 +207 @@
 {
         const char *name = input;
-        
+
         size_t found = 0;
-        
+
         /*
          * Maximum Match Length: Length of longest matching common
@@ -223 +223 @@
         size_t total_hints_shown = 0;
         bool continue_showing_hints = true;
-        
+
         output[0] = 0;
-        
+
         while ((hint = hints_enum(name, NULL, &pos))) {
                 if ((found == 0) || (str_length(hint) > str_length(output)))
                         str_cpy(output, MAX_CMDLINE, hint);
-                
+
                 found++;
         }
-        
+
         /*
          * If the number of possible completions is more than MAX_TAB_HINTS,
@@ -242 +242 @@
                     console_prompt_display_all_hints(indev, found);
         }
-        
+
         if ((found > 1) && (str_length(output) != 0)) {
                 printf("\n");
                 pos = NULL;
                 while ((hint = hints_enum(name, &help, &pos))) {
-                        
+
                         if (continue_showing_hints) {
                                 if (help)
@@ -253 +253 @@
                                 else
                                         printf("%s%s\n", name, hint);
-                                
+
                                 --hints_to_show;
                                 ++total_hints_shown;
-                                
+
                                 if ((hints_to_show == 0) && (total_hints_shown != found)) {
                                         /* Ask user to continue */
@@ -263 +263 @@
                                 }
                         }
-                        
+
                         for (max_match_len_tmp = 0;
                             (output[max_match_len_tmp] ==
                             hint[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;
         }
-        
+
         if (found > 0)
                 str_cpy(input, size, output);
-        
+
         free(output);
         return found;
@@ -288 +288 @@
         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);
@@ -312 +312 @@
                         return hlp;
                 }
-                
+
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         free(tmp);
         spinlock_unlock(&cmd_lock);
-        
+
         return NULL;
 }
@@ -325 +325 @@
 {
         printf("%s> ", prompt);
-        
+
         size_t position = 0;
         wchar_t *current = history[history_pos];
         current[0] = 0;
         char *tmp = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
-        
+
         while (true) {
                 wchar_t ch = indev_pop_character(indev);
-                
+
                 if (ch == '\n') {
                         /* Enter */
@@ -339 +339 @@
                         break;
                 }
-                
+
                 if (ch == '\b') {
                         /* Backspace */
                         if (position == 0)
                                 continue;
-                        
+
                         if (wstr_remove(current, position - 1)) {
                                 position--;
@@ -353 +353 @@
                         }
                 }
-                
+
                 if (ch == '\t') {
                         /* Tab completion */
-                        
+
                         /* Move to the end of the word */
                         for (; (current[position] != 0) && (!isspace(current[position]));
                             position++)
                                 putchar(current[position]);
-                        
-                        
+
+
                         /*
                          * Find the beginning of the word
@@ -376 +376 @@
                                     (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;
@@ -394 +394 @@
                                         sp = false;
                         }
-                        
+
                         if (narg && isspace(current[0]))
                                 narg--;
-                        
+
                         int found;
                         if (narg == 0) {
@@ -411 +411 @@
                                     cmd->hints_enum);
                         }
-                        
+
                         if (found == 0)
                                 continue;
@@ -424 +424 @@
                                 if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
                                         break;
-                                
+
                                 i++;
                         }
-                        
+
                         if (found > 1) {
                                 /* No unique hint, list was printed */
@@ -436 +436 @@
                                 continue;
                         }
-                        
+
                         /* We have a hint */
-                        
+
                         printf("%ls", current + position);
                         position += str_length(tmp);
                         print_cc('\b', wstr_length(current) - position);
-                        
+
                         if (position == wstr_length(current)) {
                                 /* Insert a space after the last completed argument */
@@ -452 +452 @@
                         continue;
                 }
-                
+
                 if (ch == U_LEFT_ARROW) {
                         /* Left */
@@ -461 +461 @@
                         continue;
                 }
-                
+
                 if (ch == U_RIGHT_ARROW) {
                         /* Right */
@@ -470 +470 @@
                         continue;
                 }
-                
+
                 if ((ch == U_UP_ARROW) || (ch == U_DOWN_ARROW)) {
                         /* Up, down */
@@ -476 +476 @@
                         print_cc(' ', wstr_length(current));
                         print_cc('\b', wstr_length(current));
-                        
+
                         if (ch == U_UP_ARROW) {
                                 /* Up */
@@ -493 +493 @@
                         continue;
                 }
-                
+
                 if (ch == U_HOME_ARROW) {
                         /* Home */
@@ -500 +500 @@
                         continue;
                 }
-                
+
                 if (ch == U_END_ARROW) {
                         /* End */
@@ -507 +507 @@
                         continue;
                 }
-                
+
                 if (ch == U_DELETE) {
                         /* Delete */
                         if (position == wstr_length(current))
                                 continue;
-                        
+
                         if (wstr_remove(current, position)) {
                                 printf("%ls ", current + position);
@@ -519 +519 @@
                         continue;
                 }
-                
+
                 if (wstr_linsert(current, ch, position, MAX_CMDLINE)) {
                         printf("%ls", current + position);
@@ -526 +526 @@
                 }
         }
-        
+
         if (wstr_length(current) > 0) {
                 history_pos++;
                 history_pos = history_pos % KCONSOLE_HISTORY;
         }
-        
+
         free(tmp);
         return current;
@@ -546 +546 @@
         bool isaddr = false;
         bool isptr = false;
-        
+
         /* If we get a name, try to find it in symbol table */
         if (text[0] == '&') {
@@ -557 +557 @@
                 len--;
         }
-        
+
         if ((text[0] < '0') || (text[0] > '9')) {
                 char symname[MAX_SYMBOL_NAME];
                 str_ncpy(symname, MAX_SYMBOL_NAME, text, len + 1);
-                
+
                 uintptr_t symaddr;
                 errno_t rc = symtab_addr_lookup(symname, &symaddr);
@@ -611 +611 @@
                 }
         }
-        
+
         return true;
 }
@@ -635 +635 @@
         assert(start != NULL);
         assert(end != NULL);
-        
+
         bool found_start = false;
         size_t offset = *start;
         size_t prev = *start;
         wchar_t ch;
-        
+
         while ((ch = str_decode(cmdline, &offset, size)) != 0) {
                 if (!found_start) {
@@ -651 +651 @@
                                 break;
                 }
-                
+
                 prev = offset;
         }
         *end = prev;
-        
+
         return found_start;
 }
@@ -676 +676 @@
         }
         spinlock_lock(&cmd_lock);
-        
+
         cmd_info_t *cmd = NULL;
-        
+
         list_foreach(cmd_list, link, cmd_info_t, hlp) {
                 spinlock_lock(&hlp->lock);
-                
+
                 if (str_lcmp(hlp->name, cmdline + start,
                     max(str_length(hlp->name),
@@ -688 +688 @@
                         break;
                 }
-                
+
                 spinlock_unlock(&hlp->lock);
         }
-        
+
         spinlock_unlock(&cmd_lock);
-        
+
         if (!cmd) {
                 /* Unknown command. */
@@ -699 +699 @@
                 return NULL;
         }
-        
+
         /* cmd == hlp is locked */
-        
+
         /*
          * The command line must be further analyzed and
@@ -708 +708 @@
          * structure.
          */
-        
+
         bool error = false;
         size_t i;
         for (i = 0; i < cmd->argc; i++) {
                 char *buf;
-                
+
                 start = end;
                 if (!parse_argument(cmdline, size, &start, &end)) {
@@ -721 +721 @@
                                 continue;
                         }
-                        
+
                         printf("Too few arguments.\n");
                         spinlock_unlock(&cmd->lock);
                         return NULL;
                 }
-                
+
                 switch (cmd->argv[i].type) {
                 case ARG_TYPE_STRING:
@@ -767 +767 @@
                 }
         }
-        
+
         if (error) {
                 spinlock_unlock(&cmd->lock);
                 return NULL;
         }
-        
+
         start = end;
         if (parse_argument(cmdline, size, &start, &end)) {
@@ -779 +779 @@
                 return NULL;
         }
-        
+
         spinlock_unlock(&cmd->lock);
         return cmd;
@@ -798 +798 @@
                 return;
         }
-        
+
         if (msg)
                 printf("%s", msg);
-        
+
         if (kcon)
                 indev_pop_character(stdin);
         else
                 printf("Type \"exit\" to leave the console.\n");
-        
+
         char *cmdline = malloc(STR_BOUNDS(MAX_CMDLINE), 0);
         while (true) {
@@ -813 +813 @@
                 if (!len)
                         continue;
-                
+
                 wstr_to_str(cmdline, STR_BOUNDS(MAX_CMDLINE), tmp);
-                
+
                 if ((!kcon) && (len == 4) && (str_lcmp(cmdline, "exit", 4) == 0))
                         break;
-                
+
                 cmd_info_t *cmd_info = parse_cmdline(cmdline, STR_BOUNDS(MAX_CMDLINE));
                 if (!cmd_info)
                         continue;
-                
+
                 (void) cmd_info->func(cmd_info->argv);
         }

kernel/generic/src/console/prompt.c

@@ -52 +52 @@
         assert(indev);
         assert(hints > 0);
-        
+
         printf("Display all %zu possibilities? (y or n) ", hints);
-        
+
         while (true) {
                 wchar_t answer = indev_pop_character(indev);
-                
+
                 if ((answer == 'y') || (answer == 'Y')) {
                         printf("y");
                         return true;
                 }
-                
+
                 if ((answer == 'n') || (answer == 'N')) {
                         printf("n");
@@ -84 +84 @@
         assert(indev);
         assert(display_hints != NULL);
-        
+
         printf("--More--");
         while (true) {
@@ -95 +95 @@
                         break;
                 }
-                
+
                 /* Stop displaying hints? */
                 if ((continue_showing_hints == 'n') ||
@@ -104 +104 @@
                         break;
                 }
-                
+
                 /* Show one more hint? */
                 if (continue_showing_hints == '\n') {
@@ -111 +111 @@
                 }
         }
-        
+
         /* Delete the --More-- option */
         printf("\r         \r");
-        
+
         return *display_hints > 0;
 }