From 89391a38c5822e0b2be80d1711f53dc43930f62c Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Tue, 13 Aug 2024 15:19:03 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=94=A8=E3=80=8D=20fix:=20fixed?= =?UTF-8?q?=20some=20things.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ok | 0 src/env/env_list/ft_envadd_back.c | 4 ++-- src/parsing/check_error/check_redir.c | 2 +- src/parsing/tokenizer/__to_cmd.c | 2 +- src/parsing/tokenizer/tokenizer.c | 18 ++++++++++-------- 5 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 ok diff --git a/ok b/ok deleted file mode 100644 index e69de29..0000000 diff --git a/src/env/env_list/ft_envadd_back.c b/src/env/env_list/ft_envadd_back.c index 6dc9f9b..217b335 100644 --- a/src/env/env_list/ft_envadd_back.c +++ b/src/env/env_list/ft_envadd_back.c @@ -6,7 +6,7 @@ /* By: mmoussou +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/07/09 16:32:21 by adjoly #+# #+# */ -/* Updated: 2024/08/10 17:44:56 by adjoly ### ########.fr */ +/* Updated: 2024/08/13 15:11:58 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/parsing/tokenizer/__to_cmd.c b/src/parsing/tokenizer/__to_cmd.c index eeadb9b..ada5093 100644 --- a/src/parsing/tokenizer/__to_cmd.c +++ b/src/parsing/tokenizer/__to_cmd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/08/05 14:19:35 by adjoly #+# #+# */ -/* Updated: 2024/08/13 13:40:20 by adjoly ### ########.fr */ +/* Updated: 2024/08/13 15:06:13 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/parsing/tokenizer/tokenizer.c b/src/parsing/tokenizer/tokenizer.c index 6798883..aec47f9 100644 --- a/src/parsing/tokenizer/tokenizer.c +++ b/src/parsing/tokenizer/tokenizer.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/18 20:13:50 by adjoly #+# #+# */ -/* Updated: 2024/08/13 13:47:48 by adjoly ### ########.fr */ +/* Updated: 2024/08/13 15:18:14 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -28,6 +28,7 @@ t_list *tokenizer(char *readline, t_env *env) t_list *cmd; t_list *piped; t_list *tmp; + t_cmd *ret; (void)(env); piped = __split_pipe(readline); @@ -37,17 +38,18 @@ t_list *tokenizer(char *readline, t_env *env) get_list(&piped); while (tmp) { - ft_lstadd_back(&cmd, - ft_lstnew(__to_cmd(split_argv(env_var_replace(tmp->content, - env))))); + ret = __to_cmd(split_argv(env_var_replace(tmp->content, env))); + if (!ret) + return (clear_all(cmd, piped)); + ft_lstadd_back(&cmd, ft_lstnew(ret)); if (!cmd) return (clear_all(cmd, piped)); - if (!ft_lstlast(cmd)->content) - return (clear_all(cmd, piped)); - if (!cmd->next) - get_list2(&cmd); if (((t_cmd *)ft_lstlast(cmd)->content)->infile == -2) return (clear_all(cmd, piped)); + //if (!ft_lstlast(cmd)->content) + //return (clear_all(cmd, piped)); + if (!cmd->next) + get_list2(&cmd); tmp = tmp->next; } ft_lstclear(&piped, free);