From 255892e12e7b5ab5063385da0a03099713cdd511 Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@3A2.42angouleme.fr>
Date: Tue, 21 Feb 2023 15:07:14 +0100
Subject: [PATCH 1/3] fix: use builtin

---
 .execution.c.swp | Bin 0 -> 20480 bytes
 execution.c      |  34 +++++++++++++++++++---------------
 main.c           |   9 +++++++--
 minishell.h      |   4 ++--
 vsupp            |  15 +++++++++++++++
 5 files changed, 43 insertions(+), 19 deletions(-)
 create mode 100644 .execution.c.swp
 create mode 100644 vsupp

diff --git a/.execution.c.swp b/.execution.c.swp
new file mode 100644
index 0000000000000000000000000000000000000000..99fb472180b65abdc713e53a5aad1b4f6631ef53
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/execution.c b/execution.c
index fa73ae0..6bf9281 100644
--- a/execution.c
+++ b/execution.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 13:48:39 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:06:12 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -95,21 +95,25 @@ static int	ft_excutor(t_cmd *cmd, t_list **env)
 
 static int	ft_own_cmd(t_list **env, t_cmd *cmd)
 {
-	/* if (ft_strcmp(cmd->executable, "pwd") == 0) */
-	/* 	return (pwd(env, cmd->fd_out)); */
-	if (ft_strcmp(cmd->executable, "env") == 0)
-		return (print_env(env, cmd->fd_out));
-	if (ft_strcmp(cmd->executable, "export") == 0)
-		return (print_export(env, cmd->fd_out));
-	/* if (ft_strcmp(cmd->executable, "cd") == 0) */
-	/* 	return (move_folder(cmd->args[0], cmd->fd_out)); */
+	int	return_code;
+
+	return_code = -1;
+	if (ft_strcmp(cmd->executable, "pwd") == 0)
+		return_code = pwd(cmd->fd_out);
+	else if (ft_strcmp(cmd->executable, "env") == 0)
+		return_code = print_env(env, cmd->fd_out);
+	else if (ft_strcmp(cmd->executable, "export") == 0)
+		return_code = (print_export(env, cmd->fd_out));
+	else if (ft_strcmp(cmd->executable, "cd") == 0)
+		return_code = (move_folder(cmd->args[0], cmd->fd_out));
 	/* if (ft_strcmp(cmd->executable, "unset") == 0) */
-	/* 	return (unset(env, cmd->args, cmd->fd_out)); */
-	/* if (ft_strcmp(cmd->executable, "echo") == 0) */
-	/* 	return (echo(cmd->fd_out, cmd->args[0])); */
-	if (ft_strcmp(cmd->executable, "exit") == 0)
-		return (-2);
-	return (-1);
+	/* 	return_code = (unset(env, cmd->args, cmd->fd_out)); */
+	else if (ft_strcmp(cmd->executable, "echo") == 0)
+		return_code = (echo(cmd->fd_out, cmd->args + 1));
+	else if (ft_strcmp(cmd->executable, "exit") == 0)
+		return_code = -2;
+	cmd->executable = NULL;
+	return (return_code);
 }
 
 int	ft_cmds_executor(t_list **cmds, t_list **env)
