raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pipeline works but leaks an fd

Browse source
This commit is contained in:
Maieul BOYER 2024-08-05 17:33:51 +02:00
parent 933d68c2da
commit 4f5cf3cf10
No known key found for this signature in database
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
exec/src/run_ast.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */ /* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */ /* Created: 2024/07/11 17:22:29 by maiboyer #+# #+# */
/* Updated: 2024/08/05 16:55:45 by maiboyer ### ########.fr */ /* Updated: 2024/08/05 17:32:25 by maiboyer ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -488,6 +488,8 @@ t_error run_until(t_ast_until *until, t_state *state, void *out) NOT_DONE;
t_error run_variable_assignment(t_ast_variable_assignment *variable_assignment, t_state *state, bool is_temporary, void *out) NOT_DONE; t_error run_variable_assignment(t_ast_variable_assignment *variable_assignment, t_state *state, bool is_temporary, void *out) NOT_DONE;
t_error run_while_(t_ast_while *while_, t_state *state, void *out) NOT_DONE; t_error run_while_(t_ast_while *while_, t_state *state, void *out) NOT_DONE;
void mem_free(void *free);
t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result *out) t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result *out)
{ {
t_usize i; t_usize i;
@ -500,6 +502,7 @@ t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result
if (pipeline == NULL || state == NULL || out == NULL) if (pipeline == NULL || state == NULL || out == NULL)
return (ERROR); return (ERROR);
i = 0; i = 0;
ret = NO_ERROR;
cmd_pipe.input = NULL; cmd_pipe.input = NULL;
cmd_pipe.create_output = true; cmd_pipe.create_output = true;
while (i < pipeline->statements.len - 1) while (i < pipeline->statements.len - 1)
@ -514,6 +517,8 @@ t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result
} }
else else
{ {
out->exit = cmd_result.exit;
close_fd(cmd_pipe.input);
if (cmd_result.process.stdout != NULL) if (cmd_result.process.stdout != NULL)
cmd_pipe.input = cmd_result.process.stdout; cmd_pipe.input = cmd_result.process.stdout;
else else
@ -540,6 +545,7 @@ t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result
else else
{ {
out->exit = cmd_result.exit; out->exit = cmd_result.exit;
close_fd(cmd_pipe.input);
if (cmd_result.process.stdout != NULL) if (cmd_result.process.stdout != NULL)
close_fd(cmd_result.process.stdout); close_fd(cmd_result.process.stdout);
if (cmd_result.process.stdin != NULL) if (cmd_result.process.stdin != NULL)
@ -549,6 +555,7 @@ t_error run_pipeline(t_ast_pipeline *pipeline, t_state *state, t_pipeline_result
} }
} }
} }
return (ret); return (ret);
} }
@ -635,6 +642,7 @@ void _ffree_func(struct s_ffree_state *state)
return; return;
hmap_env_free(state->state->env); hmap_env_free(state->state->env);
hmap_env_free(state->state->tmp_var); hmap_env_free(state->state->tmp_var);
close_fd(state->cmd_pipe.input);
} }
bool _is_builtin(t_const_str argv0); bool _is_builtin(t_const_str argv0);