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

fix: all fds is now in childreen

Browse Source
This commit is contained in:
Camille Chauvet
2023-03-31 16:36:15 +02:00
parent d9ae113b94
commit a7e75bb163
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
execution/execution.c
View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/21 12:45:16 by cchauvet #+# #+# */
/* Updated: 2023/03/30 14:03:07 by cchauvet ### ########.fr */
/* Updated: 2023/03/31 16:32:38 by alouis-j ### ########.fr */
/* */
/* ************************************************************************** */
@ -41,7 +41,7 @@ static int ft_execute_own_cmd(t_data *data, t_cmd *cmd)
return (return_code);
}
static bool ft_executor(t_cmd *cmd, char **env, int fd)
static bool ft_executor(t_data *data, t_cmd *cmd, char **env)
{
if (cmd->fd_in[0] == -1 || cmd->fd_out[0] == -1 || cmd->executable == NULL)
return (0);
@ -53,17 +53,14 @@ static bool ft_executor(t_cmd *cmd, char **env, int fd)
{
dup2(cmd->fd_in[0], 0);
dup2(cmd->fd_out[0], 1);
if (fd != -1)
close(fd);
ft_closer(cmd->fd_in);
ft_closer(cmd->fd_out);
ft_lstiter(*data->cmds, ft_cmdcloser);
execve(cmd->executable, cmd->args, env);
return (1);
}
return (0);
}
static int ft_cmd_executor(t_data *data, t_cmd *cmd, int fd)
static int ft_cmd_executor(t_data *data, t_cmd *cmd)
{
int exit_code;
char **env;
@ -81,7 +78,7 @@ static int ft_cmd_executor(t_data *data, t_cmd *cmd, int fd)
env = env_to_strs(data->env);
if (env == NULL)
return (1);
exit_code = ft_executor(cmd, env, fd);
exit_code = ft_executor(data, cmd, env);
ft_closer(cmd->fd_in);
ft_closer(cmd->fd_out);
ft_freer_tab_ultimate(1, env);
@ -111,7 +108,7 @@ int ft_cmds_executor(t_data *data)
}
if (content->fd_in[0] == -2 || content->fd_out[0] == -2)
ft_mega_closer(content->fd_in, content->fd_out);
else if (ft_cmd_executor(data, content, fds[0]))
else if (ft_cmd_executor(data, content))
return (1);
current = current->next;
}