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

32
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/18 17:56:05 by tomoron ### ########.fr */
/* Updated: 2024/04/18 20:48:58 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,23 +18,23 @@ void close_pipe_fds(t_msh *msh, int i)
{
if (msh->fds[i - 1][0] > 2)
{
fprintf(stderr, "closing fd %d in child\n", msh->fds[i-1][0]);
//fprintf(stderr, "closing fd %d in child\n", msh->fds[i-1][0]);
close(msh->fds[i - 1][0]);
}
if (msh->fds[i - 1][1] > 2)
{
fprintf(stderr, "closing fd %d in child\n", msh->fds[i-1][1]);
//fprintf(stderr, "closing fd %d in child\n", msh->fds[i-1][1]);
close(msh->fds[i - 1][1]);
}
}
if (msh->fds[i][0] > 2)
{
fprintf(stderr, "closing fd %d in child\n", msh->fds[i][0]);
//fprintf(stderr, "closing fd %d in child\n", msh->fds[i][0]);
close(msh->fds[i][0]);
}
if (msh->fds[i][1] > 2)
{
fprintf(stderr, "closing fd %d in child\n", msh->fds[i][1]);
//fprintf(stderr, "closing fd %d in child\n", msh->fds[i][1]);
close(msh->fds[i][1]);
}
}
@ -53,9 +53,9 @@ void execute_command(t_msh *msh, char **cmd_args)
{
set_echoctl(msh->echoctl);
env = env_to_char_tab(msh->env);
if(env)
if (env)
{
fprintf(stderr, "execveing %s\n", msh->tokens->value);
//fprintf(stderr, "execveing %s\n", msh->tokens->value);
execve(msh->tokens->value, cmd_args, env);
}
ft_free_str_arr(env);
@ -65,13 +65,13 @@ void execute_command(t_msh *msh, char **cmd_args)
void child(t_msh *msh, char **cmd_args, int i)
{
if ((msh->in_type != CMD && msh->in_type != PAREN && msh->in_type != AND
&& msh->in_type != OR && msh->in_type != PIPE)
&& msh->in_type != OR && msh->in_type != PIPE)
|| (msh->in_type == PIPE && i > 0))
redirect_input(msh, i);
if (msh->out_type == PIPE || msh->out_type == RED_O
|| msh->out_type == RED_O_APP)
redirect_output(msh, i);
fprintf(stderr, "closing fds\n");
//fprintf(stderr, "closing fds\n");
close_pipe_fds(msh, i);
execute_command(msh, cmd_args);
close(0);
@ -89,12 +89,12 @@ void parent(t_msh *msh, int i, int cmd_count)
{
if (msh->fds[i - 1][0] > 2)
{
fprintf(stderr, "closing fd %d in parent\n", msh->fds[i - 1][0]);
//fprintf(stderr, "closing fd %d in parent\n", msh->fds[i - 1][0]);
close(msh->fds[i - 1][0]);
}
if (msh->fds[i - 1][1] > 2)
{
fprintf(stderr, "closing fd %d in parent\n", msh->fds[i - 1][1]);
//fprintf(stderr, "closing fd %d in parent\n", msh->fds[i - 1][1]);
close(msh->fds[i - 1][1]);
}
}
@ -102,23 +102,23 @@ void parent(t_msh *msh, int i, int cmd_count)
{
if (msh->fds[i][0] > 2)
{
fprintf(stderr, "closing fd %d in parent\n", msh->fds[i][0]);
//fprintf(stderr, "closing fd %d in parent\n", msh->fds[i][0]);
close(msh->fds[i][0]);
}
if (msh->fds[i][1] > 2)
{
fprintf(stderr, "closing fd %d in parent\n", msh->fds[i][1]);
//fprintf(stderr, "closing fd %d in parent\n", msh->fds[i][1]);
close(msh->fds[i][1]);
}
}
if (msh->in_fd > 2)
{
fprintf(stderr, "closing in_fd %d in parent\n", msh->in_fd);
//fprintf(stderr, "closing in_fd %d in parent\n", msh->in_fd);
close(msh->in_fd);
}
if (msh->out_fd > 2)
{
fprintf(stderr, "closing in_fd %d in parent\n", msh->out_fd);
close(msh->out_fd);
//fprintf(stderr, "closing in_fd %d in parent\n", msh->out_fd);
close(msh->out_fd);
}
}