diff --git a/srcs/built_in/choose_builtin.c b/srcs/built_in/choose_builtin.c index db3e974..72029c1 100644 --- a/srcs/built_in/choose_builtin.c +++ b/srcs/built_in/choose_builtin.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/02/28 17:12:52 by sadjigui #+# #+# */ -/* Updated: 2022/04/16 02:26:33 by apommier ### ########.fr */ +/* Updated: 2022/04/18 03:09:02 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/built_in/env.c b/srcs/built_in/env.c index 4d542dc..4376943 100644 --- a/srcs/built_in/env.c +++ b/srcs/built_in/env.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/09 21:09:47 by apommier #+# #+# */ -/* Updated: 2022/04/09 21:23:45 by apommier ### ########.fr */ +/* Updated: 2022/04/18 03:10:15 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,7 +20,7 @@ int print_env(t_cmd *cmd) if (cmd->current_s_cmd->nb_args > 1) { ft_putstr_fd("Minishell: env: too many arguments\n", 2); - return (check_return(cmd->current_s_cmd, 127)); + return (check_return(cmd->current_s_cmd, 1)); } else if (cmd->env) { diff --git a/srcs/built_in/utils_builtin.c b/srcs/built_in/utils_builtin.c index 0f1baed..50c040b 100644 --- a/srcs/built_in/utils_builtin.c +++ b/srcs/built_in/utils_builtin.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/16 15:04:12 by sadjigui #+# #+# */ -/* Updated: 2022/04/15 02:37:09 by apommier ### ########.fr */ +/* Updated: 2022/04/18 03:15:44 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -68,8 +68,14 @@ int check_return(t_s_cmd *cmd, int var) if (cmd->child) { cmd->big_cmd->err_var = var; + return (var); } else + { + close(cmd->big_cmd->tmpin); + close(cmd->big_cmd->tmpout); + free_cmd(cmd->big_cmd); exit(var); + } } diff --git a/srcs/pipe/pipe.c b/srcs/pipe/pipe.c index 2fc8a7f..8da7d90 100644 --- a/srcs/pipe/pipe.c +++ b/srcs/pipe/pipe.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/02 18:51:31 by apommier #+# #+# */ -/* Updated: 2022/04/17 02:09:44 by apommier ### ########.fr */ +/* Updated: 2022/04/18 03:16:38 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -138,7 +138,7 @@ void execute(t_cmd *cmd, char **env) fdin = dup(tmpin); while(cmd->current_s_cmd) { - if (i > 0) + if (i > 0 ) close(fdout); cmd->current_s_cmd->child = 1; fdout = -1; diff --git a/valgrind.mk b/valgrind.mk deleted file mode 100644 index 3eff309..0000000 --- a/valgrind.mk +++ /dev/null @@ -1,23 +0,0 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# valgrind.mk :+: :+: :+: # -# +:+ +:+ +:+ # -# By: apommier +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2021/12/10 15:19:04 by jodufour #+# #+# # -# Updated: 2022/03/06 16:04:33 by apommier ### ########.fr # -# # -# **************************************************************************** # - -VG_OPT = --suppressions=ignoreliberror -VG_OPT += --leak-check=full -VG_OPT += --show-leak-kinds=all -VG_OPT += --track-fds=yes -VG_OPT += --trace-children=yes - -valgrind: - ${MAKE} ${NAME} DEBUG=1 - $@ ${VG_OPT} ./${NAME} - -.PHONY: valgrind \ No newline at end of file