From 91125184596daf545fceb7d0eadbb122c6516956 Mon Sep 17 00:00:00 2001
From: y-syo <mmoussou@student.42angouleme.fr>
Date: Tue, 13 Aug 2024 16:38:42 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(exec):=20f?=
 =?UTF-8?q?ixed=20fd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/execution.h       |  4 +++-
 src/exec/exec_cmd.c       | 12 +++++++++++-
 src/exec/exec_split_cmd.c |  7 +++----
 src/exec/utils_exec_2.c   | 11 ++++++++++-
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/include/execution.h b/include/execution.h
index 47e665c..451153b 100644
--- a/include/execution.h
+++ b/include/execution.h
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/29 13:20:22 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/08/13 13:44:32 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/13 16:35:17 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,6 +41,8 @@ int		check_file(char *cmd, char *input);
 void	free_exec(t_env *env, char **env_array);
 void	ft_arrcpy(int *dst, int *src, int n);
 
+int		close_cmd(t_cmd *cmd);
+
 void	exec_cmd(t_cmd *cmd, char **env, t_env *env_t);
 void	__fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec);
 
diff --git a/src/exec/exec_cmd.c b/src/exec/exec_cmd.c
index a59667b..c1f23aa 100644
--- a/src/exec/exec_cmd.c
+++ b/src/exec/exec_cmd.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/15 21:03:31 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/08/09 17:59:41 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/08/13 16:34:41 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -45,6 +45,8 @@ void	exec_cmd(t_cmd *cmd, char **env, t_env *env_t)
 
 void	__fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
 {
+	int	i;
+
 	exec.status = dup2(cmd->infile, STDIN_FILENO);
 	if (cmd->infile != STDIN_FILENO)
 		close(cmd->infile);
@@ -58,7 +60,15 @@ void	__fork_single_cmd(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
 	if (exec.pipe_fd[0] != -1)
 		close(exec.pipe_fd[1]);
 	if (exec.status != -1)
+	{
+		i = 3;
+		while (i < 1024)
+		{
+			close(i);
+			i++;
+		}
 		exec_cmd(cmd, env, env_t);
+	}
 }
 
 int	exec_single_cmd_execution(t_cmd *cmd, char **env, t_env *env_t, t_exec exec)
diff --git a/src/exec/exec_split_cmd.c b/src/exec/exec_split_cmd.c
index 46c2ae8..86ce4b6 100644
--- a/src/exec/exec_split_cmd.c
+++ b/src/exec/exec_split_cmd.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/01 14:55:06 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/08/12 16:24:11 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/08/13 16:32:29 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,7 @@ int	exec_fork_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
 	char	*input;
 
 	if (!cmd->cmd)
-		return (get_exit_code(0));
+		return (close_cmd(cmd));
 	ft_arrcpy(exec.pipe_fd, pipe_fd, 2);
 	input = ft_strdup(cmd->cmd);
 	exec.status = switch_cmd_path(cmd, env_t);
@@ -54,8 +54,7 @@ int	exec_single_cmd(t_cmd *cmd, char **env, t_env *env_t, int pipe_fd[2])
 
 	if (!cmd->cmd)
 	{
-		if (cmd->argv)
-			ft_free("a", &(cmd->argv));
+		free_cmd(cmd);
 		rl_clear_history();
 		get_exit_code(0);
 		return (0);
diff --git a/src/exec/utils_exec_2.c b/src/exec/utils_exec_2.c
index b7c1069..49d3220 100644
--- a/src/exec/utils_exec_2.c
+++ b/src/exec/utils_exec_2.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/09 22:53:01 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/12 16:16:43 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/08/13 16:34:54 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -46,3 +46,12 @@ void	ft_arrcpy(int *dst, int *src, int n)
 	while (n--)
 		dst[n] = src[n];
 }
+
+int	close_cmd(t_cmd *cmd)
+{
+	if (cmd->infile != STDIN_FILENO)
+		close(cmd->infile);
+	if (cmd->outfile != STDOUT_FILENO)
+		close(cmd->outfile);
+	return (get_exit_code(0));
+}