From c9c579c9bbd9da2058c31463de72fbc7d0f195e1 Mon Sep 17 00:00:00 2001 From: whaffman Date: Fri, 7 Mar 2025 17:46:18 +0100 Subject: [PATCH] norm --- src/expander/expander_parse_variables.c | 7 +++---- src/parser/parser_get_arguments.c | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/expander/expander_parse_variables.c b/src/expander/expander_parse_variables.c index e6c4221..c7b7da8 100644 --- a/src/expander/expander_parse_variables.c +++ b/src/expander/expander_parse_variables.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/02/19 13:58:13 by qmennen #+# #+# */ -/* Updated: 2025/02/26 17:41:14 by whaffman ######## odam.nl */ +/* Updated: 2025/03/07 16:39:06 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -53,9 +53,9 @@ t_list *expander_parse_variables(const char *s, t_minishell *msh) t_list *var_list; t_environment *env; - i = 0; + i = -1; var_list = NULL; - while (s[i]) + while (s[++i]) { if (s[i] == '$') { @@ -72,7 +72,6 @@ t_list *expander_parse_variables(const char *s, t_minishell *msh) } else if (s[i] == '~') ft_lstadd_back(&var_list, create_tilde_env(msh)); - i++; } return (var_list); } diff --git a/src/parser/parser_get_arguments.c b/src/parser/parser_get_arguments.c index bfa7ff9..bec3632 100644 --- a/src/parser/parser_get_arguments.c +++ b/src/parser/parser_get_arguments.c @@ -6,14 +6,16 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/02/11 16:20:09 by qmennen #+# #+# */ -/* Updated: 2025/02/28 14:07:23 by whaffman ######## odam.nl */ +/* Updated: 2025/03/07 16:45:54 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ #include "minishell.h" #include "typedef.h" -static int parser_should_concact(t_minishell *msh, int argi, t_list *cur, t_list *prev) +// Determine exact separation position r:30 +static int parser_should_concact(t_minishell *msh, int argi, + t_list *cur, t_list *prev) { t_token *c_tkn; t_token *p_tkn; @@ -27,7 +29,6 @@ static int parser_should_concact(t_minishell *msh, int argi, t_list *cur, t_list if (!p_tkn || !c_tkn || c_tkn->position <= 0) return (0); lexer_char = msh->lexer->input[c_tkn->position - 1]; - // Determine exact separation position return (c_tkn->type < 3 && p_tkn->type < 3 && !ft_isspace(lexer_char)); }