frzysk/42_minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change exec_builtins prototype

Browse source
This commit is contained in:
mcolonna 2024-06-25 13:37:50 +02:00
parent 823c5b8ac8
commit 50096be197
3 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/builtins.h
View file

@ -6,7 +6,7 @@
/* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */ /* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/23 14:15:12 by mcolonna #+# #+# */ /* Created: 2024/04/23 14:15:12 by mcolonna #+# #+# */
/* Updated: 2024/06/25 11:38:41 by jschaft ### ########.fr */ /* Updated: 2024/06/25 13:28:18 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,6 +19,6 @@
bool is_builtin(const char *str); bool is_builtin(const char *str);
// Execute the builtin command // Execute the builtin command
int exec_builtin(t_call call, char *const envp[]); int exec_builtin(t_call call, t_env *env);
#endif #endif

21
src/builtin.c
View file

@ -6,7 +6,7 @@
/* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */ /* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/06/03 12:02:45 by jschaft #+# #+# */ /* Created: 2024/06/03 12:02:45 by jschaft #+# #+# */
/* Updated: 2024/06/25 11:46:40 by jschaft ### ########.fr */ /* Updated: 2024/06/25 13:37:36 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,11 +19,12 @@ bool is_builtin(const char *str)
return ( return (
ft_strncmp(str, "cd", 3) == 0 ft_strncmp(str, "cd", 3) == 0
|| ft_strncmp(str, "exit", 5) == 0 || ft_strncmp(str, "exit", 5) == 0
|| ft_strncmp(str, "export", 7) == 0 // || ft_strncmp(str, "export", 7) == 0
|| ft_strncmp(str, "env", 4) == 0 || ft_strncmp(str, "env", 4) == 0
|| ft_strncmp(str, "pwd", 4) == 0 || ft_strncmp(str, "pwd", 4) == 0
|| ft_strncmp(str, "echo", 5) == 0 // || ft_strncmp(str, "echo", 5) == 0
|| ft_strncmp(str, "unset", 6) == 0); // || ft_strncmp(str, "unset", 6) == 0
);
} }
// Execute the builtin cd for the specified path. // Execute the builtin cd for the specified path.
@ -66,22 +67,16 @@ static int env_builtin(char *const envp[])
return (0); return (0);
} }
void exit_builtin(void)
{
mem_freeall(*get_global_mc_pointer());
exit(0);
}
// Execute the specified builtin. // Execute the specified builtin.
// The builtin must exist. // The builtin must exist.
// Return the error value returned by the builtin. // Return the error value returned by the builtin.
// TODO all the builtins // TODO all the builtins
int exec_builtin(t_call call, char *const envp[]) int exec_builtin(t_call call, t_env *env)
{ {
if (ft_strncmp(call.program, "cd", 3) == 0) if (ft_strncmp(call.program, "cd", 3) == 0)
return (cd_builtin(call.argv[1])); return (cd_builtin(call.argv[1]));
if (ft_strncmp(call.program, "exit", 5) == 0) if (ft_strncmp(call.program, "exit", 5) == 0)
exit_builtin(); env->exit = true;
/* if (ft_strncmp(call.program, "export", 7) == 0) /* if (ft_strncmp(call.program, "export", 7) == 0)
return (export_builtin(call.argv)); return (export_builtin(call.argv));
if (ft_strncmp(call.program, "unset", 6) == 0) if (ft_strncmp(call.program, "unset", 6) == 0)
@ -89,6 +84,6 @@ int exec_builtin(t_call call, char *const envp[])
if (ft_strncmp(call.program, "pwd", 4) == 0) if (ft_strncmp(call.program, "pwd", 4) == 0)
return (pwd_builtin()); return (pwd_builtin());
if (ft_strncmp(call.program, "env", 4) == 0) if (ft_strncmp(call.program, "env", 4) == 0)
return (env_builtin(envp)); return (env_builtin(env->envp));
return (1); return (1);
} }

10
src/exec_command.c
View file

@ -6,7 +6,7 @@
/* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */ /* By: jschaft <cecile.schaft@orange.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/24 13:48:00 by jschaft #+# #+# */ /* Created: 2024/04/24 13:48:00 by jschaft #+# #+# */
/* Updated: 2024/06/25 11:38:46 by jschaft ### ########.fr */ /* Updated: 2024/06/25 13:29:58 by mcolonna ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -91,7 +91,7 @@ static int create_pipes(t_exec_command_global *global, t_command command)
} }
static int exec_each_call(t_exec_command_global *global, static int exec_each_call(t_exec_command_global *global,
t_command command, char *const envp[]) t_command command, t_env *env)
{ {
int i; int i;
int r; int r;
@ -103,9 +103,9 @@ static int exec_each_call(t_exec_command_global *global,
inout[0] = global->pipes[i].pipe[0]; inout[0] = global->pipes[i].pipe[0];
inout[1] = global->pipes[i + 1].pipe[1]; inout[1] = global->pipes[i + 1].pipe[1];
if (is_builtin(command.calls[i].program)) if (is_builtin(command.calls[i].program))
r = exec_builtin(command.calls[i], envp); r = exec_builtin(command.calls[i], env);
else else
r = execute_call(global, command.calls[i], inout, envp); r = execute_call(global, command.calls[i], inout, env->envp);
if (r) if (r)
return (r); return (r);
} }
@ -128,7 +128,7 @@ int execute_command(t_env *env, t_command command)
r = create_pipes(&global, command); r = create_pipes(&global, command);
if (r) if (r)
return (r); return (r);
r = exec_each_call(&global, command, env->envp); r = exec_each_call(&global, command, env);
close_all_pipes(&global); close_all_pipes(&global);
while (wait(NULL) != -1) while (wait(NULL) != -1)
; ;