From: Dominik Kaiser <dkaiser@student.42heilbronn.de>
Date: Mon, 20 Jan 2025 17:45:26 +0000 (+0100)
Subject: Merge branch 'miau' into merge_format_redir
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=62845ce01f222fad126372c574c7ab084478adf0;p=42%2Fminishell.git

Merge branch 'miau' into merge_format_redir
---

62845ce01f222fad126372c574c7ab084478adf0
diff --cc src/collect_redirs.c
index c170a30,350cf6b..837a16a
--- a/src/collect_redirs.c
+++ b/src/collect_redirs.c
@@@ -60,15 -81,15 +60,15 @@@ static void	collect_and_check_redir(t_r
  			return ;
  	}
  	else if ((*cur)->content.redir_type == INPUT_FILE)
- 		set_redir(&result[0], INPUT_FILE, str, env);
+ 		set_redir(&result[0], INPUT_FILE, format_string(str, env), env);
  	else if ((*cur)->content.redir_type == OUTPUT_OVERRIDE)
  		ft_lstadd_back(create_files, ft_lstnew(set_redir(&result[1],
- 					OUTPUT_OVERRIDE, str, env)));
+ 					OUTPUT_OVERRIDE, format_string(str, env), env)));
  	else if ((*cur)->content.redir_type == OUTPUT_APPEND)
  		ft_lstadd_back(create_files, ft_lstnew(set_redir(&result[1],
- 					OUTPUT_APPEND, str, env)));
+ 					OUTPUT_APPEND, format_string(str, env), env)));
  	next_token = (*cur)->next;
 -	free_token_and_connect(*cur);
 +	// free_token_and_connect(*cur);
  	if (next_token)
  	{
  		*cur = next_token->next;