From 0a3a2cecc0f7a2b912a3b79806c096eb101e9ea2 Mon Sep 17 00:00:00 2001
From: Loic Deridder <lderidde@fu-r3-p4.s19.be>
Date: Wed, 5 Feb 2025 09:10:17 +0100
Subject: [PATCH] invalid free

---
 srcs/execution/exec.c | 13 ++++++-------
 srcs/main.c           | 38 ++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/srcs/execution/exec.c b/srcs/execution/exec.c
index 8ff62c6..d224a8e 100644
--- a/srcs/execution/exec.c
+++ b/srcs/execution/exec.c
@@ -6,7 +6,7 @@
 /*   By: lderidde <lderidde@student.s19.be>        +#+  +:+       +#+         */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/27 11:22:33 by lderidde          #+#    #+#             */
-/*   Updated: 2025/02/04 15:34:39 by lderidde         ###   ########.fr       */
+/*   Updated: 2025/02/05 09:09:56 by lderidde         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -47,6 +47,7 @@ void	read_input(t_ast_n *node, int j)
 
 	r = 0;
 	i = 0;
+	ft_fprintf(2, "heredoc> ");
 	r = read(0, &c, 1);
 	while (r && c != '\n' && c != '\0')
 	{
@@ -55,7 +56,7 @@ void	read_input(t_ast_n *node, int j)
 		r = read(0, &c, 1);
 	}
 	buf[i] = '\0';
-	if (ft_strnstr(buf, node->files[j], ft_strlen(node->files[j])) == 0)
+	if (ft_strncmp(buf, node->files[j], ft_strlen(node->files[j])) == 0)
 	{
 		close(node->fds[1]);
 		exit(EXIT_SUCCESS);
@@ -103,8 +104,8 @@ void	handle_redir(t_ast_n *node)
 			handle_file(node, 3, i);
 		else if (node->redir[i] == _RED_DL)
 			here_doc(node, i);
-		if (node->redir[i] != _RED_DL && node->input != NULL)
-			free_null_ptr(node->input);
+		// if (node->redir[i] != _RED_DL)
+		// 	free_null_ptr(node->input);
 		if (node->redir[i] == _RED_L)
 		{
 			dup2(node->_stdin, STDIN_FILENO);
@@ -220,6 +221,7 @@ char	*find_path(char *cmd, char **env)
 void	return_error(char *arg, char *msg, int code)
 {
 	ft_fprintf(2, "%s: %s\n", arg, msg);
+	free(arg);
 	exit(code);
 }
 
@@ -232,10 +234,7 @@ int	exec(t_ast_n *node)
 	if (!path)
 		return_error(node->cmd, "command not found", 127);
 	if (access(path, X_OK) != 0)
-	{
-		free(path);
 		return_error(path, "Permission denied", 126);
-	}
 	execve(path, node->args, NULL);
 	free(path);
 	perror("execve");
diff --git a/srcs/main.c b/srcs/main.c
index a2bd943..94500ba 100644
--- a/srcs/main.c
+++ b/srcs/main.c
@@ -6,7 +6,7 @@
 /*   By: lderidde <lderidde@student.s19.be>        +#+  +:+       +#+         */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/01/27 14:16:52 by lderidde          #+#    #+#             */
-/*   Updated: 2025/02/03 14:19:09 by lderidde         ###   ########.fr       */
+/*   Updated: 2025/02/05 09:09:35 by lderidde         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,27 +14,29 @@
 
 char	*powerline(void)
 {
-	// char	*pwd;
-	// char	*tilt;
+	char	*pwd;
+	char	*tilt;
 	char	*input;
-	//
-	// pwd = getcwd(NULL, 0);
-	// if (ft_strncmp(pwd, "/home/", 6) == 0)
-	// {
-	// 	pwd = pwd + 6;
-	// 	while (*pwd && (*pwd) != '/')
-	// 		pwd = pwd + 1;
-	// 	tilt = " ~";
-	// }
-	// else
-	// 	tilt = " ";
+	char	*prompt;
+
+	pwd = getcwd(NULL, 0);
+	if (ft_strncmp(pwd, "/home/", 6) == 0)
+	{
+		pwd = pwd + 6;
+		while (*pwd && (*pwd) != '/')
+			pwd = pwd + 1;
+		tilt = " ~";
+	}
+	else
+		tilt = " ";
 // 	printf("%s----------------------------------------------
-//----------------------------------%s", POW5, RESET);
-// 	printf("\n%s   MMOAT %s%s%s%s%s %s%s%s ",
-// 		POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET);
-	input = readline(">> ");
+// ----------------------------------%s", POW5, RESET);
+	prompt = ft_sprintf("\n%s   MMOAT %s%s%s%s%s %s%s%s ",
+		POW1, POW2, POW3, POW4, tilt, pwd, RESET, POW5, RESET);
+	input = readline(prompt);
 	if (ft_strlen(input) > 0)
 		add_history(input);
+	free(prompt);
 	return (input);
 }