「🔨」 fix: heredoc leak

include/parsing.h

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/25 12:20:26 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 15:14:32 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:54:27 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -58,6 +58,7 @@ typedef enum s_quote
  */
 size_t				strlen_till_char(char *s, int c);
 
+int					ft_ischevron(int c);
 bool				check_quote(char *readline);
 bool				check_syntax(char *readline);
 bool				check_redir(t_list *redir);

libft/src/linked_lists/ft_lstnew.c

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/11/07 16:02:40 by mmoussou          #+#    #+#             */
-/*   Updated: 2023/11/08 17:02:57 by mmoussou         ###   ########.fr       */
+/*   Updated: 2024/08/10 13:57:35 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,6 +16,8 @@ t_list	*ft_lstnew(void *content)
 {
 	t_list	*r;
 
+	if (!content || !*content)
+		return (NULL);
 	r = malloc(sizeof(t_list));
 	if (!r)
 		return (NULL);

src/exec/heredoc.c

@@ -6,12 +6,14 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/20 09:19:39 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/08/06 15:18:02 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 12:42:44 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "minishell.h"
 
+t_list	**get_list2(t_list **list);
+
 /*
  * # mode
  *	0: ouvre un nouveau fichier
@@ -77,6 +79,7 @@ void	__forked(char *delimiter, int fd)
 	get_input(delimiter, fd);
 	ft_envclear(get_env(NULL), free);
 	ft_lstclear(get_list(NULL), free);
+	ft_lstclear(get_list2(NULL), free_cmd);
 	ft_free("a", (char ***)get_void(NULL));
 	rl_clear_history();
 	close(fd);

src/exec/heredoc_utils.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/10 01:14:10 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 15:18:19 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 12:43:36 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,8 @@
 #include <fcntl.h>
 #include "minishell.h"
 
+t_list	**get_list2(t_list **list);
+
 int	__open_fd_here(char *path, int mode)
 {
 	int	fd;
@@ -67,6 +69,7 @@ void	__heredoc_sig(int code)
 	(void)code;
 	ft_envclear(get_env(NULL), free);
 	ft_lstclear(get_list(NULL), free);
+	ft_lstclear(get_list2(NULL), free_cmd);
 	ft_free("a", (char ***)get_void(NULL));
 	close(get_fd_heredoc(-1));
 	close(get_fd_heredoc(-1));

src/main.c

@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/24 11:18:04 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 17:08:09 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 13:16:30 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

src/parsing/check_error/check_redir.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/09 16:32:21 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/05 22:02:00 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:44:56 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,7 +23,7 @@ bool	check_redir(t_list *list)
 	while (tmp)
 	{
 		redir = (t_redir *)tmp->content;
-		if (redir->fd < 0)
+		if (redir->fd < 0 && redir->fd != -2)
 			return (send_error_parsing(ERROR_NO_FILE));
 		tmp = tmp->next;
 	}

src/parsing/ft_ischevron.c

@@ -0,0 +1,17 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_ischevron.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/10 17:53:56 by adjoly            #+#    #+#             */
+/*   Updated: 2024/08/10 17:53:59 by adjoly           ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+int	ft_ischevron(int c)
+{
+	return (c == '<' || c == '>');
+}
+

src/parsing/split_argv.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/05 13:48:57 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 17:23:12 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:54:35 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,11 +14,6 @@
 #include "parsing.h"
 #include <stdio.h>
 
-int	ft_ischevron(int c)
-{
-	return (c == '<' || c == '>');
-}
-
 size_t	__get_len_arg(char *s)
 {
 	char	*tmp;
@@ -69,21 +64,12 @@ size_t	__count_args(char *s)
 	return (i);
 }
 
-char	**split_argv(char *readline)
+char	**__split_argv(char *tmp)
 {
 	char	**argv;
 	char	**tmp_av;
-	char	*tmp;
 
-	tmp = readline;
+	argv = ft_calloc(__count_args(tmp) + 1, sizeof(char *));
-	if (!readline)
-		return (NULL);
-	if (!*readline)
-	{
-		free(readline);
-		return (NULL);
-	}
-	argv = ft_calloc(__count_args(readline) + 1, sizeof(char *));
 	tmp_av = argv;
 	while (*tmp)
 	{
@@ -97,6 +83,23 @@ char	**split_argv(char *readline)
 		}
 	}
 	*tmp_av = NULL;
+	return (argv);
+}
+
+char	**split_argv(char *readline)
+{
+	char	**argv;
+	char	*tmp;
+
+	if (!readline)
+		return (NULL);
+	if (!*readline)
+	{
+		free(readline);
+		return (NULL);
+	}
+	tmp = readline;
+	argv = __split_argv(tmp);
 	free(readline);
 	return (argv);
 }

src/parsing/tokenizer/__to_cmd.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/05 14:19:35 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 17:25:14 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:47:07 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -38,11 +38,6 @@ t_list	*__get_redir(char **content)
 		{
 			tmp = ft_lstnew(__open_heredoc(*(content + 1)));
 			ft_lstadd_back(&list, tmp);
-			if (((t_redir *)(tmp->content))->sign == ERROR)
-			{
-				ft_lstclear(&list, free_redir);
-				return (NULL);
-			}
 		}
 		else if (sign != ERROR)
 			ft_lstadd_back(&list, ft_lstnew(__to_redir(*(content + 1), sign)));
@@ -83,6 +78,5 @@ t_cmd	*__to_cmd(char **content)
 	free(content);
 	cmd->cmd = ft_strdup(cmd->argv[0]);
 	ft_lstclear(&redir, free);
-	printcmd(cmd);
 	return (cmd);
 }

src/parsing/tokenizer/tokenizer.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/18 20:13:50 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/06 17:05:44 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:46:54 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,9 +14,11 @@
 #include "minishell.h"
 #include <stdio.h>
 
+t_list	**get_list2(t_list **list);
+
 void	*clear_all(t_list *cmd, t_list *piped)
 {
-	ft_lstclear(&cmd, free);
+	ft_lstclear(&cmd, free_cmd);
 	ft_lstclear(&piped, free);
 	return (NULL);
 }
@@ -38,6 +40,10 @@ t_list	*tokenizer(char *readline, t_env *env)
 		ft_lstadd_back(&cmd,
 			ft_lstnew(__to_cmd(split_argv(env_var_replace(tmp->content,
 							env)))));
+		if (((t_cmd *)ft_lstlast(cmd)->content)->infile == -2)
+			return (clear_all(cmd, piped));
+		if (!cmd->next)
+			get_list2(&cmd);
 		if (!ft_lstlast(cmd)->content)
 			return (clear_all(cmd, piped));
 		tmp = tmp->next;

src/utils/get.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/18 13:08:56 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/18 13:09:15 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:53:22 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,3 +20,12 @@ char	**get_rl(char **rl)
 		ret = rl;
 	return (ret);
 }
+
+int	get_fd_heredoc(int in)
+{
+	static int	fd;
+
+	if (in != -1)
+		fd = in;
+	return (fd);
+}

src/utils/get_to_free.c

@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/09 17:24:15 by adjoly            #+#    #+#             */
-/*   Updated: 2024/08/05 23:11:27 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/10 17:53:25 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,6 +31,15 @@ t_list	**get_list(t_list **list)
 	return (ret);
 }
 
+t_list	**get_list2(t_list **list)
+{
+	static t_list	**ret;
+
+	if (list)
+		ret = list;
+	return (ret);
+}
+
 void	*get_void(void *in)
 {
 	static void	*ret;
@@ -55,12 +64,3 @@ int	get_exit_code(int in)
 		exit_code += 256;
 	return (exit_code);
 }
-
-int	get_fd_heredoc(int in)
-{
-	static int	fd;
-
-	if (in != -1)
-		fd = in;
-	return (fd);
-}