diff --git a/main.c b/main.c
index b67da56..41e02c6 100644
--- a/main.c
+++ b/main.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/16 15:16:14 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:24:45 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 14:48:07 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,8 +17,13 @@ static char	*ft_get_user_input(t_list **env)
 {
 	char	*line;
 	char	*prompt;
+	char	*pwd;
 
-	prompt = ft_strmerger(2, get_value_by_key("PWD", env), "$ ");
+	pwd = get_pwd(2);
+	if (pwd == NULL)
+		return (NULL);
+	prompt = ft_strmerger(2, pwd, "$ ");
+	free(pwd);
 	if (prompt == NULL)
 	{
 		ft_eprintf("minishell: malloc failed\n");
diff --git a/minishell.h b/minishell.h
index 53889ca..531af7d 100644
--- a/minishell.h
+++ b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:43:45 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:05:50 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,7 +60,7 @@ char		*get_value(char *str);
 char		*get_key(char *str);
 
 /* Echo */
-int			echo(int fd, char *str);
+int			echo(int fd, char **args);
 /* PWD */
 int			pwd(int fd);
 char		*get_pwd(int fd);
diff --git a/vsupp b/vsupp
new file mode 100644
index 0000000..1b3bbf6
--- /dev/null
+++ b/vsupp
@@ -0,0 +1,15 @@
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:readline
+   ...
+}
+
+{
+   readline
+   Memcheck:Leak
+   ...
+   fun:add_history
+   ...
+}

From a20fa2a4c6091430248268b93ebe3ad5682be899 Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@3A2.42angouleme.fr>
Date: Tue, 21 Feb 2023 15:12:26 +0100
Subject: [PATCH 2/3] fix: add '\n' pwd

---
 builtins/pwd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtins/pwd.c b/builtins/pwd.c
index 65d3f00..aa7f39c 100644
--- a/builtins/pwd.c
+++ b/builtins/pwd.c
@@ -6,7 +6,7 @@
 /*   By: erey-bet <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/17 16:09:11 by erey-bet          #+#    #+#             */
-/*   Updated: 2023/02/21 14:34:50 by erey-bet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:11:38 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,10 +17,10 @@ int	pwd(int fd)
 	char	path[PATH_MAX];
 
 	if (getcwd(path, sizeof(path)) != NULL) 
-		ft_putstr_fd(path, fd);
+		ft_putendl_fd(path, fd);
 	else 
 	{
-		ft_putstr_fd("Error getcwd", fd);
+		ft_putendl_fd("Error getcwd", fd);
 		return (1);
 	}
 	return (0);
@@ -35,7 +35,7 @@ char	*get_pwd(int fd)
 		return (str);
 	else 
 	{
-		ft_putstr_fd("Error getcwd", fd);
+		ft_putendl_fd("Error getcwd", fd);
 		return (NULL);
 	}
 }

From d7032849d6d92a51c15c1d5aa8b7caf9e495463d Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@3A2.42angouleme.fr>
Date: Tue, 21 Feb 2023 15:32:22 +0100
Subject: [PATCH 3/3] fix: minishell rework

---
 .execution.c.swp | Bin 20480 -> 0 bytes
 execution.c      |  11 +++++++----
 minishell.h      |   4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)
 delete mode 100644 .execution.c.swp

diff --git a/.execution.c.swp b/.execution.c.swp
deleted file mode 100644
index 99fb472180b65abdc713e53a5aad1b4f6631ef53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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

diff --git a/execution.c b/execution.c
index 6bf9281..53eb881 100644
--- a/execution.c
+++ b/execution.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/21 12:45:16 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 15:06:12 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:31:02 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,8 @@ static char	*ft_get_executable_path(char *executable_name, t_list **env)
 	char	**tab;
 	size_t	i;
 
+	if (executable_name == NULL)
+		return (NULL);
 	path = NULL;
 	if (executable_name[0] == '.' || executable_name[0] == '/')
 	{
@@ -108,11 +110,12 @@ static int	ft_own_cmd(t_list **env, t_cmd *cmd)
 		return_code = (move_folder(cmd->args[0], cmd->fd_out));
 	/* if (ft_strcmp(cmd->executable, "unset") == 0) */
 	/* 	return_code = (unset(env, cmd->args, cmd->fd_out)); */
-	else if (ft_strcmp(cmd->executable, "echo") == 0)
-		return_code = (echo(cmd->fd_out, cmd->args + 1));
+	/* else if (ft_strcmp(cmd->executable, "echo") == 0) */
+	/* 	return_code = (echo(cmd->fd_out, cmd->args + 1)); */
 	else if (ft_strcmp(cmd->executable, "exit") == 0)
 		return_code = -2;
-	cmd->executable = NULL;
+	if (return_code != -1)
+		cmd->executable = NULL;
 	return (return_code);
 }
 
diff --git a/minishell.h b/minishell.h
index 531af7d..09dd7dd 100644
--- a/minishell.h
+++ b/minishell.h
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/02/14 13:45:30 by cchauvet          #+#    #+#             */
-/*   Updated: 2023/02/21 15:05:50 by cchauvet         ###   ########.fr       */
+/*   Updated: 2023/02/21 15:10:50 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -60,7 +60,7 @@ char		*get_value(char *str);
 char		*get_key(char *str);
 
 /* Echo */
-int			echo(int fd, char **args);
+int			echo(int fd, char *str);
 /* PWD */
 int			pwd(int fd);
 char		*get_pwd(int fd);