Merge changes

diff --cc src/collect_redirs.c
index c170a30c3fc69772c68e4254e59cb6d9cb2e4323,350cf6b2cc6a4027f4bce4f444e7e79194f3d7d1..aeaf1777ecd3c614af0c8d3662fa5c25681e7e2e
--- 1/src/collect_redirs.c
--- 2/src/collect_redirs.c
+++ b/src/collect_redirs.c
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/08/02 13:49:31 by dkaiser           #+#    #+#             */
- /*   Updated: 2025/01/20 13:00:04 by chuhlig          ###   ########.fr       */
 -/*   Updated: 2025/01/20 13:03:47 by dkaiser          ###   ########.fr       */
++/*   Updated: 2025/01/20 13:17:59 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */
  
@@@ -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;

diff --cc src/get_cmd_path.c
index c35b3bc5bb55918c6379ec651f1e1225d62834ed,e005af1b1c582858f8c53cc6110bc5e3581f3721..2980b0fb755cb8e8c18828764cbd4433e032acfd
--- 1/src/get_cmd_path.c
--- 2/src/get_cmd_path.c
+++ b/src/get_cmd_path.c
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/12/17 19:19:59 by chuhlig           #+#    #+#             */
- /*   Updated: 2025/01/19 18:56:22 by chuhlig          ###   ########.fr       */
 -/*   Updated: 2025/01/20 12:52:00 by dkaiser          ###   ########.fr       */
++/*   Updated: 2025/01/20 13:18:45 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */