diff --git a/srcs/exec/subshell_exec.c b/srcs/exec/subshell_exec.c index 1e1374d..b9e15cf 100644 --- a/srcs/exec/subshell_exec.c +++ b/srcs/exec/subshell_exec.c @@ -6,12 +6,14 @@ /* By: lperrey +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */ -/* Updated: 2021/12/01 16:49:37 by lperrey ### ########.fr */ +/* Updated: 2021/12/22 21:49:32 by lperrey ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" +static void exec_builtin(t_cmd *cmd, t_all *c); + int cmd_exec_in_subshell(t_cmd *cmd, t_all *c) { struct sigaction signal_behaviour; @@ -33,9 +35,21 @@ int cmd_exec_in_subshell(t_cmd *cmd, t_all *c) return (ft_reti_perror(EXIT_FAILURE, "dup2()")); close_pipeline_fd(c->pipeline); if (cmd->builtin_f) - exit_free(c, cmd->builtin_f(ft_2d_arrlen(cmd->argv), cmd->argv, c)); + exec_builtin(cmd, c); else if (execve(cmd->path, cmd->argv, environ) == -1) return (ft_reti_perror_io(EXIT_FAILURE, "execve() ", cmd->argv[0])); } return (EXIT_SUCCESS); } + +static void exec_builtin(t_cmd *cmd, t_all *c) +{ + struct sigaction signal_behaviour; + int ret; + + ft_bzero(&signal_behaviour, sizeof signal_behaviour); + signal_behaviour.sa_handler = SIG_IGN; + sigaction(SIGPIPE, &signal_behaviour, NULL); + ret = cmd->builtin_f(ft_2d_arrlen(cmd->argv), cmd->argv, c); + exit_free(c, ret); +}