diff --git a/src/main.c b/src/main.c index d4bce3c..ff6d1d5 100644 --- a/src/main.c +++ b/src/main.c @@ -53,9 +53,7 @@ MSH_ENTRY_POINT { } break; default: - if (leftoff > 0) { - --leftoff; - } + break; } } diff --git a/src/system/linux/linux.c b/src/system/linux/linux.c index d199d2a..88020db 100644 --- a/src/system/linux/linux.c +++ b/src/system/linux/linux.c @@ -124,7 +124,7 @@ int msh_execute(char *cmd, char **args) { SIZE_TYPE ret; char *status_str; - /* msh_linux_setup_signals(); */ + // msh_linux_setup_signals(); ret = (SIZE_TYPE)SYSCALL(waitid, P_ALL, fork, &status, WEXITED, &ru); @@ -133,11 +133,11 @@ int msh_execute(char *cmd, char **args) { itoa(status.si_code, status_str, 10); msh_print_strings("Status ", status_str, "\n", 0); msh_deallocate(status_str); -*/ SYSCALL(kill, fork, SIGKILL); SYSCALL(write, 1, "\r", 2); + */ msh_linux_start_input_capture(); return status.si_signo; diff --git a/src/system/linux/linux.h b/src/system/linux/linux.h index 2cad83c..3312d85 100644 --- a/src/system/linux/linux.h +++ b/src/system/linux/linux.h @@ -11,7 +11,7 @@ void msh_linux_env_map_deinit(); void msh_linux_start_input_capture(); void msh_linux_end_input_capture(); -/* void msh_linux_setup_signals(); */ +void msh_linux_setup_signals(); struct msh_file_t { int fd; diff --git a/src/system/linux/signal.c b/src/system/linux/signal.c index 234bf0e..d9f35d3 100644 --- a/src/system/linux/signal.c +++ b/src/system/linux/signal.c @@ -2,7 +2,6 @@ * we return from them. Why? Because go fuck yourself :) and go spend 6 hours * of your day trying to find out why before giving up :) */ -/* #include "linux.h" #include "syscall.h" #include @@ -22,9 +21,7 @@ static void signal_handler(int sig) { msh_deallocate(status_str); } -static void signal_restorer(void) { - SYSCALL_0(rt_sigreturn); -} +static void signal_restorer(void) { SYSCALL_0(rt_sigreturn); } void msh_linux_setup_signals() { struct sigaction sigact; @@ -50,4 +47,3 @@ void msh_linux_setup_signals() { INIT_SIGNAL(SIGQUIT); INIT_SIGNAL(SIGTRAP); } -*/