merging conflict
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2021/10/08 02:59:58 by lperrey #+# #+# */
|
||||
/* Updated: 2021/11/18 17:52:50 by hulamy ### ########.fr */
|
||||
/* Updated: 2021/11/18 21:32:54 by hulamy ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@@ -44,6 +44,11 @@ int redirections(t_token *token_list, t_cmd **cmd_arr);
|
||||
|
||||
// Exec
|
||||
int exec_cmd_line(t_all *c);
|
||||
int pipeline(t_all *c);
|
||||
int cmd_find_access(t_cmd *cmd, char *path[]);
|
||||
int cmd_exec_in_subshell(t_cmd *cmd, t_all *c);
|
||||
void wait_subshell(pid_t last_cmd_pid, int *last_exit_status);
|
||||
int simple_command_builtin(t_cmd *cmd, t_all *c);
|
||||
|
||||
// Builtins
|
||||
int builtin_cd(int argc, char *argv[], t_all *c);
|
||||
|
||||
Reference in New Issue
Block a user