From fb92167494d811e00c1717be48eac9815b099323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Tue, 6 May 2025 16:53:54 +0200 Subject: [PATCH] fix(here_doc): correctly delete here_doc files in more cases --- src/parser/cmd/cmd_destroy.c | 9 +++++---- src/parser/cmd/cmd_destroy.h | 4 ++-- src/parser/redirect/redirect_from_words.c | 4 ++-- src/parser/redirect/redirect_parse.c | 7 ++++--- src/parser/remove_quotes/cmdgroup_remove_quotes.c | 12 ++++++------ src/parser/simple_cmd/simple_cmd.c | 8 ++++---- src/postprocess/expansion/expand_vars.c | 8 ++++---- src/postprocess/expansion/expand_wildcard.c | 14 +++++++------- src/postprocess/fieldsplit/redirect_fieldsplit.c | 8 ++++---- src/sig/sig_handlers.c | 8 ++++---- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/parser/cmd/cmd_destroy.c b/src/parser/cmd/cmd_destroy.c index 3b34eb8..1b35ac1 100644 --- a/src/parser/cmd/cmd_destroy.c +++ b/src/parser/cmd/cmd_destroy.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/09 16:53:02 by kcolin #+# #+# */ -/* Updated: 2025/05/05 11:22:40 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:51:04 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ #include "../simple_cmd/simple_cmd.h" #include "libft.h" -void redirect_destroy(t_redirect *redirect) +void redirect_destroy(t_redirect *redirect, bool delete_file) { t_redirect *next; @@ -25,7 +25,8 @@ void redirect_destroy(t_redirect *redirect) free(redirect->here_doc_eof); if (redirect->type == FT_HEREDOC && redirect->redirectee.filename != NULL - && redirect->redirectee.filename->word != NULL) + && redirect->redirectee.filename->word != NULL + && delete_file) unlink(redirect->redirectee.filename->word); worddesc_destroy(redirect->redirectee.filename); free(redirect->unexpanded_filename); @@ -48,7 +49,7 @@ static void group_cmd_destroy(t_group_cmd *cmd) if (cmd == NULL) return ; cmd_destroy(cmd->cmd); - redirect_destroy(cmd->redirects); + redirect_destroy(cmd->redirects, false); free(cmd); } diff --git a/src/parser/cmd/cmd_destroy.h b/src/parser/cmd/cmd_destroy.h index 8085785..04a5eae 100644 --- a/src/parser/cmd/cmd_destroy.h +++ b/src/parser/cmd/cmd_destroy.h @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/09 16:52:31 by kcolin #+# #+# */ -/* Updated: 2025/04/14 15:10:13 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:50:26 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,6 +16,6 @@ # include "../../minishell.h" void cmd_destroy(t_cmd *cmd); -void redirect_destroy(t_redirect *redirect); +void redirect_destroy(t_redirect *redirect, bool delete_file); #endif // CMD_DESTROY_H diff --git a/src/parser/redirect/redirect_from_words.c b/src/parser/redirect/redirect_from_words.c index 7cab2f6..30ffe9e 100644 --- a/src/parser/redirect/redirect_from_words.c +++ b/src/parser/redirect/redirect_from_words.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/02 14:40:34 by kcolin #+# #+# */ -/* Updated: 2025/05/02 14:40:34 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:50:52 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -83,7 +83,7 @@ t_redirect *redir_from_words(t_worddesc *operator, here_doc(spec, STDIN_FILENO, app), 0, NULL, WORD_TOKEN); worddesc_destroy(spec); if (redir->redirectee.filename == NULL) - return (redirect_destroy(redir), NULL); + return (redirect_destroy(redir, true), NULL); } else redir->redirectee.filename = specifier; diff --git a/src/parser/redirect/redirect_parse.c b/src/parser/redirect/redirect_parse.c index 528b8cf..8b8c3be 100644 --- a/src/parser/redirect/redirect_parse.c +++ b/src/parser/redirect/redirect_parse.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/15 10:13:58 by kcolin #+# #+# */ -/* Updated: 2025/04/17 11:45:24 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:57:51 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,11 +34,12 @@ t_redirect *minishell_redirect_parse(t_minishell *app, t_wordlist **tokens) else { worddesc_destroy(redir_operator); - return (ft_errno(FT_EERRNO), redirect_destroy(redir_list), NULL); + return (ft_errno(FT_EERRNO), redirect_destroy(redir_list, true), + NULL); } new_redir = redir_from_words(redir_operator, redir_specifier, app); if (new_redir == NULL && ft_errno_get() != FT_ESUCCESS) - return (redirect_destroy(redir_list), NULL); + return (redirect_destroy(redir_list, true), NULL); t_redirect_add_back(&redir_list, new_redir); } return (redir_list); diff --git a/src/parser/remove_quotes/cmdgroup_remove_quotes.c b/src/parser/remove_quotes/cmdgroup_remove_quotes.c index 9ad039c..b865079 100644 --- a/src/parser/remove_quotes/cmdgroup_remove_quotes.c +++ b/src/parser/remove_quotes/cmdgroup_remove_quotes.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* cmdgroup_remove_quotes.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: jguelen +#+ +:+ +#+ */ +/* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2025/03/20 17:36:20 by kcolin #+# #+# */ -/* Updated: 2025/05/02 12:53:03 by jguelen ### ########.fr */ +/* Created: 2025/05/06 16:50:43 by kcolin #+# #+# */ +/* Updated: 2025/05/06 16:50:43 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,10 +33,10 @@ static t_redirect *redirection_remove_quotes(t_redirect *in_list) current->redirectee.filename = result; if (current->redirectee.filename == NULL) { - redirect_destroy(in_list); - redirect_destroy(out_list); + redirect_destroy(in_list, true); + redirect_destroy(out_list, true); ft_errno(FT_EERRNO); - return (redirect_destroy(current), NULL); + return (redirect_destroy(current, true), NULL); } } out_list = t_redirect_add_back(&out_list, current); diff --git a/src/parser/simple_cmd/simple_cmd.c b/src/parser/simple_cmd/simple_cmd.c index 77c897b..8d146fa 100644 --- a/src/parser/simple_cmd/simple_cmd.c +++ b/src/parser/simple_cmd/simple_cmd.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* simple_cmd.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: jguelen +#+ +:+ +#+ */ +/* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2025/02/21 12:30:07 by kcolin #+# #+# */ -/* Updated: 2025/05/02 12:53:31 by jguelen ### ########.fr */ +/* Created: 2025/05/06 16:52:05 by kcolin #+# #+# */ +/* Updated: 2025/05/06 16:52:05 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,7 +32,7 @@ void simple_cmd_destroy(t_simple_cmd *cmd) if (cmd == NULL) return ; wordlist_destroy(cmd->words); - redirect_destroy(cmd->redirections); + redirect_destroy(cmd->redirections, false); free(cmd); } diff --git a/src/postprocess/expansion/expand_vars.c b/src/postprocess/expansion/expand_vars.c index eb3e5c9..6f77edf 100644 --- a/src/postprocess/expansion/expand_vars.c +++ b/src/postprocess/expansion/expand_vars.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/01 13:34:51 by kcolin #+# #+# */ -/* Updated: 2025/04/28 14:38:29 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:52:25 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,9 +36,9 @@ static t_redirect *redirection_var_expansion(t_redirect *in_list, if (current->redirectee.filename == NULL && ft_errno_get() != FT_ESUCCESS) { - redirect_destroy(in_list); - redirect_destroy(out_list); - return (redirect_destroy(current), NULL); + redirect_destroy(in_list, true); + redirect_destroy(out_list, true); + return (redirect_destroy(current, true), NULL); } } out_list = t_redirect_add_back(&out_list, current); diff --git a/src/postprocess/expansion/expand_wildcard.c b/src/postprocess/expansion/expand_wildcard.c index 8ababac..83c2cd1 100644 --- a/src/postprocess/expansion/expand_wildcard.c +++ b/src/postprocess/expansion/expand_wildcard.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* expand_wildcard.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: jguelen +#+ +:+ +#+ */ +/* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/03 19:28:28 by kcolin #+# #+# */ -/* Updated: 2025/05/02 13:00:43 by jguelen ### ########.fr */ +/* Created: 2025/05/06 16:51:47 by kcolin #+# #+# */ +/* Updated: 2025/05/06 16:52:34 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,13 +30,13 @@ static t_redirect *redirect_expand_wildcard_one(t_redirect *current) if (expansion_result != NULL) { ambiguous_redirect(current->unexpanded_filename); - redirect_destroy(current); + redirect_destroy(current, true); wordlist_destroy(expansion_result); return (ft_errno(FT_EERRNO), NULL); } } else if (expansion_result == NULL && ft_errno_get() != FT_ESUCCESS) - return (redirect_destroy(current), NULL); + return (redirect_destroy(current, true), NULL); return (current); } @@ -55,8 +55,8 @@ static t_redirect *redirect_expand_wildcards(t_redirect *in_list) if (redirect_expand_wildcard_one(current) == NULL && ft_errno_get() != FT_ESUCCESS) { - redirect_destroy(in_list); - redirect_destroy(out_list); + redirect_destroy(in_list, true); + redirect_destroy(out_list, true); return (NULL); } } diff --git a/src/postprocess/fieldsplit/redirect_fieldsplit.c b/src/postprocess/fieldsplit/redirect_fieldsplit.c index 85c3115..0b5bd3f 100644 --- a/src/postprocess/fieldsplit/redirect_fieldsplit.c +++ b/src/postprocess/fieldsplit/redirect_fieldsplit.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/21 11:54:16 by kcolin #+# #+# */ -/* Updated: 2025/04/23 11:19:26 by kcolin ### ########.fr */ +/* Updated: 2025/05/06 16:51:36 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,9 +20,9 @@ static void redirect_fieldsplit_cleanup(t_redirect *in_list, t_redirect *out_list, t_redirect *current, t_simple_cmd *cmd) { - redirect_destroy(in_list); - redirect_destroy(out_list); - redirect_destroy(current); + redirect_destroy(in_list, true); + redirect_destroy(out_list, true); + redirect_destroy(current, true); cmd->redirections = NULL; } diff --git a/src/sig/sig_handlers.c b/src/sig/sig_handlers.c index f5db905..b466af8 100644 --- a/src/sig/sig_handlers.c +++ b/src/sig/sig_handlers.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* sig_handlers.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: jguelen +#+ +:+ +#+ */ +/* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/17 12:01:39 by kcolin #+# #+# */ -/* Updated: 2025/05/05 12:03:03 by jguelen ### ########.fr */ +/* Created: 2025/05/06 16:57:25 by kcolin #+# #+# */ +/* Updated: 2025/05/06 16:57:27 by kcolin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -70,4 +70,4 @@ void sig_heredoc(int signum, siginfo_t *siginfo, void *context) ft_printf("\n"); } g_signum = signum; -} \ No newline at end of file +}