Changeset a02e383 in mainline

Timestamp:

2009-03-12T17:48:13Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

099aa78

Parents:

67a88c3

Message:

avoid page fault on exit command
cleanup

Location:

kernel/generic

Files:

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

kernel/generic/include/console/kconsole.h

@@ -93 +93 @@
 extern void kconsole_init(void);
 extern void kconsole_notify_init(void);
+extern bool kconsole_check_poll(void);
 extern void kconsole(char *prompt, char *msg, bool kcon);
 extern void kconsole_thread(void *data);

kernel/generic/src/console/kconsole.c

@@ -296 +296 @@
 }
 
-static char *clever_readline(const char *prompt, chardev_t *input)
+static char *clever_readline(const char *prompt, indev_t *input)
 {
         static int histposition = 0;
@@ -457 +457 @@
 }
 
+bool kconsole_check_poll(void)
+{
+        return check_poll(stdin);
+}
+
 /** Kernel console prompt.
  *
@@ -470 +475 @@
         count_t len;
         char *cmdline;
-
+        
         if (!stdin) {
                 LOG("No stdin for kernel console");
@@ -481 +486 @@
         if (kcon)
                 _getc(stdin);
+        else
+                printf("Type \"exit\" to leave the console.\n");
         
         while (true) {
@@ -488 +495 @@
                         continue;
                 
+                if ((!kcon) && (len == 4) && (strncmp(cmdline, "exit", 4) == 0))
+                        break;
+                
                 cmd_info = parse_cmdline(cmdline, len);
                 if (!cmd_info)
                         continue;
-                
-                if ((!kcon)
-                    && (strncmp(cmd_info->name, "exit", min(strlen(cmd_info->name), 5)) == 0))
-                        break;
                 
                 (void) cmd_info->func(cmd_info->argv);