From f1c132337bc79c8f2b0b3ff8e328c149b5bc87f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Tue, 1 Apr 2025 18:31:38 +0200 Subject: [PATCH] exit: work for simple arguments This does not address non-integer arguments, or extremly high/low arguments. --- Makefile | 1 + src/executing/simple_cmd/builtin_exit.c | 27 +++++++++++++++++++ src/executing/simple_cmd/builtins.c | 5 +++- src/executing/simple_cmd/builtins.h | 3 ++- src/executing/simple_cmd/simple_cmd_execute.c | 2 +- src/executing/simple_cmd/simple_cmd_execute.h | 3 ++- test.sh | 18 +++++++++++++ 7 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 src/executing/simple_cmd/builtin_exit.c diff --git a/Makefile b/Makefile index 0bdc25c..4cc8a7e 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ srcs = \ src/executing/here_doc/random_filename.c \ src/executing/here_doc/strip_newline.c \ src/executing/simple_cmd/builtin_cd.c \ + src/executing/simple_cmd/builtin_exit.c \ src/executing/simple_cmd/builtin_export.c \ src/executing/simple_cmd/builtin_invalid.c \ src/executing/simple_cmd/builtin_pwd.c \ diff --git a/src/executing/simple_cmd/builtin_exit.c b/src/executing/simple_cmd/builtin_exit.c new file mode 100644 index 0000000..e164a38 --- /dev/null +++ b/src/executing/simple_cmd/builtin_exit.c @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* builtin_exit.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: khais +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/01 18:17:56 by khais #+# #+# */ +/* Updated: 2025/04/02 15:06:22 by khais ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "builtins.h" +#include +#include "libft.h" + +t_builtin_type builtin_exit(t_simple_cmd *cmd, t_minishell *app) +{ + int status; + + status = 0; + if (cmd->words->next != NULL) + status = ft_atoi(cmd->words->next->word->word); + simple_cmd_destroy(cmd); + env_destroy(app->env); + exit(status); +} diff --git a/src/executing/simple_cmd/builtins.c b/src/executing/simple_cmd/builtins.c index 4f8a3fa..c166c44 100644 --- a/src/executing/simple_cmd/builtins.c +++ b/src/executing/simple_cmd/builtins.c @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/01 16:37:21 by khais #+# #+# */ -/* Updated: 2025/04/01 16:37:38 by khais ### ########.fr */ +/* Updated: 2025/04/01 18:17:25 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,6 +24,8 @@ t_builtin_type get_builtin(t_simple_cmd *cmd) return (BUILTIN_CD); if (ft_strcmp("export", word) == 0) return (BUILTIN_EXPORT); + if (ft_strcmp("exit", word) == 0) + return (BUILTIN_EXIT); return (BUILTIN_INVALID); } @@ -35,6 +37,7 @@ t_builtin_type execute_builtin(t_simple_cmd *cmd, t_minishell *app) [BUILTIN_PWD] = builtin_pwd, [BUILTIN_CD] = builtin_cd, [BUILTIN_EXPORT] = builtin_export, + [BUILTIN_EXIT] = builtin_exit, }; type = get_builtin(cmd); diff --git a/src/executing/simple_cmd/builtins.h b/src/executing/simple_cmd/builtins.h index dd4011d..6a4b34d 100644 --- a/src/executing/simple_cmd/builtins.h +++ b/src/executing/simple_cmd/builtins.h @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/31 14:16:13 by khais #+# #+# */ -/* Updated: 2025/04/01 16:37:15 by khais ### ########.fr */ +/* Updated: 2025/04/01 18:17:50 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,6 +19,7 @@ t_builtin_type builtin_invalid(t_simple_cmd *cmd, t_minishell *app); t_builtin_type builtin_pwd(t_simple_cmd *cmd, t_minishell *app); t_builtin_type builtin_cd(t_simple_cmd *cmd, t_minishell *app); t_builtin_type builtin_export(t_simple_cmd *cmd, t_minishell *app); +t_builtin_type builtin_exit(t_simple_cmd *cmd, t_minishell *app); t_builtin_type get_builtin(t_simple_cmd *cmd); t_builtin_type execute_builtin(t_simple_cmd *cmd, t_minishell *app); diff --git a/src/executing/simple_cmd/simple_cmd_execute.c b/src/executing/simple_cmd/simple_cmd_execute.c index 4406434..d8fc0e5 100644 --- a/src/executing/simple_cmd/simple_cmd_execute.c +++ b/src/executing/simple_cmd/simple_cmd_execute.c @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/27 16:21:56 by khais #+# #+# */ -/* Updated: 2025/04/15 15:01:17 by khais ### ########.fr */ +/* Updated: 2025/04/15 15:03:04 by khais ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/executing/simple_cmd/simple_cmd_execute.h b/src/executing/simple_cmd/simple_cmd_execute.h index 43d306a..b043b0b 100644 --- a/src/executing/simple_cmd/simple_cmd_execute.h +++ b/src/executing/simple_cmd/simple_cmd_execute.h @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/27 16:20:31 by khais #+# #+# */ -/* Updated: 2025/04/01 13:54:10 by khais ### ########.fr */ +/* Updated: 2025/04/01 18:17:33 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,6 +24,7 @@ typedef enum e_builtin_type BUILTIN_PWD, BUILTIN_CD, BUILTIN_EXPORT, + BUILTIN_EXIT, } t_builtin_type; #endif // SIMPLE_CMD_EXECUTE_H diff --git a/test.sh b/test.sh index 18e4bf6..8061ec0 100755 --- a/test.sh +++ b/test.sh @@ -357,6 +357,24 @@ hi 0 EOF +when_run <