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

get_out_type function

Browse Source
This commit is contained in:
mdev9
2024-02-25 11:17:00 +01:00
parent fc8431fb6c
commit ee673be657
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
srcs/exec.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */ /* Created: 2024/02/07 14:12:49 by tomoron #+# #+# */
/* Updated: 2024/02/25 10:24:55 by marde-vr ### ########.fr */ /* Updated: 2024/02/25 11:16:32 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -120,16 +120,12 @@ int is_fd_open(int fd) // debug
void redirect_input(t_msh *msh) void redirect_input(t_msh *msh)
{ {
//is_fd_open(msh->fds[0]);
//is_fd_open(msh->fds[1]);
if (dup2(msh->fds[0], 0) < 0) if (dup2(msh->fds[0], 0) < 0)
ft_exit(msh, 1); ft_exit(msh, 1);
} }
void redirect_output(t_msh *msh) void redirect_output(t_msh *msh)
{ {
//is_fd_open(msh->fds[0]);
//is_fd_open(msh->fds[1]);
if (dup2(msh->fds[1], 1) < 0) if (dup2(msh->fds[1], 1) < 0)
ft_exit(msh, 1); ft_exit(msh, 1);
//close(msh->fds[0]); //close(msh->fds[0]);
@ -141,14 +137,11 @@ void pipe_child(t_msh *msh, char **cmd_args)
{ {
ft_printf_fd(2, "redirecting input\n"); ft_printf_fd(2, "redirecting input\n");
redirect_input(msh); redirect_input(msh);
//close(msh->fds[0]);
} }
if (msh->out_type != ARG) if (msh->out_type != ARG)
{ {
ft_printf_fd(2, "redirecting output\n"); ft_printf_fd(2, "redirecting output\n");
redirect_output(msh); redirect_output(msh);
//close(msh->fds[0]);
//close(msh->fds[1]);
} }
close(msh->fds[0]); close(msh->fds[0]);
close(msh->fds[1]); close(msh->fds[1]);
@ -175,13 +168,32 @@ void pipe_parent(t_msh *msh)
close(msh->fds[1]); close(msh->fds[1]);
} }
int exec(t_msh *msh, t_cmd *cmd, char **cmd_args, int i) int get_cmd_count(t_cmd *cmds)
{
int count;
t_cmd *cur_cmd;
count = 0;
cur_cmd = cmds;
while (cur_cmd->next != 0)
{
if (cur_cmd->type != ARG && (cur_cmd->next
&& cur_cmd->next->type == ARG))
count++;
cur_cmd = cur_cmd->next;
}
if (cur_cmd->type == ARG)
count++;
return (count);
}
int exec(t_msh *msh, char **cmd_args, int i, int cmd_count)
{ {
pid_t pid; pid_t pid;
if (i != 1) if (i != cmd_count - 1)
{ {
(void)cmd; ft_printf_fd(2, "piping\n");
if (pipe(msh->fds) == -1) if (pipe(msh->fds) == -1)
{ {
perror("pipe"); perror("pipe");
@ -207,25 +219,6 @@ int exec(t_msh *msh, t_cmd *cmd, char **cmd_args, int i)
return (0); return (0);
} }
int get_cmd_count(t_cmd *cmds)
{
int count;
t_cmd *cur_cmd;
count = 0;
cur_cmd = cmds;
while (cur_cmd->next != 0)
{
if (cur_cmd->type != ARG && (cur_cmd->next
&& cur_cmd->next->type == ARG))
count++;
cur_cmd = cur_cmd->next;
}
if (cur_cmd->type == ARG)
count++;
return (count);
}
char **get_cmd_args(t_msh *msh) char **get_cmd_args(t_msh *msh)
{ {
char **cmd_args; char **cmd_args;
@ -278,6 +271,15 @@ void remove_command_from_msh(t_msh *msh)
void get_out_type(t_msh *msh) void get_out_type(t_msh *msh)
{ {
msh->out_type = 1; msh->out_type = 1;
t_cmd *cur_cmd;
cur_cmd = msh->cmds;
while (cur_cmd && cur_cmd->next && cur_cmd->type == ARG)
cur_cmd = cur_cmd->next;
if (!cur_cmd->type)
msh->out_type = ARG;
else
msh->out_type = cur_cmd->type;
//ft_printf_fd(2, "%d\n", msh->out_type);
} }
void exec_command(t_msh *msh) void exec_command(t_msh *msh)
@ -295,13 +297,10 @@ void exec_command(t_msh *msh)
ft_exit(msh, 1); ft_exit(msh, 1);
while (i < cmd_count) while (i < cmd_count)
{ {
if (i == 0) get_out_type(msh);
get_out_type(msh);
else
msh->out_type = 0;
if (!cmd_is_builtin(msh, msh->cmds->token)) if (!cmd_is_builtin(msh, msh->cmds->token))
get_cmd_path(msh); get_cmd_path(msh);
exec(msh, msh->cmds, get_cmd_args(msh), i); exec(msh, get_cmd_args(msh), i, cmd_count);
remove_command_from_msh(msh); remove_command_from_msh(msh);
i++; i++;
} }