WebSVN – HelenOS – Diff – /branches/network/kernel/generic/src/console/kconsole.c

 /** @addtogroup genericconsole
  * @{
  */
 /**
- * @file    kconsole.c
+ * @file  kconsole.c
- * @brief   Kernel console.
+ * @brief Kernel console.
+ *
  * This file contains kernel thread managing the kernel console.
+ *
  */
 #include <console/kconsole.h>
 #include <console/console.h>
 #include <console/chardev.h>
 #include <macros.h>
 #include <sysinfo/sysinfo.h>
 #include <ddi/device.h>
 #include <symtab.h>
 #include <errno.h>
+#include <putchar.h>
+#include <string.h>
 /** Simple kernel console.
+ *
  * The console is realized by kernel thread kconsole.
  * It doesn't understand any useful command on its own,
  * but makes it possible for other kernel subsystems to
  * register their own commands.
  */
 /** Locking.
+ *
  * There is a list of cmd_info_t structures. This list
  * is protected by cmd_lock spinlock. Note that specially
  * the link elements of cmd_info_t are protected by
+ *
  * cmd_lock must be acquired before any cmd_info lock.
  * When locking two cmd info structures, structure with
  * lower address must be locked first.
  */
-SPINLOCK_INITIALIZE(cmd_lock);  /**< Lock protecting command list. */
-LIST_INITIALIZE(cmd_head);  /**< Command list. */
-static cmd_info_t *parse_cmdline(char *cmdline, size_t len);
-static bool parse_argument(char *cmdline, size_t len, index_t *start,
+SPINLOCK_INITIALIZE(cmd_lock);  /**< Lock protecting command list. */
-    index_t *end);
-static char history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
-/*
- * For now, we use 0 as INR.
- * However, it is therefore desirable to have architecture specific
- * definition of KCONSOLE_VIRT_INR in the future.
- */
-#define KCONSOLE_VIRT_INR  0
-bool kconsole_notify = false;
-irq_t kconsole_irq;
-/** Allways refuse IRQ ownership.
- *
- * This is not a real IRQ, so we always decline.
+LIST_INITIALIZE(cmd_head);      /**< Command list. */
- *
- * @return Always returns IRQ_DECLINE.
- *
- */
-static irq_ownership_t kconsole_claim(irq_t *irq)
-{
-    return IRQ_DECLINE;
-}
+static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = {};
+static count_t history_pos = 0;
 /** Initialize kconsole data structures
+ *
  * This is the most basic initialization, almost no
  * other kernel subsystem is ready yet.
+ *
  */
 void kconsole_init(void)
+{
     unsigned int i;
     cmd_init();
     for (i = 0; i < KCONSOLE_HISTORY; i++)
-        history[i][0] = '\0';
+        history[i][0] = 0;
+}
-/** Initialize kconsole notification mechanism
- *
- * Initialize the virtual IRQ notification mechanism.
- *
- */
-void kconsole_notify_init(void)
-{
-    sysinfo_set_item_val("kconsole.present", NULL, true);
-    sysinfo_set_item_val("kconsole.inr", NULL, KCONSOLE_VIRT_INR);
-    irq_initialize(&kconsole_irq);
-    kconsole_irq.devno = device_assign_devno();
-    kconsole_irq.inr = KCONSOLE_VIRT_INR;
-    kconsole_irq.claim = kconsole_claim;
-    irq_register(&kconsole_irq);
-    kconsole_notify = true;
-}
 /** Register kconsole command.
+ *
  * @param cmd Structure describing the command.
+ *
- * @return 0 on failure, 1 on success.
+ * @return False on failure, true on success.
+ *
  */
