diff --git a/srcs/exec_bonus.c b/srcs/exec_bonus.c index 7cd1427..0d1f281 100755 --- a/srcs/exec_bonus.c +++ b/srcs/exec_bonus.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ -/* Updated: 2024/04/24 19:18:07 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 21:13:53 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -119,6 +119,11 @@ void exec_commands(t_msh *msh) if (!msh->tokens && !is_parenthesis(msh->cmds)) { g_return_code = 0; + get_redirections(msh, msh->cmds); + if(msh->in_fd > 2) + close(msh->in_fd); + if(msh->out_fd > 2) + close(msh->out_fd); return ; } cmd_count = get_cmd_count(msh->cmds); @@ -126,12 +131,11 @@ void exec_commands(t_msh *msh) msh->pids = ft_calloc(cmd_count, sizeof(int *)); if (!msh->pids || !msh->fds) ft_exit(msh, 1); - i = 0; - while (i < cmd_count) + i = -1; + while (++i < cmd_count) { get_redirections(msh, msh->cmds); exec_command(msh, i, cmd_count); - i++; } end_execution(msh, cmd_count); } diff --git a/srcs/free.c b/srcs/free.c index 32ba348..f377491 100644 --- a/srcs/free.c +++ b/srcs/free.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/24 10:51:13 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 10:51:25 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 21:11:53 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/input_redirections.c b/srcs/input_redirections.c index 661a03c..c3bda4c 100755 --- a/srcs/input_redirections.c +++ b/srcs/input_redirections.c @@ -6,7 +6,7 @@ /* By: marde-vr +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/03/05 18:15:27 by marde-vr #+# #+# */ -/* Updated: 2024/04/24 14:41:40 by tomoron ### ########.fr */ +/* Updated: 2024/04/24 21:06:43 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,6 +33,13 @@ void redirect_input(t_msh *msh, int i, char **cmd_args) } } +void ambiguous_redirect(char *str, t_msh *msh) +{ + ft_printf_fd(2, "minishell: %s: ambiguous redirect\n", str); + msh->in_fd = -2; + g_return_code = 1; +} + int open_input_file(t_msh *msh, t_cmd **cur_token) { t_token *filename; @@ -46,20 +53,20 @@ int open_input_file(t_msh *msh, t_cmd **cur_token) filename = parse_tokens((*cur_token)->value, msh->env); if (!filename) ft_exit(msh, 1); - msh->in_fd = open(filename->value, O_RDONLY); - free_token(filename); + if(filename->next) + ambiguous_redirect((*cur_token)->value, msh); + if(!filename->next) + msh->in_fd = open(filename->value, O_RDONLY); if (msh->in_fd == -1) { - filename = parse_tokens((*cur_token)->value, msh->env); - if (!filename) - ft_exit(msh, 1); ft_printf_fd(2, "minishell: %s: ", filename->value); perror(""); free_token(filename); return (1); } + free_token(filename); } - return (0); + return (msh->in_fd == -2); } int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc) diff --git a/srcs/output_redirections.c b/srcs/output_redirections.c index 128d708..774d323 100755 --- a/srcs/output_redirections.c +++ b/srcs/output_redirections.c @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/04/19 14:09:44 by tomoron #+# #+# */ -/* Updated: 2024/04/24 13:25:20 by marde-vr ### ########.fr */ +/* Updated: 2024/04/24 21:14:15 by marde-vr ### ########.fr */ /* */ /* ************************************************************************** */