aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominik Kaiser2025-01-20 13:07:11 +0100
committerDominik Kaiser2025-01-20 13:07:11 +0100
commitaf9d1a9b39daaf1b86cf94ee629e06503d8ab6d4 (patch)
tree7dc6e0a33c093a5e2759061056a8b5b393d5fc0b /src
parent3392f2b811269f174620832d663b09ef4f4e43f3 (diff)
downloadminishell-af9d1a9b39daaf1b86cf94ee629e06503d8ab6d4.tar.gz
minishell-af9d1a9b39daaf1b86cf94ee629e06503d8ab6d4.zip
Fix some bugs
Diffstat (limited to 'src')
-rw-r--r--src/collect_redirs.c8
-rw-r--r--src/get_cmd_path.c5
2 files changed, 7 insertions, 6 deletions
diff --git a/src/collect_redirs.c b/src/collect_redirs.c
index 171dc06..350cf6b 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/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 543540b..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/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);
}