-int cmd_register(cmd_info_t *cmd)
+bool cmd_register(cmd_info_t *cmd)
+{
     link_t *cur;
     spinlock_lock(&cmd_lock);
     /*
      * Make sure the command is not already listed.
      */
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
-        cmd_info_t *hlp;
+        cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
-        hlp = list_get_instance(cur, cmd_info_t, link);
         if (hlp == cmd) {
             /* The command is already there. */
             spinlock_unlock(&cmd_lock);
-            return 0;
+            return false;
+        }
         /* Avoid deadlock. */
         if (hlp < cmd) {
             spinlock_lock(&hlp->lock);
             spinlock_lock(&cmd->lock);
         } else {
             spinlock_lock(&cmd->lock);
             spinlock_lock(&hlp->lock);
+        }
-        if ((strncmp(hlp->name, cmd->name, max(strlen(cmd->name),
-            strlen(hlp->name))) == 0)) {
+        if (str_cmp(hlp->name, cmd->name) == 0) {
             /* The command is already there. */
             spinlock_unlock(&hlp->lock);
             spinlock_unlock(&cmd->lock);
             spinlock_unlock(&cmd_lock);
-            return 0;
+            return false;
+        }
         spinlock_unlock(&hlp->lock);
         spinlock_unlock(&cmd->lock);
+    }
      * Now the command can be added.
      */
     list_append(&cmd->link, &cmd_head);
     spinlock_unlock(&cmd_lock);
-    return 1;
+    return true;
+}
 /** Print count times a character */
-static void rdln_print_c(char ch, int count)
+static void print_cc(wchar_t ch, count_t count)
+{
-    int i;
+    count_t i;
     for (i = 0; i < count; i++)
         putchar(ch);
+}
-/** Insert character to string */
-static void insert_char(char *str, char ch, int pos)
-{
-    int i;
-    for (i = strlen(str); i > pos; i--)
-        str[i] = str[i - 1];
-    str[pos] = ch;
-}
 /** Try to find a command beginning with prefix */
