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

working on builtin execution in pipes

Browse Source
This commit is contained in:
mdev9
2024-04-22 12:48:06 +02:00
parent a8b65c820b
commit 30fafc49b0
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/builtins.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:20:21 by marde-vr #+# #+# */ /* Created: 2024/03/05 18:20:21 by marde-vr #+# #+# */
/* Updated: 2024/04/21 23:25:05 by tomoron ### ########.fr */ /* Updated: 2024/04/22 12:33:58 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -25,8 +25,8 @@ int cmd_is_builtin(t_msh *msh, char *cmd_token)
{ {
if (!cmd_token) if (!cmd_token)
return (0); return (0);
else if (msh->in_type == PIPE || msh->out_type == PIPE) //else if (msh->in_type == PIPE || msh->out_type == PIPE)
return (1); // return (1);
else if (!ft_strcmp(cmd_token, "cd")) else if (!ft_strcmp(cmd_token, "cd"))
{ {
cd(msh->tokens); cd(msh->tokens);

2
srcs/exec_bonus.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */ /* Created: 2024/03/28 13:50:14 by tomoron #+# #+# */
/* Updated: 2024/04/21 21:52:10 by tomoron ### ########.fr */ /* Updated: 2024/04/22 12:40:41 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

5
srcs/pipe.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */ /* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */ /* Created: 2024/03/05 18:17:25 by marde-vr #+# #+# */
/* Updated: 2024/04/21 23:49:47 by tomoron ### ########.fr */ /* Updated: 2024/04/22 12:47:51 by marde-vr ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -31,8 +31,7 @@ void execute_command(t_msh *msh, char **cmd_args)
{ {
char **env; char **env;
if (msh->tokens->value && (!ft_strcmp(msh->tokens->value, "cd") if (exec_builtin(msh))
|| !ft_strcmp(msh->tokens->value, "exit") || exec_builtin(msh)))
{ {
free(cmd_args); free(cmd_args);
ft_exit(msh, g_return_code); ft_exit(msh, g_return_code);