Fixed heredoc fd-leaks when SIGINT'd

Author: Ahmed Alsahfy

Makefile

@@ -4,7 +4,7 @@ NAME := minishell
 
 # Necessities
 CC := cc
-CFLAGS = -Wall -Wextra -Werror -Wpedantic -g3 -fsanitize=address,undefined
+CFLAGS = -Wall -Wextra -Werror -Wpedantic -g3 #-fsanitize=address,undefined
 OS := $(shell uname)
 
 Dar = Darwin

includes/interpreter.h

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   interpreter.h                                      :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: ebinjama <ebinjama@student.42abudhabi.ae>  +#+  +:+       +#+        */
+/*   By: aalshafy <aalshafy@student.42abudhabi.a    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/18 09:53:03 by ebinjama          #+#    #+#             */
-/*   Updated: 2024/06/26 14:27:09 by ebinjama         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:41:12 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -135,6 +135,7 @@ void	perform_wait_and_fetch_wstatus(t_shcontext *mshcontext);
 int		determine_exit_code(t_shcontext *mshcontext);
 int		store_heredoc_input(t_astnode *lredir, int *pipedes,
 			t_shcontext *mshcontext);
+void	close_heredoc_recursively(t_astnode *node);
 void	perform_word_checks_and_close_pipes_if_needed(t_astnode *word,
 			t_shcontext *mshcontext, char **envp, t_node *envl);
 void	ignore_signals_and_close_pipes_if_needed_then_set_pid(t_astnode *word,

srcs/interpreter/interpreter.c

@@ -6,7 +6,7 @@
 /*   By: aalshafy <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/12 02:40:13 by ebinjama          #+#    #+#             */
-/*   Updated: 2024/06/25 20:56:37 by aalshafy         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:40:33 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,8 @@ static void			visit(t_astnode *node, t_node *envl,
 static void			find_rightmost_word(t_astnode *root, t_astnode **to_set);
 void				restore_iodes(t_shcontext *mshcontext, bool clear);
 
+
+
 int	interpret(t_astnode *root, t_node *envl)
 {
 	t_shcontext	mshcontext;
@@ -32,7 +34,11 @@ int	interpret(t_astnode *root, t_node *envl)
 	find_rightmost_word(root, &mshcontext.rightmost_word);
 	visit_prematurely(root, &mshcontext);
 	if (mshcontext.terminate)
+	{
+		close_heredoc_recursively(root);
+		restore_iodes(&mshcontext, true);
 		return (*(int *)envl->content = 130);
+	}
 	visit(root, envl, &mshcontext);
 	perform_wait_and_fetch_wstatus(&mshcontext);
 	restore_iodes(&mshcontext, true);

srcs/interpreter/processor_norme_dump/interpret_dump.c

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   interpret_dump.c                                   :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: ebinjama <ebinjama@student.42abudhabi.ae>  +#+  +:+       +#+        */
+/*   By: aalshafy <aalshafy@student.42abudhabi.a    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/18 15:12:42 by ebinjama          #+#    #+#             */
-/*   Updated: 2024/06/21 19:24:29 by ebinjama         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:40:37 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -64,3 +64,16 @@ int	determine_exit_code(t_shcontext *mshcontext)
 		return (EXIT_FAILURE);
 	return (EXIT_FAILURE);
 }
+
+void	close_heredoc_recursively(t_astnode *node)
+{
+	if (!node)
+		return ;
+	close_heredoc_recursively(node->left);
+	close_heredoc_recursively(node->right);
+	if (node->type == TK_LREDIR && node->data.redirection.mode == O_APPEND)
+	{
+		close(node->data.redirection.fd[READ_END]);
+		close(node->data.redirection.fd[WRITE_END]);
+	}
+}

srcs/msh.c

@@ -6,7 +6,7 @@
 /*   By: aalshafy <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/26 13:35:21 by aalshafy          #+#    #+#             */
-/*   Updated: 2024/06/26 13:43:13 by aalshafy         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:23:46 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

srcs/parsing/parser.c

@@ -6,7 +6,7 @@
 /*   By: aalshafy <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/19 16:59:25 by aalshafy          #+#    #+#             */
-/*   Updated: 2024/06/23 09:56:26 by aalshafy         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:11:31 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -63,7 +63,7 @@ int	parse_pipe(t_token **token_list, t_astnode **node)
 	if (!(*token_list)->prev || ((*node) && ((*node)->type == TK_AND
 				|| (*node)->type == TK_OR))
 		|| (*token_list)->next->token_type == TK_PIPE)
-		return (show_syntax_error((*token_list)->value), 2);
+		return (show_syntax_error((*token_list)->value), 6);
 	new_node = (t_astnode *)malloc(sizeof(t_astnode));
 	if (new_node == NULL)
 		return (1);
@@ -87,7 +87,7 @@ int	parse_redir(t_token **token_list, t_astnode **node)
 	t_astnode	*new_node;
 
 	if (!(*token_list)->next || (*token_list)->next->token_type != TK_WORD)
-		return (show_syntax_error("newline"), 2);
+		return (show_syntax_error("newline"), 6);
 	new_node = (t_astnode *)malloc(sizeof(t_astnode));
 	if (new_node == NULL)
 		return (1);

srcs/show_errors.c

@@ -6,7 +6,7 @@
 /*   By: aalshafy <[email protected]    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/25 17:22:25 by aalshafy          #+#    #+#             */
-/*   Updated: 2024/06/25 18:33:56 by aalshafy         ###   ########.fr       */
+/*   Updated: 2024/06/26 15:12:14 by aalshafy         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -52,6 +52,8 @@ void	show_error(int exit_status)
 		return ;
 	else if (exit_status == 5)
 		return ;
+	else if (exit_status == 6)
+		return ;
 	if (msg)
 		write(2, msg, ft_strlen(msg));
 }