diff options
| author | Dominik Kaiser | 2025-01-20 18:45:26 +0100 |
|---|---|---|
| committer | GitHub | 2025-01-20 18:45:26 +0100 |
| commit | 62845ce01f222fad126372c574c7ab084478adf0 (patch) | |
| tree | 7e3fee3edea18d0d81abddb89104858cfc0ec5e3 /src | |
| parent | 634a3b84b31cbcc5c0c665338e1ef1eb49f25e5d (diff) | |
| parent | af9d1a9b39daaf1b86cf94ee629e06503d8ab6d4 (diff) | |
| download | minishell-62845ce01f222fad126372c574c7ab084478adf0.tar.gz minishell-62845ce01f222fad126372c574c7ab084478adf0.zip | |
Merge branch 'miau' into merge_format_redir
Diffstat (limited to 'src')
| -rw-r--r-- | src/collect_redirs.c | 8 | ||||
| -rw-r--r-- | src/get_cmd_path.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/collect_redirs.c b/src/collect_redirs.c index c170a30..837a16a 100644 --- 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/20 13:00:04 by chuhlig ### ########.fr */ +/* Updated: 2025/01/20 13:03:47 by dkaiser ### ########.fr */ /* */ /* ************************************************************************** */ @@ -60,13 +60,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 c35b3bc..e005af1 100644 --- 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/19 18:56:22 by chuhlig ### ########.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_putstr_fd(" command not found", 2);//output is shit even if its fine for tester + ft_printf("%s:", cmd); + ft_putstr_fd(" command not found", 2); + ft_printf("\n"); return (NULL); } |