tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed stuff

Browse Source
This commit is contained in:
tomoron
2024-05-06 14:18:40 +02:00
parent 60d6e50ab9
commit 855ba3f6f2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/input_redirections.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:15:27 by marde-vr #+# #+# */
/* Updated: 2024/05/05 20:10:03 by tomoron ### ########.fr */
/* Updated: 2024/05/06 14:14:21 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,6 +19,7 @@ void redirect_input(t_msh *msh, int i, char **cmd_args)
if (dup2(msh->in_fd, 0) < 0)
{
free(cmd_args);
close_pipe_fds(msh, i);
ft_exit(msh, 1);
}
close(msh->in_fd);
@ -28,6 +29,7 @@ void redirect_input(t_msh *msh, int i, char **cmd_args)
if (dup2(msh->fds[i - 1][0], 0) < 0)
{
free(cmd_args);
close_pipe_fds(msh, i);
ft_exit(msh, 1);
}
}
@ -37,7 +39,7 @@ int open_input_redirection_file(t_msh *msh, t_cmd **cur_token)
{
t_token *filename;
if (msh->in_fd != 0)
if (msh->in_fd != 0 && msh->in_type != PIPE)
close(msh->in_fd);
if (ft_strchr((*cur_token)->value, '$'))
{

2
srcs/pipe.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */
/* Updated: 2024/05/06 13:41:24 by tomoron ### ########.fr */
/* Updated: 2024/05/06 14:06:33 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */