wip (ça compile pas)

This commit is contained in:
2024-04-02 12:32:18 +02:00
parent 68469542ff
commit 5580852791
14 changed files with 155 additions and 184 deletions

View File

@ -6,15 +6,16 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 19:10:52 by marde-vr #+# #+# */
/* Updated: 2024/04/01 20:09:27 by marde-vr ### ########.fr */
/* Updated: 2024/04/02 02:08:43 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void redirect_output(t_msh *msh)
void redirect_output(t_msh *msh, int i)
{
if (/*msh->out_type != PIPE*/ 1)
(void)i;
if (msh->out_type != PIPE)
{
if (dup2(msh->out_fd, 1) < 0)
ft_exit(msh, 1);
@ -26,48 +27,43 @@ void redirect_output(t_msh *msh)
}
}
void open_out_file(t_msh *msh, t_token **cur_cmd)
void open_out_file(t_msh *msh, t_cmd **cur_cmd)
{
msh->out_type = (*cur_cmd)->type;
msh->out_type = (*cur_cmd)->cmd_type;
if (msh->out_type == RED_O)
msh->out_fd = open((*cur_cmd)->next->value,
O_CREAT | O_WRONLY | O_TRUNC, 0644);
if (msh->out_type == RED_O_APP)
msh->out_fd = open((*cur_cmd)->next->value,
O_CREAT | O_RDWR | O_APPEND, 0644);
msh->out_fd = open((*cur_cmd)->next->value, O_CREAT | O_RDWR | O_APPEND,
0644);
if (msh->out_fd == -1)
{
g_return_code = 1;
perror("open");
return ;
}
if (/*(*cur_cmd)->type != PIPE*/ 1)
if ((*cur_cmd)->cmd_type != PIPE)
{
while ((*cur_cmd)->next && (*cur_cmd)->next->type == ARG)
while ((*cur_cmd)->next && (*cur_cmd)->next->cmd_type == CMD)
*cur_cmd = (*cur_cmd)->next;
if ((*cur_cmd)->next && ((*cur_cmd)->next->type == RED_O
|| (*cur_cmd)->next->type == RED_O_APP))
if ((*cur_cmd)->next && ((*cur_cmd)->next->cmd_type == RED_O
|| (*cur_cmd)->next->cmd_type == RED_O_APP))
get_out_type(msh, *cur_cmd);
}
}
void get_out_type(t_msh *msh, t_token *cmds)
void get_out_type(t_msh *msh, t_cmd *cmds)
{
t_token *cur_cmd;
t_cmd *cur_cmd;
msh->out_type = ARG;
msh->out_type = CMD;
msh->out_fd = 0;
cur_cmd = cmds;
if (cmds->type && msh->cmds == cmds)
{
while (msh->cmds->type != ARG && msh->cmds->next->next)
msh->cmds = msh->cmds->next->next;
}
while (cur_cmd && cur_cmd->next && (cur_cmd->type == ARG
|| cur_cmd->type > 3))
while (cur_cmd && cur_cmd->next && cur_cmd->cmd_type != AND
&& cur_cmd->cmd_type != OR)
cur_cmd = cur_cmd->next;
if (!cur_cmd->type)
msh->out_type = ARG;
if (cur_cmd->cmd_type == CMD || cur_cmd->cmd_type == PAREN)
msh->out_type = 0;
else
open_out_file(msh, &cur_cmd);
}