Rev 4496 | Only display areas with differences | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4496 | Rev 4541 | ||
---|---|---|---|
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
1 | /* Copyright (c) 2008, Tim Post <tinkertim@gmail.com> |
2 | * All rights reserved. |
2 | * All rights reserved. |
3 | * Copyright (c) 2008, Jiri Svoboda - All Rights Reserved |
3 | * Copyright (c) 2008, Jiri Svoboda - All Rights Reserved |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: |
6 | * modification, are permitted provided that the following conditions are met: |
7 | * |
7 | * |
8 | * Redistributions of source code must retain the above copyright notice, this |
8 | * Redistributions of source code must retain the above copyright notice, this |
9 | * list of conditions and the following disclaimer. |
9 | * list of conditions and the following disclaimer. |
10 | * |
10 | * |
11 | * Redistributions in binary form must reproduce the above copyright notice, |
11 | * Redistributions in binary form must reproduce the above copyright notice, |
12 | * this list of conditions and the following disclaimer in the documentation |
12 | * this list of conditions and the following disclaimer in the documentation |
13 | * and/or other materials provided with the distribution. |
13 | * and/or other materials provided with the distribution. |
14 | * |
14 | * |
15 | * Neither the name of the original program's authors nor the names of its |
15 | * Neither the name of the original program's authors nor the names of its |
16 | * contributors may be used to endorse or promote products derived from this |
16 | * contributors may be used to endorse or promote products derived from this |
17 | * software without specific prior written permission. |
17 | * software without specific prior written permission. |
18 | * |
18 | * |
19 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
20 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
21 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
22 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
22 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE |
23 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
25 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
26 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
27 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
28 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
29 | * POSSIBILITY OF SUCH DAMAGE. |
29 | * POSSIBILITY OF SUCH DAMAGE. |
30 | */ |
30 | */ |
31 | 31 | ||
32 | #include <stdio.h> |
32 | #include <stdio.h> |
33 | #include <stdlib.h> |
33 | #include <stdlib.h> |
34 | #include <string.h> |
34 | #include <string.h> |
35 | #include <io/console.h> |
35 | #include <io/console.h> |
36 | #include <io/keycode.h> |
36 | #include <io/keycode.h> |
37 | #include <io/style.h> |
37 | #include <io/style.h> |
38 | #include <vfs/vfs.h> |
38 | #include <vfs/vfs.h> |
39 | #include <errno.h> |
39 | #include <errno.h> |
40 | #include <bool.h> |
40 | #include <bool.h> |
41 | 41 | ||
42 | #include "config.h" |
42 | #include "config.h" |
43 | #include "util.h" |
43 | #include "util.h" |
44 | #include "scli.h" |
44 | #include "scli.h" |
45 | #include "input.h" |
45 | #include "input.h" |
46 | #include "errors.h" |
46 | #include "errors.h" |
47 | #include "exec.h" |
47 | #include "exec.h" |
48 | 48 | ||
49 | static void read_line(char *, int); |
49 | static void read_line(char *, int); |
50 | 50 | ||
51 | /* Tokenizes input from console, sees if the first word is a built-in, if so |
51 | /* Tokenizes input from console, sees if the first word is a built-in, if so |
52 | * invokes the built-in entry point (a[0]) passing all arguments in a[] to |
52 | * invokes the built-in entry point (a[0]) passing all arguments in a[] to |
53 | * the handler */ |
53 | * the handler */ |
54 | int tok_input(cliuser_t *usr) |
54 | int tok_input(cliuser_t *usr) |
55 | { |
55 | { |
56 | char *cmd[WORD_MAX]; |
56 | char *cmd[WORD_MAX]; |
57 | int n = 0, i = 0; |
57 | int n = 0, i = 0; |
58 | int rc = 0; |
58 | int rc = 0; |
59 | char *tmp; |
59 | char *tmp; |
60 | 60 | ||
61 | if (NULL == usr->line) |
61 | if (NULL == usr->line) |
62 | return CL_EFAIL; |
62 | return CL_EFAIL; |
63 | 63 | ||
64 | tmp = str_dup(usr->line); |
64 | tmp = str_dup(usr->line); |
65 | 65 | ||
66 | cmd[n] = strtok(tmp, " "); |
66 | cmd[n] = strtok(tmp, " "); |
67 | while (cmd[n] && n < WORD_MAX) { |
67 | while (cmd[n] && n < WORD_MAX) { |
68 | cmd[++n] = strtok(NULL, " "); |
68 | cmd[++n] = strtok(NULL, " "); |
69 | } |
69 | } |
70 | 70 | ||
71 | /* We have rubbish */ |
71 | /* We have rubbish */ |
72 | if (NULL == cmd[0]) { |
72 | if (NULL == cmd[0]) { |
73 | rc = CL_ENOENT; |
73 | rc = CL_ENOENT; |
74 | goto finit; |
74 | goto finit; |
75 | } |
75 | } |
76 | 76 | ||
77 | /* Its a builtin command ? */ |
77 | /* Its a builtin command ? */ |
78 | if ((i = (is_builtin(cmd[0]))) > -1) { |
78 | if ((i = (is_builtin(cmd[0]))) > -1) { |
79 | rc = run_builtin(i, cmd, usr); |
79 | rc = run_builtin(i, cmd, usr); |
80 | goto finit; |
80 | goto finit; |
81 | /* Its a module ? */ |
81 | /* Its a module ? */ |
82 | } else if ((i = (is_module(cmd[0]))) > -1) { |
82 | } else if ((i = (is_module(cmd[0]))) > -1) { |
83 | rc = run_module(i, cmd); |
83 | rc = run_module(i, cmd); |
84 | goto finit; |
84 | goto finit; |
85 | } |
85 | } |
86 | 86 | ||
87 | /* See what try_exec thinks of it */ |
87 | /* See what try_exec thinks of it */ |
88 | rc = try_exec(cmd[0], cmd); |
88 | rc = try_exec(cmd[0], cmd); |
89 | 89 | ||
90 | finit: |
90 | finit: |
91 | if (NULL != usr->line) { |
91 | if (NULL != usr->line) { |
92 | free(usr->line); |
92 | free(usr->line); |
93 | usr->line = (char *) NULL; |
93 | usr->line = (char *) NULL; |
94 | } |
94 | } |
95 | if (NULL != tmp) |
95 | if (NULL != tmp) |
96 | free(tmp); |
96 | free(tmp); |
97 | 97 | ||
98 | return rc; |
98 | return rc; |
99 | } |
99 | } |
100 | 100 | ||
101 | static void read_line(char *buffer, int n) |
101 | static void read_line(char *buffer, int n) |
102 | { |
102 | { |
103 | console_event_t ev; |
103 | console_event_t ev; |
104 | size_t offs, otmp; |
104 | size_t offs, otmp; |
105 | wchar_t dec; |
105 | wchar_t dec; |
106 | 106 | ||
107 | offs = 0; |
107 | offs = 0; |
108 | while (true) { |
108 | while (true) { |
109 | fflush(stdout); |
109 | fflush(stdout); |
110 | if (!console_get_event(fphone(stdin), &ev)) |
110 | if (!console_get_event(fphone(stdin), &ev)) |
111 | return; |
111 | return; |
112 | 112 | ||
113 | if (ev.type != KEY_PRESS) |
113 | if (ev.type != KEY_PRESS) |
114 | continue; |
114 | continue; |
115 | 115 | ||
116 | if (ev.key == KC_ENTER || ev.key == KC_NENTER) |
116 | if (ev.key == KC_ENTER || ev.key == KC_NENTER) |
117 | break; |
117 | break; |
118 | if (ev.key == KC_BACKSPACE) { |
118 | if (ev.key == KC_BACKSPACE) { |
119 | if (offs > 0) { |
119 | if (offs > 0) { |
120 | /* |
120 | /* |
121 | * Back up until we reach valid start of |
121 | * Back up until we reach valid start of |
122 | * character. |
122 | * character. |
123 | */ |
123 | */ |
124 | while (offs > 0) { |
124 | while (offs > 0) { |
125 | --offs; otmp = offs; |
125 | --offs; otmp = offs; |
126 | dec = str_decode(buffer, &otmp, n); |
126 | dec = str_decode(buffer, &otmp, n); |
127 | if (dec != U_SPECIAL) |
127 | if (dec != U_SPECIAL) |
128 | break; |
128 | break; |
129 | } |
129 | } |
130 | putchar('\b'); |
130 | putchar('\b'); |
131 | } |
131 | } |
132 | continue; |
132 | continue; |
133 | } |
133 | } |
134 | if (ev.c >= ' ') { |
134 | if (ev.c >= ' ') { |
135 | if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK) |
135 | if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK) |
136 | putchar(ev.c); |
136 | putchar(ev.c); |
137 | } |
137 | } |
138 | } |
138 | } |
139 | putchar('\n'); |
139 | putchar('\n'); |
140 | buffer[offs] = '\0'; |
140 | buffer[offs] = '\0'; |
141 | } |
141 | } |
142 | 142 | ||
143 | /* TODO: |
143 | /* TODO: |
144 | * Implement something like editline() / readline(), if even |
144 | * Implement something like editline() / readline(), if even |
145 | * just for command history and making arrows work. */ |
145 | * just for command history and making arrows work. */ |
146 | void get_input(cliuser_t *usr) |
146 | void get_input(cliuser_t *usr) |
147 | { |
147 | { |
148 | char line[INPUT_MAX]; |
148 | char line[INPUT_MAX]; |
149 | 149 | ||
- | 150 | fflush(stdout); |
|
150 | console_set_style(fphone(stdout), STYLE_EMPHASIS); |
151 | console_set_style(fphone(stdout), STYLE_EMPHASIS); |
151 | printf("%s", usr->prompt); |
152 | printf("%s", usr->prompt); |
- | 153 | fflush(stdout); |
|
152 | console_set_style(fphone(stdout), STYLE_NORMAL); |
154 | console_set_style(fphone(stdout), STYLE_NORMAL); |
153 | 155 | ||
154 | read_line(line, INPUT_MAX); |
156 | read_line(line, INPUT_MAX); |
155 | /* Make sure we don't have rubbish or a C/R happy user */ |
157 | /* Make sure we don't have rubbish or a C/R happy user */ |
156 | if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0) |
158 | if (str_cmp(line, "") == 0 || str_cmp(line, "\n") == 0) |
157 | return; |
159 | return; |
158 | usr->line = str_dup(line); |
160 | usr->line = str_dup(line); |
159 | 161 | ||
160 | return; |
162 | return; |
161 | } |
163 | } |
162 | 164 | ||
163 | 165 |