-static const char *cmdtab_search_one(const char *name,link_t **startpos)
+static const char *cmdtab_search_one(const char *name, link_t **startpos)
+{
-    size_t namelen = strlen(name);
+    count_t namelen = str_length(name);
-    const char *curname;
     spinlock_lock(&cmd_lock);
-    if (!*startpos)
+    if (*startpos == NULL)
         *startpos = cmd_head.next;
     for (; *startpos != &cmd_head; *startpos = (*startpos)->next) {
-        cmd_info_t *hlp;
-        hlp = list_get_instance(*startpos, cmd_info_t, link);
+        cmd_info_t *hlp = list_get_instance(*startpos, cmd_info_t, link);
-        curname = hlp->name;
+        const char *curname = hlp->name;
-        if (strlen(curname) < namelen)
+        if (str_length(curname) < namelen)
             continue;
-        if (strncmp(curname, name, namelen) == 0) {
+        if (str_lcmp(curname, name, namelen) == 0) {
             spinlock_unlock(&cmd_lock);
-            return curname+namelen;
+            return (curname + str_lsize(curname, namelen));
+        }
+    }
     spinlock_unlock(&cmd_lock);
     return NULL;
+}
+/** Command completion of the commands
+ *
+ * @param name String to match, changed to hint on exit
+ * @param size Input buffer size
+ *
-/** Command completion of the commands
+ * @return Number of found matches
+ *
- * @param name - string to match, changed to hint on exit
- * @return number of found matches
  */
-static int cmdtab_compl(char *name)
+static int cmdtab_compl(char *input, size_t size)
+{
-    static char output[/*MAX_SYMBOL_NAME*/128 + 1];
+    const char *name = input;
+    count_t found = 0;
-    link_t *startpos = NULL;
+    link_t *pos = NULL;
-    const char *foundtxt;
+    const char *hint;
-    int found = 0;
+    char output[MAX_CMDLINE];
-    int i;
-    output[0] = '\0';
+    output[0] = 0;
-    while ((foundtxt = cmdtab_search_one(name, &startpos))) {
+    while ((hint = cmdtab_search_one(name, &pos))) {
-        startpos = startpos->next;
-        if (!found)
-            strncpy(output, foundtxt, strlen(foundtxt) + 1);
+        if ((found == 0) || (str_length(output) > str_length(hint)))
-        else {
-            for (i = 0; output[i] && foundtxt[i] &&
+            str_ncpy(output, hint, MAX_CMDLINE);
-                output[i] == foundtxt[i]; i++)
-                ;
-            output[i] = '\0';
+        pos = pos->next;
-        }
         found++;
+    }
-    if (!found)
-        return 0;
-    if (found > 1 && !strlen(output)) {
+    if ((found > 1) && (str_length(output) != 0)) {
         printf("\n");
-        startpos = NULL;
+        pos = NULL;
-        while ((foundtxt = cmdtab_search_one(name, &startpos))) {
+        while ((hint = cmdtab_search_one(name, &pos))) {
-            cmd_info_t *hlp;
-            hlp = list_get_instance(startpos, cmd_info_t, link);
+            cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
-            printf("%s - %s\n", hlp->name, hlp->description);
+            printf("%s (%s)\n", hlp->name, hlp->description);
-            startpos = startpos->next;
+            pos = pos->next;
+        }
+    }
+    if (found > 0)
-    strncpy(name, output, 128/*MAX_SYMBOL_NAME*/);
+        str_ncpy(input, output, size);
     return found;
+}
-static char *clever_readline(const char *prompt, indev_t *input)
+static wchar_t *clever_readline(const char *prompt, indev_t *indev)
+{
-    static int histposition = 0;
-    static char tmp[MAX_CMDLINE + 1];
-    int curlen = 0, position = 0;
-    char *current = history[histposition];
-    int i;
-    char mod; /* Command Modifier */
-    char c;
     printf("%s> ", prompt);
+    count_t position = 0;
+    wchar_t *current = history[history_pos];
+    current[0] = 0;
-    while (1) {
+    while (true) {
-        c = _getc(input);
+        wchar_t ch = _getc(indev);
-        if (c == '\n') {
+        if (ch == '\n') {
+            /* Enter */
-            putchar(c);
+            putchar(ch);
             break;
+        }
-        if (c == '\b') { /* Backspace */
+        if (ch == '\b') {
+            /* Backspace */
             if (position == 0)
                 continue;
-            for (i = position; i < curlen; i++)
-                current[i - 1] = current[i];
+            if (wstr_remove(current, position - 1)) {
-            curlen--;
-            position--;
+                position--;
-            putchar('\b');
+                putchar('\b');
-            for (i = position; i < curlen; i++)
-                putchar(current[i]);
+                printf("%ls ", current + position);
-            putchar(' ');
-            rdln_print_c('\b', curlen - position + 1);
+                print_cc('\b', wstr_length(current) - position + 1);
-            continue;
+                continue;
+            }
+        }
-        if (c == '\t') { /* Tabulator */
+        if (ch == '\t') {
-            int found;
+            /* Tab completion */
             /* Move to the end of the word */
-            for (; position < curlen && current[position] != ' ';
+            for (; (current[position] != 0) && (!isspace(current[position]));
                 position++)
                 putchar(current[position]);
-            /* Copy to tmp last word */
+            if (position == 0)
-            for (i = position - 1; i >= 0 && current[i] != ' '; i--)
+                continue;
-                ;
-            /* If word begins with * or &, skip it */
+            /* Find the beginning of the word
-            if (tmp[0] == '*' || tmp[0] == '&')
+               and copy it to tmp */
+            count_t beg;
+            for (beg = position - 1; (beg > 0) && (!isspace(current[beg]));
-                for (i = 1; tmp[i]; i++)
+                beg--);
-                    tmp[i - 1] = tmp[i];
+            if (isspace(current[beg]))
+                beg++;
-            i++; /* I is at the start of the word */
+            char tmp[STR_BOUNDS(MAX_CMDLINE)];
-            strncpy(tmp, current + i, position - i + 1);
+            wstr_nstr(tmp, current + beg, position - beg + 1);
+            int found;
+            if (beg == 0) {
-            if (i == 0) { /* Command completion */
+                /* Command completion */
-                found = cmdtab_compl(tmp);
+                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
+            } else {
-            } else { /* Symtab completion */
+                /* Symbol completion */
-                found = symtab_compl(tmp);
+                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE));
+            }
             if (found == 0)
                 continue;
-            for (i = 0; tmp[i] && curlen < MAX_CMDLINE;
+            size_t off = 0;
-                i++, curlen++)
+            count_t i = 0;
+            while ((ch = str_decode(tmp, &off, STR_NO_LIMIT)) != 0) {
-                insert_char(current, tmp[i], i + position);
+                if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE))
+                    break;
+                i++;
+            }
-            if (strlen(tmp) || found == 1) { /* If we have a hint */
+            if ((str_length(tmp) > 0) || (found == 1)) {
-                for (i = position; i < curlen; i++)
+                /* We have a hint */
-                    putchar(current[i]);
+                printf("%ls", current + position);
+                print_cc('\b', wstr_length(current) - position);
-                position += strlen(tmp);
+                position += str_length(tmp);
-                /* Add space to end */
-                if (found == 1 && position == curlen &&
+                if ((found == 1) && (position == wstr_length(current))) {
-                    curlen < MAX_CMDLINE) {
+                    if (wstr_linsert(current, ' ', position, MAX_CMDLINE)) {
-                    current[position] = ' ';
+                        printf("%ls", current + position);
-                    curlen++;
-                    position++;
+                        position++;
-                    putchar(' ');
+                    }
+                }
+            } else {
-            } else { /* No hint, table was printed */
+                /* No unique hint, list was printed */
                 printf("%s> ", prompt);
-                for (i = 0; i < curlen; i++)
-                    putchar(current[i]);
+                printf("%ls", current);
-                position += strlen(tmp);
+                position += str_length(tmp);
+            }
-            rdln_print_c('\b', curlen - position);
+            print_cc('\b', wstr_length(current) - position);
             continue;
+        }
-        if (c == 0x1b) { /* Special command */
-            mod = _getc(input);
-            c = _getc(input);
-            if (mod != 0x5b && mod != 0x4f)
+        if (ch == U_LEFT_ARROW) {
-                continue;
-            if (c == 0x33 && _getc(input) == 0x7e) {
-                /* Delete */
+            /* Left */
-                if (position == curlen)
-                    continue;
-                for (i = position + 1; i < curlen; i++) {
-                    putchar(current[i]);
-                    current[i - 1] = current[i];
-                }
-                putchar(' ');
-                rdln_print_c('\b', curlen - position);
-                curlen--;
-            } else if (c == 0x48) { /* Home */
-                rdln_print_c('\b', position);
-                position = 0;
-            } else if (c == 0x46) {  /* End */
-                for (i = position; i < curlen; i++)
-                    putchar(current[i]);
-                position = curlen;
-            } else if (c == 0x44) { /* Left */
-                if (position > 0) {
+            if (position > 0) {
-                    putchar('\b');
+                putchar('\b');
-                    position--;
+                position--;
-                }
-                continue;
-            } else if (c == 0x43) { /* Right */
-                if (position < curlen) {
-                    putchar(current[position]);
-                    position++;
-                }
-                continue;
-            } else if (c == 0x41 || c == 0x42) {
-                                /* Up, down */
-                rdln_print_c('\b', position);
-                rdln_print_c(' ', curlen);
-                rdln_print_c('\b', curlen);
-                if (c == 0x41) /* Up */
-                    histposition--;
-                else
-                    histposition++;
-                if (histposition < 0) {
-                    histposition = KCONSOLE_HISTORY - 1;
-                } else {
-                    histposition =
-                        histposition % KCONSOLE_HISTORY;
-                }
-                current = history[histposition];
-                printf("%s", current);
-                curlen = strlen(current);
-                position = curlen;
-                continue;
+            }
             continue;
+        }
-        if (curlen >= MAX_CMDLINE)
+        if (ch == U_RIGHT_ARROW) {
+            /* Right */
+            if (position < wstr_length(current)) {
+                putchar(current[position]);
+                position++;
+            }
             continue;
-        insert_char(current, c, position);
-        curlen++;
-        for (i = position; i < curlen; i++)
-            putchar(current[i]);
-        position++;
-        rdln_print_c('\b',curlen - position);
-    }
+        }
-    if (curlen) {
-        histposition++;
-        histposition = histposition % KCONSOLE_HISTORY;
-    }
-    current[curlen] = '\0';
+        if ((ch == U_UP_ARROW) || (ch == U_DOWN_ARROW)) {
-    return current;
+            /* Up, down */
-}
-bool kconsole_check_poll(void)
-{
-    return check_poll(stdin);
+            print_cc('\b', position);
-}
-/** Kernel console prompt.
- *
- * @param prompt Kernel console prompt (e.g kconsole/panic).
- * @param msg    Message to display in the beginning.
+            print_cc(' ', wstr_length(current));
- * @param kcon   Wait for keypress to show the prompt
+            print_cc('\b', wstr_length(current));
- *               and never exit.
- *
- */
-void kconsole(char *prompt, char *msg, bool kcon)
-{
-    cmd_info_t *cmd_info;
+            if (ch == U_UP_ARROW) {
-    count_t len;
+                /* Up */
-    char *cmdline;
-    if (!stdin) {
+                if (history_pos == 0)
-        LOG("No stdin for kernel console");
+                    history_pos = KCONSOLE_HISTORY - 1;
-        return;
-    }
-    if (msg)
+                else
-        printf("%s", msg);
+                    history_pos--;
-    if (kcon)
+            } else {
-        _getc(stdin);
+                /* Down */
-    else
+                history_pos++;
-        printf("Type \"exit\" to leave the console.\n");
+                history_pos = history_pos % KCONSOLE_HISTORY;
+            }
-    while (true) {
-        cmdline = clever_readline((char *) prompt, stdin);
+            current = history[history_pos];
-        len = strlen(cmdline);
+            printf("%ls", current);
-        if (!len)
+            position = wstr_length(current);
             continue;
+        }
-        if ((!kcon) && (len == 4) && (strncmp(cmdline, "exit", 4) == 0))
+        if (ch == U_HOME_ARROW) {
+            /* Home */
+            print_cc('\b', position);
+            position = 0;
-            break;
+            continue;
+        }
-        cmd_info = parse_cmdline(cmdline, len);
+        if (ch == U_END_ARROW) {
-        if (!cmd_info)
+            /* End */
+            printf("%ls", current + position);
+            position = wstr_length(current);
             continue;
+        }
+        if (ch == U_DELETE) {
+            /* Delete */
-        (void) cmd_info->func(cmd_info->argv);
+            if (position == wstr_length(current))
+                continue;
+            if (wstr_remove(current, position)) {
+                printf("%ls ", current + position);
+                print_cc('\b', wstr_length(current) - position + 1);
+            }
+            continue;
+        }
+        if (wstr_linsert(current, ch, position, MAX_CMDLINE)) {
+            printf("%ls", current + position);
+            position++;
+            print_cc('\b', wstr_length(current) - position);
+        }
+    }
+    if (wstr_length(current) > 0) {
+        history_pos++;
+        history_pos = history_pos % KCONSOLE_HISTORY;
+    }
+    return current;
+}
-/** Kernel console managing thread.
- *
- */
-void kconsole_thread(void *data)
+bool kconsole_check_poll(void)
+{
-    kconsole("kconsole", "Kernel console ready (press any key to activate)\n", true);
+    return check_poll(stdin);
+}
-static int parse_int_arg(char *text, size_t len, unative_t *result)
+static bool parse_int_arg(const char *text, size_t len, unative_t *result)
+{
-    uintptr_t symaddr;
     bool isaddr = false;
     bool isptr = false;
-    int rc;
-    static char symname[MAX_SYMBOL_NAME];
     /* If we get a name, try to find it in symbol table */
     if (text[0] == '&') {
         isaddr = true;
         text++;
     } else if (text[0] == '*') {
         isptr = true;
         text++;
         len--;
+    }
-    if (text[0] < '0' || text[0] > '9') {
+    if ((text[0] < '0') || (text[0] > '9')) {
+        char symname[MAX_SYMBOL_NAME];
-        strncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));
+        str_ncpy(symname, text, min(len + 1, MAX_SYMBOL_NAME));
+        uintptr_t symaddr;
-        rc = symtab_addr_lookup(symname, &symaddr);
+        int rc = symtab_addr_lookup(symname, &symaddr);
         switch (rc) {
         case ENOENT:
             printf("Symbol %s not found.\n", symname);
-            return -1;
+            return false;
         case EOVERFLOW:
             printf("Duplicate symbol %s.\n", symname);
             symtab_print_search(symname);
-            return -1;
+            return false;
-        default:
+        case ENOTSUP:
             printf("No symbol information available.\n");
-            return -1;
+            return false;
+        }
         if (isaddr)
-            *result = (unative_t)symaddr;
+            *result = (unative_t) symaddr;
         else if (isptr)
-            *result = **((unative_t **)symaddr);
+            *result = **((unative_t **) symaddr);
         else
-            *result = *((unative_t *)symaddr);
+            *result = *((unative_t *) symaddr);
+    } else {
-    } else { /* It's a number - convert it */
+        /* It's a number - convert it */
         *result = atoi(text);
         if (isptr)
-            *result = *((unative_t *)*result);
+            *result = *((unative_t *) *result);
+    }
+    return true;
+}
+/** Parse argument.
+ *
+ * Find start and end positions of command line argument.
+ *
+ * @param cmdline Command line as read from the input device.
+ * @param size    Size (in bytes) of the string.
+ * @param start   On entry, 'start' contains pointer to the offset
+ *                of the first unprocessed character of cmdline.
+ *                On successful exit, it marks beginning of the next argument.
+ * @param end     Undefined on entry. On exit, 'end' is the offset of the first
+ *                character behind the next argument.
+ *
+ * @return False on failure, true on success.
+ *
+ */
+static bool parse_argument(const char *cmdline, size_t size, size_t *start, size_t *end)
+{
+    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) {
+            if (!isspace(ch)) {
+                *start = prev;
+                found_start = true;
+            }
+        } else {
+            if (isspace(ch))
-    return 0;
+                break;
+        }
+        prev = offset;
+    }
+    *end = prev;
+    return found_start;
+}
 /** Parse command line.
+ *
  * @param cmdline Command line as read from input device.
- * @param len Command line length.
+ * @param size    Size (in bytes) of the string.
+ *
  * @return Structure describing the command.
+ *
  */
-cmd_info_t *parse_cmdline(char *cmdline, size_t len)
+static cmd_info_t *parse_cmdline(const char *cmdline, size_t size)
+{
-    index_t start = 0, end = 0;
+    size_t start = 0;
-    cmd_info_t *cmd = NULL;
-    link_t *cur;
-    count_t i;
-    int error = 0;
+    size_t end = 0;
-    if (!parse_argument(cmdline, len, &start, &end)) {
+    if (!parse_argument(cmdline, size, &start, &end)) {
         /* Command line did not contain alphanumeric word. */
         return NULL;
+    }
     spinlock_lock(&cmd_lock);
+    cmd_info_t *cmd = NULL;
+    link_t *cur;
     for (cur = cmd_head.next; cur != &cmd_head; cur = cur->next) {
-        cmd_info_t *hlp;
-        hlp = list_get_instance(cur, cmd_info_t, link);
+        cmd_info_t *hlp = list_get_instance(cur, cmd_info_t, link);
         spinlock_lock(&hlp->lock);
-        if (strncmp(hlp->name, &cmdline[start], max(strlen(hlp->name),
+        if (str_lcmp(hlp->name, cmdline + start,
-            end - start + 1)) == 0) {
+            max(str_length(hlp->name),
+            str_nlength(cmdline + start, (count_t) (end - start) - 1))) == 0) {
             cmd = hlp;
             break;
+        }
         spinlock_unlock(&hlp->lock);
+    }
     spinlock_unlock(&cmd_lock);
     if (!cmd) {
         /* Unknown command. */
         printf("Unknown command.\n");
         return NULL;
+    }
     /* cmd == hlp is locked */
     /*
      * The command line must be further analyzed and
      * the parameters therefrom must be matched and
      * converted to those specified in the cmd info
      * structure.
      */
+    bool error = false;
+    count_t i;
     for (i = 0; i < cmd->argc; i++) {
-        char *buf;
-        start = end + 1;
+        start = end;
-        if (!parse_argument(cmdline, len, &start, &end)) {
+        if (!parse_argument(cmdline, size, &start, &end)) {
             printf("Too few arguments.\n");
             spinlock_unlock(&cmd->lock);
             return NULL;
+        }
-        error = 0;
+        char *buf;
         switch (cmd->argv[i].type) {
         case ARG_TYPE_STRING:
             buf = (char *) cmd->argv[i].buffer;
-            strncpy(buf, (const char *) &cmdline[start],
+            str_ncpy(buf, cmdline + start,
-                min((end - start) + 2, cmd->argv[i].len));
+                min((end - start) + 1, cmd->argv[i].len));
-            buf[min((end - start) + 1, cmd->argv[i].len - 1)] =
-                '\0';
             break;
         case ARG_TYPE_INT:
-            if (parse_int_arg(cmdline + start, end - start + 1,
+            if (!parse_int_arg(cmdline + start, end - start,
                 &cmd->argv[i].intval))
-                error = 1;
+                error = true;
             break;
         case ARG_TYPE_VAR:
-            if (start != end && cmdline[start] == '"' &&
+            if ((start < end - 1) && (cmdline[start] == '"')) {
-                cmdline[end] == '"') {
+                if (cmdline[end - 1] == '"') {
-                buf = (char *) cmd->argv[i].buffer;
+                    buf = (char *) cmd->argv[i].buffer;
-                strncpy(buf, (const char *) &cmdline[start + 1],
+                    str_ncpy(buf, cmdline + start + 1,
-                    min((end-start), cmd->argv[i].len));
+                        min((end - start) - 1, cmd->argv[i].len));
-                buf[min((end - start), cmd->argv[i].len - 1)] =
+                    cmd->argv[i].intval = (unative_t) buf;
+                    cmd->argv[i].vartype = ARG_TYPE_STRING;
-                    '\0';
+                } else {
-                cmd->argv[i].intval = (unative_t) buf;
+                    printf("Wrong synxtax.\n");
-                cmd->argv[i].vartype = ARG_TYPE_STRING;
+                    error = true;
+                }
-            } else if (!parse_int_arg(cmdline + start,
+            } else if (parse_int_arg(cmdline + start,
-                end - start + 1, &cmd->argv[i].intval)) {
+                end - start, &cmd->argv[i].intval)) {
                 cmd->argv[i].vartype = ARG_TYPE_INT;
             } else {
                 printf("Unrecognized variable argument.\n");
-                error = 1;
+                error = true;
+            }
             break;
         case ARG_TYPE_INVALID:
         default:
-            printf("invalid argument type\n");
+            printf("Invalid argument type\n");
-            error = 1;
+            error = true;
             break;
+        }
+    }
     if (error) {
         spinlock_unlock(&cmd->lock);
         return NULL;
+    }
-    start = end + 1;
+    start = end;
-    if (parse_argument(cmdline, len, &start, &end)) {
+    if (parse_argument(cmdline, size, &start, &end)) {
         printf("Too many arguments.\n");
         spinlock_unlock(&cmd->lock);
         return NULL;
+    }
     spinlock_unlock(&cmd->lock);
     return cmd;
+}
-/** Parse argument.
+/** Kernel console prompt.
- *
- * Find start and end positions of command line argument.
+ *
- * @param cmdline Command line as read from the input device.
+ * @param prompt Kernel console prompt (e.g kconsole/panic).
- * @param len Number of characters in cmdline.
+ * @param msg    Message to display in the beginning.
- * @param start On entry, 'start' contains pointer to the index
+ * @param kcon   Wait for keypress to show the prompt
- *        of first unprocessed character of cmdline.
- *        On successful exit, it marks beginning of the next argument.
- * @param end Undefined on entry. On exit, 'end' points to the last character
- *        of the next argument.
+ *               and never exit.
+ *
- * @return false on failure, true on success.
  */
-bool parse_argument(char *cmdline, size_t len, index_t *start, index_t *end)
+void kconsole(char *prompt, char *msg, bool kcon)
+{
-    index_t i;
+    if (!stdin) {
-    bool found_start = false;
+        LOG("No stdin for kernel console");
+        return;
+    }
-    ASSERT(start != NULL);
+    if (msg)
-    ASSERT(end != NULL);
+        printf("%s", msg);
+    if (kcon)
+        _getc(stdin);
+    else
-    for (i = *start; i < len; i++) {
+        printf("Type \"exit\" to leave the console.\n");
-        if (!found_start) {
+    while (true) {
+        wchar_t *tmp = clever_readline((char *) prompt, stdin);
+        count_t len = wstr_length(tmp);
-            if (isspace(cmdline[i]))
+        if (!len)
-                (*start)++;
+            continue;
-            else
-                found_start = true;
+        char cmdline[STR_BOUNDS(MAX_CMDLINE)];
+        wstr_nstr(cmdline, tmp, STR_BOUNDS(MAX_CMDLINE));
+        if ((!kcon) && (len == 4) && (str_lcmp(cmdline, "exit", 4) == 0))
-        } else {
+            break;
+        cmd_info_t *cmd_info = parse_cmdline(cmdline, STR_BOUNDS(MAX_CMDLINE));
-            if (isspace(cmdline[i]))
+        if (!cmd_info)
-                break;
+            continue;
-        }
+        (void) cmd_info->func(cmd_info->argv);
+    }
-    *end = i - 1;
+}
-    return found_start;
+/** Kernel console managing thread.
+ *
+ */
+void kconsole_thread(void *data)
+{
+    kconsole("kconsole", "Kernel console ready (press any key to activate)\n", true);
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/kernel/generic/src/console/kconsole.c – Rev 4153 → 4263