]> git.dkaiser.de - 42/minishell.git/commitdiff
Merge branch 'miau' into merge_format_redir
authorDominik Kaiser <dkaiser@student.42heilbronn.de>
Mon, 20 Jan 2025 17:45:26 +0000 (18:45 +0100)
committerGitHub <noreply@github.com>
Mon, 20 Jan 2025 17:45:26 +0000 (18:45 +0100)
1  2 
src/collect_redirs.c

index c170a30c3fc69772c68e4254e59cb6d9cb2e4323,350cf6b2cc6a4027f4bce4f444e7e79194f3d7d1..837a16a4f3b5249f9680d8a2e96f321e9e2f17dc
@@@ -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;