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

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Browse Source
This commit is contained in:
tomoron
2024-04-24 14:07:14 +02:00
parent 6977ae4f71
commit 79e440d6b6
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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/04/23 16:41:42 by tomoron ### ########.fr */
/* Updated: 2024/04/24 14:04:30 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -62,7 +62,7 @@ int open_input_file(t_msh *msh, t_cmd **cur_token)
return (0);
}
int get_in_type(t_msh *msh, t_cmd *tokens)
int get_in_type(t_msh *msh, t_cmd *t_strt, t_cmd *tokens, int here_doc)
{
t_cmd *cur_token;
@ -75,7 +75,8 @@ int get_in_type(t_msh *msh, t_cmd *tokens)
while (cur_token && (cur_token->cmd_type == CMD
|| cur_token->cmd_type == PAREN))
cur_token = cur_token->next;
if (cur_token && is_input_type(cur_token))
if (cur_token && ((cur_token->cmd_type == HERE_DOC && here_doc)
|| (cur_token->cmd_type == RED_I && !here_doc)))
{
msh->in_type = cur_token->cmd_type;
if (open_input_file(msh, &cur_token))
@ -83,7 +84,9 @@ int get_in_type(t_msh *msh, t_cmd *tokens)
}
if (cur_token && cur_token->next && !is_operand_type(cur_token->next)
&& cur_token->cmd_type != PIPE && cur_token->next->cmd_type != PIPE)
return (get_in_type(msh, cur_token->next));
return (get_in_type(msh, t_strt, cur_token->next, here_doc));
if (here_doc)
return(get_in_type(msh, t_strt, t_strt, 0));
return (0);
}