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

close cmd fd after each exec

Browse Source
This commit is contained in:
lperrey
2021-12-20 18:10:53 +01:00
parent 0cfb13595c
commit e138e6550b
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headers/minishell_prototypes.h
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/08 02:59:58 by lperrey #+# #+# */
/* Updated: 2021/12/20 17:49:56 by lperrey ### ########.fr */
/* Updated: 2021/12/20 18:06:36 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -63,6 +63,7 @@ int builtin_echo(int argc, char *argv[], t_all *c);
int exit_free(t_all *c, int exit_status);
void free_pipeline(t_cmd **pipeline_ptr[]);
void close_pipeline_fd(t_cmd *pipeline[]);
void close_cmd_fd(t_cmd *cmd);
void close_stdio(void);
typedef void (*t_free_f)(void *); // generic

4
srcs/exec/pipeline.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */
/* Updated: 2021/12/16 15:55:36 by lperrey ### ########.fr */
/* Updated: 2021/12/20 18:08:16 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -97,9 +97,9 @@ static pid_t pipeline_exec(t_cmd *pipeline[], t_all *c)
if (ret != EXIT_SUCCESS)
exit_free(c, ret);
}
close_cmd_fd(pipeline[i]);
i++;
}
close_pipeline_fd(c->pipeline);
i -= 1;
if (pipeline[i]->error)
set_last_exit_status(pipeline[i]->error);

31
srcs/misc/free.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/10 23:53:17 by lperrey #+# #+# */
/* Updated: 2021/12/18 14:15:13 by lperrey ### ########.fr */
/* Updated: 2021/12/20 18:06:15 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
@@ -57,22 +57,27 @@ void close_pipeline_fd(t_cmd *pipeline[])
i = 0;
while (pipeline[i])
{
if (pipeline[i]->fd_in != STDIN_FILENO && pipeline[i]->fd_in > 0)
{
if (close(pipeline[i]->fd_in) == -1)
perror("close()");
pipeline[i]->fd_in = 0;
}
if (pipeline[i]->fd_out != STDOUT_FILENO && pipeline[i]->fd_out > 0)
{
if (close(pipeline[i]->fd_out) == -1)
perror("close()");
pipeline[i]->fd_out = 0;
}
close_cmd_fd(pipeline[i]);
i++;
}
}
void close_cmd_fd(t_cmd *cmd)
{
if (cmd->fd_in != STDIN_FILENO && cmd->fd_in > 0)
{
if (close(cmd->fd_in) == -1)
perror("close()");
cmd->fd_in = 0;
}
if (cmd->fd_out != STDOUT_FILENO && cmd->fd_out > 0)
{
if (close(cmd->fd_out) == -1)
perror("close()");
cmd->fd_out = 0;
}
}
void close_stdio(void)
{
if (close(STDIN_FILENO) == -1)