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

i think i never speedran the norm like this before

Browse Source
This commit is contained in:
mdev9
2024-04-18 21:50:23 +02:00
parent 5da5968deb
commit fb62d4ceed
32 changed files with 169 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
srcs/output_redirections.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 19:10:52 by marde-vr #+# #+# */
/* Updated: 2024/04/18 17:56:05 by tomoron ### ########.fr */
/* Updated: 2024/04/18 20:48:57 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,18 +17,18 @@ void redirect_output(t_msh *msh, int i)
{
if (msh->out_type != PIPE)
{
fprintf(stderr, "redirecting output\n");
//fprintf(stderr, "redirecting output\n");
if (dup2(msh->out_fd, 1) < 0)
ft_exit(msh, 1);
}
else
{
fprintf(stderr, "redirecting pipe output\n");
//fprintf(stderr, "redirecting pipe output\n");
//sleep(1);
if (dup2(msh->fds[i][1], 1) < 0)
{
perror("dup2");
fprintf(stderr, "exiting\n");
//fprintf(stderr, "exiting\n");
//ft_exit(msh, 1);
}
}
@ -59,31 +59,33 @@ void open_out_file(t_msh *msh, t_cmd **cur_cmd, char *filename)
void get_out_type(t_msh *msh, t_cmd *cmds)
{
t_cmd *cur_cmd;
t_token *filename;
t_token *filename;
msh->out_type = CMD;
msh->out_fd = 0;
cur_cmd = cmds;
while(cur_cmd && !is_cmd_type(cur_cmd))
while (cur_cmd && !is_cmd_type(cur_cmd))
cur_cmd = cur_cmd->next;
while (cur_cmd && cur_cmd->next && !is_output_type(cur_cmd) && !is_operand_type(cur_cmd) && cur_cmd->cmd_type != PIPE)
while (cur_cmd && cur_cmd->next && !is_output_type(cur_cmd)
&& !is_operand_type(cur_cmd) && cur_cmd->cmd_type != PIPE)
{
fprintf(stderr, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type);
//fprintf(stderr, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type);
cur_cmd = cur_cmd->next;
}
if (cur_cmd)
fprintf(stderr, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type);
//if (cur_cmd)
//fprintf(stderr, "%s: %d\n", cur_cmd->value, cur_cmd->cmd_type);
if (cur_cmd->cmd_type == CMD || cur_cmd->cmd_type == PAREN)
msh->out_type = 0;
else if(cur_cmd && is_output_type(cur_cmd) && !is_operand_type(cur_cmd) && cur_cmd->cmd_type != PIPE)
else if (cur_cmd && is_output_type(cur_cmd) && !is_operand_type(cur_cmd)
&& cur_cmd->cmd_type != PIPE)
{
msh->out_type = cur_cmd->cmd_type;
filename = parse_command(cur_cmd->value, msh->env);
if(!filename)
if (!filename)
ft_exit(msh, 1);
open_out_file(msh, &cur_cmd, filename->value);
free_token(filename);
}
else if(cur_cmd && cur_cmd->cmd_type == PIPE)
else if (cur_cmd && cur_cmd->cmd_type == PIPE)
msh->out_type = PIPE;
}