From 22f7565d47f53d9d763a0f2ebdc9e48655723bd9 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Sat, 6 Jul 2024 13:36:03 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20working?= =?UTF-8?q?=20parsing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/minishell.h | 5 +++++ src/free_list.c | 42 +++++++++++++++++++++++++++++++++++ src/main.c | 53 +-------------------------------------------- 3 files changed, 48 insertions(+), 52 deletions(-) create mode 100644 src/free_list.c diff --git a/include/minishell.h b/include/minishell.h index 402d7fa..7d4c0e5 100644 --- a/include/minishell.h +++ b/include/minishell.h @@ -34,4 +34,9 @@ char set_env(char **env, const char *name, char *content); bool is_str(char *src, char *dst); void print_cmd(t_cmd *cmd); + +void free_redir(void *redir_v); +void free_token(void *token_v); +void free_cmd(void *content); + #endif diff --git a/src/free_list.c b/src/free_list.c new file mode 100644 index 0000000..940dde9 --- /dev/null +++ b/src/free_list.c @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* free_list.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/07/04 20:10:35 by adjoly #+# #+# */ +/* Updated: 2024/07/04 20:12:06 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" +#include "parsing.h" + +void free_redir(void *redir_v) +{ + t_redirection *redir; + + redir = redir_v; + free(redir->file_name); +} + +void free_token(void *token_v) +{ + t_token *token; + + token = token_v; + free(token->argv); + ft_lstclear(&(token->redirection), free_redir); + free(token); +} + +void free_cmd(void *content) +{ + t_cmd *cmd; + + cmd = (t_cmd *)content; + free(cmd->cmd); + ft_free("a", &(cmd->argv)); + free(cmd); +} diff --git a/src/main.c b/src/main.c index 9e30ebf..d623417 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: mmoussou file_name); -} - -void free_token(void *token_v) -{ - t_token *token; - - token = token_v; - print_token(token); - free(token->argv); - ft_lstclear(&(token->redirection), free_redir); - free(token); -} - -/*void print_cmd(t_cmd cmd) -{ - ft_putendl_fd(cmd.cmd, 1); - while (*(cmd.argv)) - { - ft_putendl_fd(*(cmd.argv), 1); - (cmd.argv)++; - } -}*/ - -void print_pipe(t_list *pipe) -{ - t_list *tmp; - - tmp = pipe; - while (tmp) - { - ft_putendl_fd(tmp->content, STDOUT_FILENO); - tmp = tmp->next; - } -} - void sig_c(int code) { (void)code; @@ -74,16 +33,6 @@ void sig_c(int code) rl_redisplay(); } -void free_cmd(void *content) -{ - t_cmd *cmd; - - cmd = (t_cmd *)content; - free(cmd->cmd); - ft_free("a", &(cmd->argv)); - free(cmd); -} - int main(int ac, char **av, char **env) { char *rl;