Fix some bugs

diff --git a/src/collect_redirs.c b/src/collect_redirs.c
index 171dc067b053e2cbda5bfc4f062985738b730b4b..350cf6b2cc6a4027f4bce4f444e7e79194f3d7d1 100644 (file)
--- a/src/collect_redirs.c
+++ b/src/collect_redirs.c
@@ -6,7 +6,7 @@
 /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/02 13:49:31 by dkaiser           #+#    #+#             */
-/*   Updated: 2025/01/16 18:19:36 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/20 13:03:47 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -81,13 +81,13 @@ static void collect_and_check_redir(t_redirection *result, t_token **cur,
                        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);
        if (next_token)

diff --git a/src/get_cmd_path.c b/src/get_cmd_path.c
index 543540bf1f29be6dd4f6d1dd488bc91edb222378..e005af1b1c582858f8c53cc6110bc5e3581f3721 100644 (file)
--- a/src/get_cmd_path.c
+++ b/src/get_cmd_path.c
@@ -6,7 +6,7 @@
 /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/12/17 19:19:59 by chuhlig           #+#    #+#             */
-/*   Updated: 2025/01/15 16:38:39 by dkaiser          ###   ########.fr       */
+/*   Updated: 2025/01/20 12:52:00 by dkaiser          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -85,8 +85,9 @@ static char   *find_in_path(char *cmd, t_env *env, int *return_code)
                path++;
        }
        *return_code = 127;
-       printf("%s:", cmd);
+       ft_printf("%s:", cmd);
        ft_putstr_fd(" command not found", 2);
+       ft_printf("\n");
        return (NULL);
 }