42/42_INT_07_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add ctrl-c and ctrl-d aka eof handling

Browse Source
This commit is contained in:
hugogogo
2021-11-10 13:46:17 +01:00
parent 0a33916c75
commit d65a701186
5 changed files with 26 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
srcs/shell_loop.c
View File

@@ -6,16 +6,12 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
/* Updated: 2021/11/02 14:15:04 by hulamy ### ########.fr */
/* Updated: 2021/11/10 13:43:10 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
//static char **tokens_list_to_argv(t_token *t); // temp test
void sigint_handler(int signum); //tmp
void sigquit_aka_eof_handler(int signum); //tmp
void close_fd(t_cmd *cmd);
void execute_cmd(char **envp, t_cmd **cmd_arr);
@@ -33,44 +29,15 @@ void shell_loop(t_all *c)
{
add_history(line_input);
c->token_list = input_to_tokens(line_input);
// TEMP
// A faire aprés être sortie du mode interactif
// - Ignorer tout les signaux
// - Remettre ori_termios
c->signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGINT, &c->signal_behaviour, NULL);
sigaction(SIGQUIT, &c->signal_behaviour, NULL);
tcsetattr(STDIN_FILENO, TCSANOW, &c->ori_termios);
if (!fork())
{
char *arg_test[3];
arg_test[0] = ft_strdup("sleep");
arg_test[1] = ft_strdup("3");
arg_test[2] = NULL;
sigaction(SIGQUIT, &c->ori_signal_behaviour, NULL);
sigaction(SIGINT, &c->ori_signal_behaviour, NULL);
execve("/bin/sleep", arg_test, c->envp);
}
else
{
int wait_test;
wait(&wait_test);
c->signal_behaviour.sa_handler = sigint_handler;
sigaction(SIGINT, &c->signal_behaviour, NULL);
c->signal_behaviour.sa_handler = SIG_IGN;
sigaction(SIGQUIT, &c->signal_behaviour, NULL);
tcsetattr(STDIN_FILENO, TCSANOW, &c->interactive_termios);
}
// EXEC
c->cmd_arr = parsing(c->token_list, c->envp);
execute_cmd(c->envp, c->cmd_arr);
ft_lstclear((t_list **)&c->token_list, free);
}
else if (!line_input)
write(1, "\n", 1);
{
write(1, "exit\n", 5);
exit(0);
}
}
}