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

Merge branch 'bonus' of github.com:mdev9/minishell into bonus

Browse Source
This commit is contained in:
tomoron
2024-04-02 13:45:11 +02:00
parent d68e163595 cbbe866ff4
commit a1fa344ef0
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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/02 02:13:50 by tomoron ### ########.fr */
/* Updated: 2024/04/02 13:28:32 by babonnet ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,7 +14,7 @@
void redirect_input(t_msh *msh)
{
if (/*msh->in_type != PIPE*/ 1)
if (msh->in_type != PIPE)
{
if (dup2(msh->in_fd, 0) < 0)
ft_exit(msh, 1);
@ -52,13 +52,7 @@ void get_in_type(t_msh *msh, t_cmd *tokens)
cur_token = tokens;
while (cur_token && cur_token->next && cur_token->cmd_type == CMD)
cur_token = cur_token->next;
// if (cur_token->type)
//{
// msh->in_type = cur_token->type;
// if (cur_token->type == HERE_DOC || cur_token->type == RED_I)
// open_input_file(msh, &cur_token);
//} pas sur de ce que c'est censé faire , j'ai fais un truc différent en dessous
if (cur_token->cmd_type == HERE_DOC || cur_token->cmd_type == RED_I)
if (/*cur_token->type && */cur_token->cmd_type == HERE_DOC || cur_token->cmd_type == RED_I)
{
msh->in_type = cur_token->cmd_type;
open_input_file(msh, &cur_token);

12
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/04/02 02:07:25 by tomoron ### ########.fr */
/* Updated: 2024/04/02 13:24:17 by babonnet ### ########.fr */
/* */
/* ************************************************************************** */
@ -48,11 +48,11 @@ void execute_command(t_msh *msh, char **cmd_args)
void child(t_msh *msh, char **cmd_args, int i)
{
// flemme
//if ((msh->in_type != ARG /*&& msh->in_type != PIPE*/)
// || (/*msh->in_type == PIPE &&*/ i > 0))
// redirect_input(msh);
if (/*msh->out_type == PIPE ||*/ msh->out_type == RED_O
if ((msh->in_type != CMD && msh->in_type != PAREN && msh->in_type != AND
&& msh->in_type != OR && msh->in_type != PIPE)
|| (msh->in_type == PIPE && i > 0))
redirect_input(msh);
if (msh->out_type == PIPE || msh->out_type == RED_O
|| msh->out_type == RED_O_APP)
redirect_output(msh, i);
close_pipe_fds(msh, i);