| 33,6 → 33,11 |
|---|
| #include <stdlib.h> |
| #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" |
| 41,21 → 46,8 |
|---|
| #include "errors.h" |
| #include "exec.h" |
| |
| extern volatile unsigned int cli_interactive; |
| |
| /* Not exposed in input.h */ |
| static void cli_restricted(char *); |
| static void read_line(char *, int); |
| |
| /* More than a macro than anything */ |
| static void cli_restricted(char *cmd) |
| { |
| printf("%s is not available in %s mode\n", cmd, |
| cli_interactive ? "interactive" : "non-interactive"); |
| |
| return; |
| } |
| |
| /* Tokenizes input from console, sees if the first word is a built-in, if so |
| * invokes the built-in entry point (a[0]) passing all arguments in a[] to |
| * the handler */ |
| 69,14 → 61,11 |
|---|
| if (NULL == usr->line) |
| return CL_EFAIL; |
| |
| tmp = cli_strdup(usr->line); |
| tmp = str_dup(usr->line); |
| |
| /* Break up what the user typed, space delimited */ |
| |
| /* TODO: Protect things in quotes / ticks, expand wildcards */ |
| cmd[n] = cli_strtok(tmp, " "); |
| cmd[n] = strtok(tmp, " "); |
| while (cmd[n] && n < WORD_MAX) { |
| cmd[++n] = cli_strtok(NULL, " "); |
| cmd[++n] = strtok(NULL, " "); |
| } |
| |
| /* We have rubbish */ |
| 85,39 → 74,19 |
|---|
| goto finit; |
| } |
| |
| /* Its a builtin command */ |
| /* Its a builtin command ? */ |
| if ((i = (is_builtin(cmd[0]))) > -1) { |
| /* Its not available in this mode, see what try_exec() thinks */ |
| if (builtin_is_restricted(i)) { |
| rc = try_exec(cmd[0], cmd); |
| if (rc) |
| /* No external matching it could be found, tell the |
| * user that the command does exist, but is not |
| * available in this mode. */ |
| cli_restricted(cmd[0]); |
| goto finit; |
| } |
| /* Its a builtin, its available, run it */ |
| rc = run_builtin(i, cmd, usr); |
| goto finit; |
| /* We repeat the same dance for modules */ |
| /* Its a module ? */ |
| } else if ((i = (is_module(cmd[0]))) > -1) { |
| if (module_is_restricted(i)) { |
| rc = try_exec(cmd[0], cmd); |
| if (rc) |
| cli_restricted(cmd[0]); |
| goto finit; |
| } |
| rc = run_module(i, cmd); |
| goto finit; |
| } else { |
| /* Its not a module or builtin, restricted or otherwise. |
| * See what try_exec() thinks of it and just pass its return |
| * value back to the caller */ |
| rc = try_exec(cmd[0], cmd); |
| goto finit; |
| } |
| |
| /* See what try_exec thinks of it */ |
| rc = try_exec(cmd[0], cmd); |
| |
| finit: |
| if (NULL != usr->line) { |
| free(usr->line); |
| 129,31 → 98,46 |
|---|
| return rc; |
| } |
| |
| /* Borrowed from Jiri Svoboda's 'cli' uspace app */ |
| 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; |
| } |
| 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: |
| 162,15 → 146,16 |
|---|
| void get_input(cliuser_t *usr) |
| { |
| char line[INPUT_MAX]; |
| size_t len = 0; |
| |
| console_set_style(STYLE_EMPHASIS); |
| printf("%s", usr->prompt); |
| console_set_style(STYLE_NORMAL); |
| |
| read_line(line, INPUT_MAX); |
| len = strlen(line); |
| /* Make sure we don't have rubbish or a C/R happy user */ |
| if (len == 0 || line[0] == '\n') |
| if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0) |
| return; |
| usr->line = cli_strdup(line); |
| usr->line = str_dup(line); |
| |
| return; |
| } |