| /branches/network/uspace/app/bdsh/input.c |
|---|
| 34,6 → 34,10 |
| #include <string.h> |
| #include <io/stream.h> |
| #include <console.h> |
| #include <kbd/kbd.h> |
| #include <kbd/keycode.h> |
| #include <errno.h> |
| #include <bool.h> |
| #include "config.h" |
| #include "util.h" |
| 96,30 → 100,44 |
| static void read_line(char *buffer, int n) |
| { |
| char c; |
| int chars; |
| kbd_event_t ev; |
| size_t offs, otmp; |
| wchar_t dec; |
| chars = 0; |
| while (chars < n - 1) { |
| c = getchar(); |
| if (c < 0) |
| offs = 0; |
| while (true) { |
| fflush(stdout); |
| if (kbd_get_event(&ev) < 0) |
| return; |
| if (c == '\n') |
| if (ev.type == KE_RELEASE) |
| continue; |
| if (ev.key == KC_ENTER || ev.key == KC_NENTER) |
| break; |
| if (c == '\b') { |
| if (chars > 0) { |
| if (ev.key == KC_BACKSPACE) { |
| if (offs > 0) { |
| /* |
| * Back up until we reach valid start of |
| * character. |
| */ |
| while (offs > 0) { |
| --offs; otmp = offs; |
| dec = str_decode(buffer, &otmp, n); |
| if (dec != U_SPECIAL) |
| break; |
| } |
| putchar('\b'); |
| --chars; |
| } |
| continue; |
| } |
| if (c >= ' ') { |
| putchar(c); |
| buffer[chars++] = c; |
| if (ev.c >= ' ') { |
| //putchar(ev.c); |
| if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK) |
| console_putchar(ev.c); |
| } |
| } |
| putchar('\n'); |
| buffer[chars] = '\0'; |
| buffer[offs] = '\0'; |
| } |
| /* TODO: |
| /branches/network/uspace/app/bdsh/cmds/modules/kcon/kcon.h |
|---|
| 0,0 → 1,8 |
| #ifndef KCON_H |
| #define KCON_H |
| /* Prototypes for the kcon command, excluding entry points */ |
| #endif /* KCON_H */ |
| /branches/network/uspace/app/bdsh/cmds/modules/kcon/entry.h |
|---|
| 0,0 → 1,9 |
| #ifndef KCON_ENTRY_H |
| #define KCON_ENTRY_H |
| /* Entry points for the kcon command */ |
| extern int cmd_kcon(char **); |
| extern void help_cmd_kcon(unsigned int); |
| #endif /* KCON_ENTRY_H */ |
| /branches/network/uspace/app/bdsh/cmds/modules/kcon/kcon.c |
|---|
| 0,0 → 1,72 |
| /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions are met: |
| * |
| * Redistributions of source code must retain the above copyright notice, this |
| * list of conditions and the following disclaimer. |
| * |
| * Redistributions in binary form must reproduce the above copyright notice, |
| * this list of conditions and the following disclaimer in the documentation |
| * and/or other materials provided with the distribution. |
| * |
| * Neither the name of the original program's authors nor the names of its |
| * contributors may be used to endorse or promote products derived from this |
| * software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| * POSSIBILITY OF SUCH DAMAGE. |
| */ |
| #include <stdio.h> |
| #include <stdlib.h> |
| #include <console.h> |
| #include "config.h" |
| #include "util.h" |
| #include "errors.h" |
| #include "entry.h" |
| #include "kcon.h" |
| #include "cmds.h" |
| static char *cmdname = "kcon"; |
| /* Dispays help for kcon in various levels */ |
| void help_cmd_kcon(unsigned int level) |
| { |
| printf("`kcon' switches to the kernel debug console.\n"); |
| if (level != HELP_SHORT) { |
| printf("Usage: %s\n", cmdname); |
| } |
| return; |
| } |
| /* Main entry point for kcon, accepts an array of arguments */ |
| int cmd_kcon(char **argv) |
| { |
| unsigned int argc; |
| argc = cli_count_args(argv); |
| if (argc != 1) { |
| printf("%s - incorrect number of arguments. Try `%s --help'\n", |
| cmdname, cmdname); |
| return CMD_FAILURE; |
| } |
| console_kcon_enable(); |
| return CMD_SUCCESS; |
| } |
| /branches/network/uspace/app/bdsh/cmds/modules/kcon/kcon_def.h |
|---|
| 0,0 → 1,7 |
| { |
| "kcon", |
| "Switch to kernel console", |
| &cmd_kcon, |
| &help_cmd_kcon, |
| }, |
| /branches/network/uspace/app/bdsh/cmds/modules/modules.h |
|---|
| 26,6 → 26,7 |
| #include "pwd/entry.h" |
| #include "sleep/entry.h" |
| #include "cp/entry.h" |
| #include "kcon/entry.h" |
| /* Each .def function fills the module_t struct with the individual name, entry |
| * point, help entry point, etc. You can use config.h to control what modules |
| 41,6 → 42,7 |
| #include "pwd/pwd_def.h" |
| #include "sleep/sleep_def.h" |
| #include "cp/cp_def.h" |
| #include "kcon/kcon_def.h" |
| {NULL, NULL, NULL, NULL} |
| }; |
| /branches/network/uspace/app/bdsh/Makefile |
|---|
| 57,6 → 57,7 |
| cmds/modules/pwd/ \ |
| cmds/modules/sleep/ \ |
| cmds/modules/cp/ \ |
| cmds/modules/kcon/ \ |
| cmds/builtins/ \ |
| cmds/builtins/exit/\ |
| cmds/builtins/cd/ |
| 71,6 → 72,7 |
| cmds/modules/pwd/pwd.c \ |
| cmds/modules/sleep/sleep.c \ |
| cmds/modules/cp/cp.c \ |
| cmds/modules/kcon/kcon.c \ |
| cmds/builtins/exit/exit.c \ |
| cmds/builtins/cd/cd.c \ |
| cmds/mod_cmds.c \ |