From 38572614766aed2a740b61700f403ee2955134ad Mon Sep 17 00:00:00 2001
From: Adam Joly <adjoly@student.42angouleme.fr>
Date: Tue, 9 Jul 2024 16:24:25 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20Fixed?=
 =?UTF-8?q?=20prompt=20and=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/prompt.h        |  6 +++---
 src/main.c              | 34 +++++++++++++++++++++++-----------
 src/prompt/get_prompt.c |  6 +++---
 src/prompt/get_pwd.c    |  8 ++++----
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/include/prompt.h b/include/prompt.h
index 57fabf9..4a82684 100644
--- a/include/prompt.h
+++ b/include/prompt.h
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/19 13:48:05 by adjoly            #+#    #+#             */
-/*   Updated: 2024/05/27 18:59:56 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/09 14:35:40 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -29,13 +29,13 @@ char	*get_hostname(void);
  *
  * @return (char *)		the pwd
  */
-char	*get_pwd(t_env env);
+char	*get_pwd(t_env *env);
 
 /**
  * @brief				return the full prompt
  *
  * @prompt (char *)		the prompt
  */
-char	*get_prompt(t_env env);
+char	*get_prompt(t_env *env);
 
 #endif
diff --git a/src/main.c b/src/main.c
index 2ac3b50..d9d299a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/09 14:40:50 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/07/09 16:08:08 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,17 +34,19 @@ bool	run_checks(char *rl)
 	return (false);
 }
 
-/*int	main(int ac, char **av, char **env)
+int	main(int ac, char **av, char **env)
 {
 	char	*rl;
 	char	*prompt;
-	t_env	env_l;
+	t_env	*env_l;
 	t_list	*cmd_list;
 	t_list	*piped;
 
 	(void)ac;
+	rl = NULL;
 	get_program_name(av[0]);
-	if (env_init(env, &env_l))
+	env_l = env_init(env);
+	if (!env_l)
 		return (EXIT_FAILURE);
 	signal(SIGINT, &sig_c);
 	while (1)
@@ -53,24 +55,34 @@ bool	run_checks(char *rl)
 		rl = readline(prompt);
 		free(prompt);
 		if (!rl)
-			exit(727);
+			break ;
+		if (!*rl)
+		{
+			
+			continue ;
+		}
 		if (run_checks(rl))
 			continue ;
 		piped = tokenizer(rl);
 		if (check_argv(piped))
 			continue ;
 		add_history(rl);
-		cmd_list = get_cmd_list(piped, &env_l);
+		cmd_list = get_cmd_list(piped, env_l);
 		ft_lstclear(&piped, &free_token);
 		format_quotes(cmd_list);
-		exec_split_cmd(cmd_list, &env_l);
+		exec_split_cmd(cmd_list, env_l);
 		ft_lstclear(&cmd_list, &free_cmd);
 		free(rl);
 	}
-	return (0);
-}*/
+	free(rl);
+	rl_clear_history();
+	//ft_lstclear(&piped, &free_token);
+	//ft_lstclear(&cmd_list, &free_cmd);
+	ft_envclear(&env_l, free);
+	return (727);
+}
 
-int	main(int ac, char **av, char **e)
+/*int	main(int ac, char **av, char **e)
 {
 	t_env	*env;
 
@@ -79,4 +91,4 @@ int	main(int ac, char **av, char **e)
 	env = env_init(e);
 	ft_envprint(env);
 	ft_envclear(&env, free);
-}
+}*/
diff --git a/src/prompt/get_prompt.c b/src/prompt/get_prompt.c
index b49dc84..4a5e30d 100644
--- a/src/prompt/get_prompt.c
+++ b/src/prompt/get_prompt.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/30 13:25:42 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/04 17:14:30 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/09 14:35:13 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,11 +14,11 @@
 #include "prompt.h"
 #include "env.h"
 
-char	*get_prompt(t_env env)
+char	*get_prompt(t_env *env)
 {
 	char	*prompt;
 
-	prompt = env_get_value("USER", &env);
+	prompt = env_get_value("USER", env);
 	if (!prompt)
 		prompt = ft_strdup("nixos");
 	prompt = ft_strjoin_free_s1(prompt, "@");
diff --git a/src/prompt/get_pwd.c b/src/prompt/get_pwd.c
index 3f1a13d..381ab07 100644
--- a/src/prompt/get_pwd.c
+++ b/src/prompt/get_pwd.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/02 14:42:00 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/04 17:14:14 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/07/09 14:36:05 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,16 +14,16 @@
 #include "libft.h"
 #include "env.h"
 
-char	*get_pwd(t_env env)
+char	*get_pwd(t_env *env)
 {
 	char	*pwd;
 	char	*home;
 	char	*tmp;
 
-	pwd = env_get_value("PWD", &env);
+	pwd = env_get_value("PWD", env);
 	if (!pwd)
 		return (NULL);
-	home = env_get_value("HOME", &env);
+	home = env_get_value("HOME", env);
 	if (!home)
 		return (NULL);
 	if (!ft_strncmp(pwd, home, ft_strlen(home) - 1))