From de3b52d9d47ab03a5d8ecb90ef232f346e09d9e0 Mon Sep 17 00:00:00 2001
From: yosyo <mmoussou@student.42angouleme.fr>
Date: Mon, 15 Jul 2024 15:52:56 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix(builtins/f?=
 =?UTF-8?q?t=5Fexit):=20fixed=20leaks=20:D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/builtins.h        |  5 +++--
 src/builtins/free_exit.c  | 15 ++++++++++++---
 src/builtins/ft_exit.c    |  7 +++++--
 src/exec/exec_split_cmd.c |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/include/builtins.h b/include/builtins.h
index 7ec0481..2f90947 100644
--- a/include/builtins.h
+++ b/include/builtins.h
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/22 13:05:18 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 13:29:21 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/15 15:48:38 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,7 +29,8 @@ void	ft_env(t_env *env);
 
 void	ft_unset(char *arg, t_env *env);
 
-void	ft_exit(char **argv, int ac);
+void	free_exit(t_env *env, char **env_array);
+void	ft_exit(char **argv, int ac, char **env_array, t_env *env);
 
 char	**env_get_list(t_env *env);
 void	add_to_env(char *name, char *content, t_env *env);
diff --git a/src/builtins/free_exit.c b/src/builtins/free_exit.c
index e845309..9bab737 100644
--- a/src/builtins/free_exit.c
+++ b/src/builtins/free_exit.c
@@ -3,19 +3,28 @@
 /*                                                        :::      ::::::::   */
 /*   free_exit.c                                        :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/15 12:28:36 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 15:27:45 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/15 15:50:55 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 #include "parsing.h"
 
-void	free_exit(t_env *env)
+void	free_exit(t_env *env, char **env_array)
 {
+	int	i;
+
+	i = 0;
+	while (i < 1024)
+	{
+		close(i);
+		i++;
+	}
 	rl_clear_history();
 	ft_envclear(&env, free);
 	ft_lstclear(get_list(NULL), &free_cmd);
+	ft_free("a", &env_array);
 }
diff --git a/src/builtins/ft_exit.c b/src/builtins/ft_exit.c
index 547adbe..e7aeb78 100644
--- a/src/builtins/ft_exit.c
+++ b/src/builtins/ft_exit.c
@@ -6,11 +6,12 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/14 13:46:57 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 15:14:57 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/15 15:49:06 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
+#include "builtins.h"
 
 int	check_exit_value(char *str)
 {
@@ -30,7 +31,7 @@ int	check_exit_value(char *str)
 	return (0);
 }
 
-void	ft_exit(char **argv, int ac)
+void	ft_exit(char **argv, int ac, char **env_array, t_env *env)
 {
 	int	return_value;
 
@@ -39,6 +40,7 @@ void	ft_exit(char **argv, int ac)
 	if (check_exit_value(argv[1]))
 	{
 		printf("minishell: exit: %s: numeric argument required\n", argv[1]);
+		free_exit(env, env_array);
 		exit(2);
 	}
 	else
@@ -50,6 +52,7 @@ void	ft_exit(char **argv, int ac)
 			return_value = atoi(argv[1]);
 			if (return_value == -1)
 				return_value += 255;
+			free_exit(env, env_array);
 			exit(get_exit_code(return_value));
 		}
 	}
diff --git a/src/exec/exec_split_cmd.c b/src/exec/exec_split_cmd.c
index 93237d7..b4f82fd 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/07/15 15:23:24 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/15 15:47:01 by mmoussou         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,7 +37,7 @@ void	exec_cmd(char *cmd, char **argv, char **env, t_env *env_t)
 		if (i == 7)
 			ft_env(env_t);
 		if (i == 1)
-			ft_exit(argv, ft_arrlen(argv));
+			ft_exit(argv, ft_arrlen(argv), env, env_t);
 	}
 	else
 		execve(cmd, argv, env);