Changeset 73878c1 in mainline

Timestamp:

2009-06-03T19:30:19Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cbff4c2

Parents:

36b8100a

Message:

bdsh: sync with I/O changes, block until spawned task exits

Location:

uspace/app/bdsh

Files:

• cmds/modules/kcon/kcon.c (modified) (2 diffs)
• exec.c (modified) (1 diff)
• input.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/kcon/kcon.c

@@ -31 +31 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <console.h>
+#include <io/console.h>
 #include "config.h"
 #include "util.h"
@@ -66 +66 @@
         }
 
-        console_kcon_enable();
+        console_kcon_enable(fphone(stdout));
 
         return CMD_SUCCESS;

uspace/app/bdsh/exec.c

@@ -124 +124 @@
                 cli_error(CL_EEXEC, "Cannot spawn `%s'.", cmd);
                 return 1;
-        } else {
-                return 0;
         }
+        
+        task_wait(tid);
+        return 0;
 }

uspace/app/bdsh/input.c

@@ -33 +33 @@
 #include <stdlib.h>
 #include <string.h>
-#include <io/stream.h>
-#include <console.h>
-#include <kbd/kbd.h>
-#include <kbd/keycode.h>
+#include <io/console.h>
+#include <io/keycode.h>
+#include <io/style.h>
 #include <errno.h>
 #include <bool.h>
@@ -101 +100 @@
 static void read_line(char *buffer, int n)
 {
-        kbd_event_t ev;
+        console_event_t ev;
         size_t offs, otmp;
         wchar_t dec;
@@ -108 +107 @@
         while (true) {
                 fflush(stdout);
-                if (kbd_get_event(&ev) < 0)
+                if (!console_get_event(fphone(stdin), &ev))
                         return;
-                if (ev.type == KE_RELEASE)
+                
+                if (ev.type != KEY_PRESS)
                         continue;
-
+                
                 if (ev.key == KC_ENTER || ev.key == KC_NENTER)
                         break;
@@ -132 +132 @@
                 }
                 if (ev.c >= ' ') {
-                        //putchar(ev.c);
                         if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK)
-                                console_putchar(ev.c);
+                                putchar(ev.c);
                 }
         }
@@ -148 +147 @@
         char line[INPUT_MAX];
 
-        console_set_style(STYLE_EMPHASIS);
+        console_set_style(fphone(stdout), STYLE_EMPHASIS);
         printf("%s", usr->prompt);
-        console_set_style(STYLE_NORMAL);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
 
         read_line(line, INPUT_MAX);