From 2059f7d634b2c744f53082b8c0ce4eb58d34e8c5 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Wed, 26 Feb 2025 18:36:16 +0100 Subject: [PATCH] norminette parse string --- src/expander/expander_parse_string.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/expander/expander_parse_string.c b/src/expander/expander_parse_string.c index 42a1bbd..a8752ac 100644 --- a/src/expander/expander_parse_string.c +++ b/src/expander/expander_parse_string.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* expander_parse_string.c :+: :+: */ -/* +:+ */ -/* By: qmennen +#+ */ -/* +#+ */ -/* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */ -/* Updated: 2025/02/26 16:13:40 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* expander_parse_string.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/02/18 19:00:35 by qmennen #+# #+# */ +/* Updated: 2025/02/26 18:33:41 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -37,17 +37,16 @@ char *expander_parse_string(char *s, t_minishell *msh) variables = expander_parse_variables(s, msh); string = expander_allocate_memory(msh, s, variables); + current = variables; i = 0; j = 0; - current = variables; - while (s[i]) + while (s[i] && current) { if (s[i] == '$' && s[i + 1]) { i++; i += expander_expand_dollar(s + i, string, &j, current); - if (current) - current = current->next; + current = current->next; } else string[j++] = s[i++];