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

conflit

Browse Source
This commit is contained in:
tomoron
2024-04-01 22:06:51 +02:00
parent fde70abd2b dc73084ede
commit 68469542ff
14 changed files with 110 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
srcs/exec_bonus.c
View File

@ -6,19 +6,34 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
/* Updated: 2024/04/01 20:08:24 by tomoron ### ########.fr */
/* Updated: 2024/04/01 21:56:12 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void get_redirections(t_msh *msh)
{
if (first_is_in_type(msh))
{
get_in_type(msh, msh->cmds);
if (!g_return_code)
get_out_type(msh, msh->cmds);
}
else
{
get_out_type(msh, msh->cmds);
if (!g_return_code)
get_in_type(msh, msh->cmds);
}
}
void exec_command_bonus(t_msh *msh, char *cmd_str)
{
t_cmd *cmds;
t_cmd *tmp;
(void)msh;
printf("cmd : %s\n",cmd_str);
//printf("cmd : %s\n",cmd_str);
cmds = parsing_bonus(cmd_str);
tmp = check_cmds_syntax(cmds);
if(tmp)
@ -28,24 +43,42 @@ void exec_command_bonus(t_msh *msh, char *cmd_str)
free_cmd(cmds);
return;
}
printf("has address : %d\n", cmds!=0);
msh->tokens = parse_command(cmd_str, msh->env);
msh->cmds = cmds;
print_parsed_cmd(cmds);
exec_commands(msh);
while (cmds && cmds->next)
{
if (cmds->cmd_type == CMD)
{
msh->cmds = parse_command(cmds->value, msh->env);
get_redirections(msh);
print_parsed_cmd(cmds);
print_parsed_token(msh->cmds);
exec_commands(msh);
}
cmds = cmds->next;
}
if (cmds && cmds->cmd_type == CMD)
{
msh->cmds = parse_command(cmds->value, msh->env);
get_redirections(msh);
print_parsed_cmd(cmds);
print_parsed_token(msh->cmds);
exec_commands(msh);
}
}
int exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
{
pid_t pid;
int fds[2];
if (i != cmd_count - 1)
{
if (pipe(msh->fds[i]) == -1)
if (pipe(fds) == -1)
{
perror("pipe");
ft_exit(msh, 1);
}
msh->in_fd = fds[0];
msh->out_fd = fds[1];
}
pid = fork();
if (pid == -1)
@ -67,21 +100,6 @@ int exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
void exec_command(t_msh *msh, int i, int cmd_count)
{
g_return_code = 0;
msh->fds[i] = ft_calloc(2, sizeof(int *));
if (!msh->fds[i])
ft_exit(msh, 1);
if (first_is_in_type(msh))
{
get_in_type(msh, msh->tokens);
if (!g_return_code)
get_out_type(msh, msh->tokens);
}
else
{
get_out_type(msh, msh->tokens);
if (!g_return_code)
get_in_type(msh, msh->tokens);
}
if (!cmd_is_builtin(msh, msh->cmds->value))
get_cmd_path(msh);
exec(msh, get_cmd_args(msh), i, cmd_count);
@ -100,15 +118,6 @@ void end_execution(t_msh *msh, int cmd_count)
g_return_code = WEXITSTATUS(status);
if (WIFSIGNALED(status) && WTERMSIG(status) == SIGQUIT)
printf("Quit (core dumped)\n");
i = 0;
while (i < cmd_count)
{
free(msh->fds[i]);
msh->fds[i] = 0;
i++;
}
free(msh->fds);
msh->fds = 0;
free(msh->pids);
msh->pids = 0;
//signal(SIGINT, signal_handler_interactive); //enables ctrl-C
@ -122,14 +131,10 @@ void exec_commands(t_msh *msh)
int i;
i = -1;
ft_printf("yes\n");
if (!msh->cmds)
return ;
cmd_count = get_cmd_count(msh->cmds);
ft_printf("cmd_count: %d\n", cmd_count);
msh->fds = ft_calloc(cmd_count, sizeof(int **));
msh->pids = ft_calloc(cmd_count, sizeof(int *));
if (!msh->pids || !msh->fds)
if (!msh->pids)
ft_exit(msh, 1);
while (++i < cmd_count)
exec_command(msh, i, cmd_count);