RarDog/opencoreC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sh): fix prompt escape truncation, handle CRLF and filter ANSI escape sequences

Browse Source
This commit is contained in:
RarDog
2026-09-02 19:55:31 +03:00
parent 28da1587b9
commit 521f7ed9ce
1 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servers/sh/main.cpp
+50 -20
View File
@@ -28,12 +28,16 @@ static VfsFile vfs_nodes[16] = {
static size_t vfs_count = 11;
static void print_prompt() {
sys_log_debug("\033[1;32mroot@opencoreC\033[0m:\033[1;34m~\033[0m# ", 36);
const char prompt[] = "root@opencoreC:~# ";
sys_log_debug(prompt, sizeof(prompt) - 1);
}
static void handle_command(char *cmd) {
while (*cmd && ((unsigned char)*cmd <= ' ' || (unsigned char)*cmd > 126)) {
cmd++;
}
size_t len = strlen(cmd);
while (len > 0 && (cmd[len - 1] == ' ' || cmd[len - 1] == '\t' || cmd[len - 1] == '\r')) {
while (len > 0 && (cmd[len - 1] == ' ' || cmd[len - 1] == '\t' || cmd[len - 1] == '\r' || (unsigned char)cmd[len - 1] <= ' ')) {
cmd[--len] = '\0';
}
if (len == 0) return;
@@ -221,34 +225,60 @@ extern "C" void _start() {
print_prompt();
bool prev_was_cr = false;
bool in_escape = false;
while (true) {
int key = sys_key_read();
if (key > 0) {
char c = (char)key;
if (c == '\n' || c == '\r') {
// Handle ANSI Escape sequences (e.g. arrow keys: ESC [ A)
if (in_escape) {
if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '~') {
in_escape = false;
}
continue;
}
if (c == 27) { // ESC
in_escape = true;
continue;
}
if (c == '\r' || c == '\n') {
if (c == '\n' && prev_was_cr) {
prev_was_cr = false;
continue;
}
prev_was_cr = (c == '\r');
putchar('\n');
input_line[line_len] = '\0';
handle_command(input_line);
line_len = 0;
print_prompt();
} else if (c == 8 || c == 127) { // Backspace
if (line_len > 0) {
line_len--;
sys_log_debug("\b \b", 3);
} else {
prev_was_cr = false;
if (c == 8 || c == 127) { // Backspace
if (line_len > 0) {
line_len--;
sys_log_debug("\b \b", 3);
}
} else if (c == 3) { // Ctrl+C
sys_log_debug("^C\n", 3);
line_len = 0;
print_prompt();
} else if (c == 12) { // Ctrl+L (Clear)
sys_log_debug("\033[2J\033[H", 7);
print_prompt();
for (size_t i = 0; i < line_len; i++) {
putchar(input_line[i]);
}
} else if (c >= 32 && c <= 126) {
if (line_len < sizeof(input_line) - 1) {
input_line[line_len++] = c;
putchar(c);
}
}
} else if (c == 3) { // Ctrl+C
sys_log_debug("^C\n", 3);
line_len = 0;
print_prompt();
} else if (c == 12) { // Ctrl+L (Clear)
sys_log_debug("\033[2J\033[H", 7);
print_prompt();
for (size_t i = 0; i < line_len; i++) {
putchar(input_line[i]);
}
} else if (line_len < sizeof(input_line) - 1) {
input_line[line_len++] = c;
putchar(c);
}
} else {
sys_yield();