From 64ede5becdd045dc22866c9f6f6f3bcbe8469092 Mon Sep 17 00:00:00 2001 From: adjoly Date: Thu, 20 Jun 2024 14:28:54 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20$=20worki?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/parsing.h | 6 +++--- src/main.c | 13 ++++++------- src/parsing/env_var/env_var_replace.c | 12 +++++------- src/parsing/get_cmd_list.c | 6 +++--- src/parsing/get_redir_fd.c | 8 +++++--- src/parsing/is_inquote.c | 16 +++++++--------- src/parsing/split_cmd.c | 2 +- 7 files changed, 30 insertions(+), 33 deletions(-) diff --git a/include/parsing.h b/include/parsing.h index 99d85cc..4b0d799 100644 --- a/include/parsing.h +++ b/include/parsing.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/25 12:20:26 by adjoly #+# #+# */ -/* Updated: 2024/06/11 15:18:38 by adjoly ### ########.fr */ +/* Updated: 2024/06/18 12:58:53 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,8 +36,8 @@ typedef enum s_quote bool check_syntax(char *readline, char **argv); void send_error(char *msg, char **argv); void check_redir(t_list *redir, char **argv); -t_cmd *get_redir_fd(void *content); -t_list *get_cmd_list(t_list *list); +t_cmd *get_redir_fd(void *content, t_env *env); +t_list *get_cmd_list(t_list *list, t_env *env); char **split_argv(char *readline); char *env_var_replace(char *readline, t_env *env); size_t get_size_with_env(char *readline, t_env *env); diff --git a/src/main.c b/src/main.c index 6fc0e03..0ca7bce 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,7 @@ /* By: mmoussou content))->redirection, av); - ft_putendl_fd(env_var_replace(test, &env_l), STDOUT_FILENO); - cmd_list = get_cmd_list(piped); + //check_redir(((t_token *)(piped->content))->redirection, av); + cmd_list = get_cmd_list(piped, &env_l); //exec_split_cmd(cmd_list, &env_l); /*while (cmd_list) { @@ -97,9 +96,9 @@ int main(int ac, char **av, char **env) cmd_list = cmd_list->next; }*/ print_cmd(cmd_list->content); - free(test); - ft_lstclear(&piped, free_token); - ft_free("a", &lll); + //free(test); + //ft_lstclear(&piped, free_token); + //ft_free("a", &lll); } ft_free("a", &lll); return (0); diff --git a/src/parsing/env_var/env_var_replace.c b/src/parsing/env_var/env_var_replace.c index 44b0335..e451d2f 100644 --- a/src/parsing/env_var/env_var_replace.c +++ b/src/parsing/env_var/env_var_replace.c @@ -6,11 +6,12 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/06/05 21:14:04 by adjoly #+# #+# */ -/* Updated: 2024/06/11 16:26:06 by adjoly ### ########.fr */ +/* Updated: 2024/06/20 14:14:57 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include +#include #include "parsing.h" #include "env.h" @@ -37,15 +38,12 @@ char *env_var_replace(char *readline, t_env *env) tmp = readline; while (*tmp) { - print_quote_type(__is_quote(*tmp)); - if (*tmp == '$' && is_inquote(tmp, tmp - readline + 1) != SINGLE) + if (*tmp == '$' && is_inquote(readline, tmp - readline) != SINGLE) { tmp++; dollar_size = strlen_till_notalnum(tmp); - ft_putnbr_fd(dollar_size, STDOUT_FILENO); - dollar = env_getn_value(tmp, env, dollar_size); - write(1, tmp, dollar_size); - ft_putendl_fd(dollar, STDOUT_FILENO); + printf("%zu\n", dollar_size); + dollar = env_getn_value(tmp, env, dollar_size - 1); if (!dollar) { tmp += dollar_size; diff --git a/src/parsing/get_cmd_list.c b/src/parsing/get_cmd_list.c index 6665a94..c976ab5 100644 --- a/src/parsing/get_cmd_list.c +++ b/src/parsing/get_cmd_list.c @@ -6,14 +6,14 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/31 12:47:13 by adjoly #+# #+# */ -/* Updated: 2024/05/31 13:29:46 by adjoly ### ########.fr */ +/* Updated: 2024/06/18 12:58:36 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" #include "parsing.h" -t_list *get_cmd_list(t_list *list) +t_list *get_cmd_list(t_list *list, t_env *env) { t_list *tmp; t_list *cmd_list; @@ -22,7 +22,7 @@ t_list *get_cmd_list(t_list *list) cmd_list = NULL; while (tmp) { - ft_lstadd_back(&cmd_list, ft_lstnew(get_redir_fd(tmp->content))); + ft_lstadd_back(&cmd_list, ft_lstnew(get_redir_fd(tmp->content, env))); tmp = tmp->next; } return (cmd_list); diff --git a/src/parsing/get_redir_fd.c b/src/parsing/get_redir_fd.c index 4f95c42..5027921 100644 --- a/src/parsing/get_redir_fd.c +++ b/src/parsing/get_redir_fd.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/30 10:48:41 by adjoly #+# #+# */ -/* Updated: 2024/06/04 15:35:30 by adjoly ### ########.fr */ +/* Updated: 2024/06/20 12:30:56 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,9 +14,10 @@ #include "tokenizer.h" #include "execution.h" #include +#include #include "libft.h" -t_cmd *get_redir_fd(void *content) +t_cmd *get_redir_fd(void *content, t_env *env) { t_token *token; t_list *tmp; @@ -68,6 +69,7 @@ t_cmd *get_redir_fd(void *content) cmd->infile = STDIN_FILENO; if (out == INFILE) cmd->outfile = STDOUT_FILENO; - cmd = split_cmd(token->argv, cmd); + char *ll = env_var_replace(token->argv, env); + cmd = split_cmd(ll, cmd); return (cmd); } diff --git a/src/parsing/is_inquote.c b/src/parsing/is_inquote.c index ffc812a..4175514 100644 --- a/src/parsing/is_inquote.c +++ b/src/parsing/is_inquote.c @@ -6,12 +6,13 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/05/20 20:06:13 by adjoly #+# #+# */ -/* Updated: 2024/06/11 15:26:56 by adjoly ### ########.fr */ +/* Updated: 2024/06/20 11:07:56 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "parsing.h" #include "libft.h" +#include t_quote __is_quote(char c) { @@ -27,12 +28,8 @@ char *search_for_next_quote(char *s, t_quote quote_type) char *tmp; tmp = s; - while (*tmp) - { - if (__is_quote(*tmp) == quote_type) - break ; + while (*tmp && __is_quote(*tmp) != quote_type) tmp++; - } return (tmp); } @@ -43,19 +40,20 @@ t_quote is_inquote(char *s, size_t i) t_quote quote_type; start_quote = 0; + printf("%zu", i); tmp = s; quote_type = FALSE; while (*tmp) { - if ((size_t)(tmp - s) > i) + if ((size_t)(tmp - s + 1) > i) break ; if (__is_quote(*tmp) != FALSE) { start_quote = tmp - s; quote_type = __is_quote(*tmp); - tmp = search_for_next_quote(tmp, quote_type); tmp++; - if (*tmp && (start_quote < i && (size_t)(tmp - s) > i)) + tmp = search_for_next_quote(tmp, quote_type); + if ((start_quote < i && (size_t)(tmp - s) > i)) return (quote_type); else if (!*tmp) return (NOT_CLOSED); diff --git a/src/parsing/split_cmd.c b/src/parsing/split_cmd.c index 3cda89c..7dac039 100644 --- a/src/parsing/split_cmd.c +++ b/src/parsing/split_cmd.c @@ -6,7 +6,7 @@ /* By: mmoussou