From 5f30d2b650910a57bc4cc4822954b871ae68a405 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Wed, 26 Feb 2025 18:36:06 +0100 Subject: [PATCH] fix: only parse dqword with $ --- src/parser/parser_get_arguments.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/parser/parser_get_arguments.c b/src/parser/parser_get_arguments.c index 25b298f..b0f2033 100644 --- a/src/parser/parser_get_arguments.c +++ b/src/parser/parser_get_arguments.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* parser_get_arguments.c :+: :+: */ -/* +:+ */ -/* By: qmennen +#+ */ -/* +#+ */ -/* Created: 2025/02/11 16:20:09 by qmennen #+# #+# */ -/* Updated: 2025/02/26 16:14:14 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* parser_get_arguments.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/11 16:20:09 by qmennen #+# #+# */ +/* Updated: 2025/02/26 18:35:27 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,7 +38,7 @@ static int parser_should_expand(t_list *value) token = (t_token *)value->content; if (!token) return (0); - return (token->type == T_DQWORD + return ((token->type == T_DQWORD && ft_strchr(token->value, '$')) || (token->type == T_WORD && token->value[0] == '$' && token->value[1])); @@ -60,8 +60,7 @@ char **parser_get_arguments(t_list *list, t_minishell *msh) if (parser_should_expand(current)) args[i] = expander_parse_string( ((t_token *)current->content)->value, msh); - else if (((t_token *)current->content)->type == T_WORD - || ((t_token *)current->content)->type == T_SQWORD) + else if (((t_token *)current->content)->type < 3) args[i] = ft_strdup_safe(msh, ((t_token *)current->content)->value); current = current->next;