42/42_INT_07_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ajout des builtins pwd cd et export

Browse Source
This commit is contained in:
hugogogo
2021-11-11 17:44:42 +01:00
parent d65a701186
commit 47ae67ed14
12 changed files with 127 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srcs/shell_loop.c
View File

@@ -6,14 +6,14 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/10/04 05:59:26 by lperrey #+# #+# */
/* Updated: 2021/11/10 13:43:10 by hulamy ### ########.fr */
/* Updated: 2021/11/11 09:54:40 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
void close_fd(t_cmd *cmd);
void execute_cmd(char **envp, t_cmd **cmd_arr);
void execute_cmd(char **envp, t_cmd **cmd_arr, t_all *c);
void shell_loop(t_all *c)
{
@@ -30,7 +30,7 @@ void shell_loop(t_all *c)
add_history(line_input);
c->token_list = input_to_tokens(line_input);
c->cmd_arr = parsing(c->token_list, c->envp);
execute_cmd(c->envp, c->cmd_arr);
execute_cmd(c->envp, c->cmd_arr, c);
ft_lstclear((t_list **)&c->token_list, free);
}
else if (!line_input)
@@ -49,12 +49,13 @@ void close_fd(t_cmd *cmd)
close(cmd->fd_out);
}
void execute_cmd(char **envp, t_cmd **cmd_arr)
void execute_cmd(char **envp, t_cmd **cmd_arr, t_all *c)
{
pid_t pid;
pid_t wpid;
int status;
int i;
int argc;
i = 0;
while(cmd_arr[i])
@@ -67,7 +68,15 @@ void execute_cmd(char **envp, t_cmd **cmd_arr)
if (cmd_arr[i]->fd_out != 1)
dup2(cmd_arr[i]->fd_out, STDOUT_FILENO);
close_fd(cmd_arr[i]);
execve(cmd_arr[i]->argv[0], cmd_arr[i]->argv, envp);
if (cmd_arr[i]->builtin_command)
{
argc = 0;
while (cmd_arr[i]->argv[argc])
argc++;
cmd_arr[i]->builtin_command(argc, cmd_arr[i]->argv, c);
}
else
execve(cmd_arr[i]->argv[0], cmd_arr[i]->argv, envp);
}
else
close_fd(cmd_arr[i]);