diff --git a/Makefile b/Makefile index 36d2a9e..e4a6f3e 100644 --- a/Makefile +++ b/Makefile @@ -31,11 +31,13 @@ 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 \ src/executing/simple_cmd/builtins.c \ src/executing/simple_cmd/simple_cmd_execute.c \ + src/executing/simple_cmd/subprocess.c \ src/ft_errno.c \ src/get_command.c \ src/parser/cmdgroup/cmdgroup.c \ @@ -100,6 +102,7 @@ all: $(NAME) $(NAME): $(minishell_objs) $(LIBFT) $(CC) $(CFLAGS) -o $@ $(minishell_objs) $(LINCLUDE) $(LDLIBS) +$(LIBFT): CFLAGS+=-DBUFFER_SIZE=1 $(LIBFT): +$(MAKE) -C $(LIBFTDIR) 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 e483186..d93f5e1 100644 --- a/src/executing/simple_cmd/simple_cmd_execute.c +++ b/src/executing/simple_cmd/simple_cmd_execute.c @@ -6,32 +6,19 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/27 16:21:56 by khais #+# #+# */ -/* Updated: 2025/04/01 16:37:31 by khais ### ########.fr */ +/* Updated: 2025/04/02 19:15:08 by khais ### ########.fr */ /* */ /* ************************************************************************** */ #include "simple_cmd_execute.h" #include "builtins.h" +#include "subprocess.h" #include "libft.h" #include "../../subst/subst.h" -#include "../../env/env_convert.h" #include #include - -static char **argv_from_wordlist(t_wordlist *wordlist) -{ - char **out; - int i; - - out = ft_calloc(wordlist_size(wordlist) + 1, sizeof(char *)); - i = 0; - while (wordlist != NULL) - { - out[i++] = ft_strdup(wordlist->word->word); - wordlist = wordlist->next; - } - return (out); -} +#include +#include static void command_not_found(t_simple_cmd *cmd) { @@ -39,6 +26,17 @@ static void command_not_found(t_simple_cmd *cmd) cmd->words->word->word); } +static void do_waitpid(t_minishell *app, int pid) +{ + int wstatus; + + waitpid(pid, &wstatus, 0); + if (WIFEXITED(wstatus)) + app->last_return_value = WEXITSTATUS(wstatus); + if (WIFSIGNALED(wstatus)) + app->last_return_value = 128 + WTERMSIG(wstatus); +} + void simple_cmd_execute(t_simple_cmd *cmd, t_minishell *app) { char *exe; @@ -56,8 +54,8 @@ void simple_cmd_execute(t_simple_cmd *cmd, t_minishell *app) } pid = fork(); if (pid == 0) - execve(exe, argv_from_wordlist(cmd->words), envp_from_env(app->env)); + execute_subprocess(exe, cmd, app); free(exe); - waitpid(pid, NULL, 0); + do_waitpid(app, pid); return ; } 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/src/executing/simple_cmd/subprocess.c b/src/executing/simple_cmd/subprocess.c new file mode 100644 index 0000000..9d7b882 --- /dev/null +++ b/src/executing/simple_cmd/subprocess.c @@ -0,0 +1,50 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* subprocess.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: khais +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/02 18:19:23 by khais #+# #+# */ +/* Updated: 2025/04/02 18:20:54 by khais ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "subprocess.h" +#include "../../env/env_convert.h" +#include "../../parser/simple_cmd/simple_cmd.h" +#include "../../subst/path_split.h" +#include + +static char **argv_from_wordlist(t_wordlist *wordlist) +{ + char **out; + int i; + + out = ft_calloc(wordlist_size(wordlist) + 1, sizeof(char *)); + i = 0; + while (wordlist != NULL) + { + out[i++] = ft_strdup(wordlist->word->word); + wordlist = wordlist->next; + } + return (out); +} + +static void ft_execve(char *exe, char **argv, char **envp) +{ + execve(exe, argv, envp); + ft_dprintf(STDERR_FILENO, "minishell: %s: ", argv[0]); + perror(NULL); + free(exe); + path_split_destroy(argv); + path_split_destroy(envp); +} + +void execute_subprocess(char *exe, t_simple_cmd *cmd, t_minishell *app) +{ + ft_execve(exe, argv_from_wordlist(cmd->words), envp_from_env(app->env)); + simple_cmd_destroy(cmd); + env_destroy(app->env); + exit(127); +} diff --git a/src/executing/simple_cmd/subprocess.h b/src/executing/simple_cmd/subprocess.h new file mode 100644 index 0000000..3e877d4 --- /dev/null +++ b/src/executing/simple_cmd/subprocess.h @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* subprocess.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: khais +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/02 18:17:48 by khais #+# #+# */ +/* Updated: 2025/04/02 18:21:30 by khais ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef SUBPROCESS_H +# define SUBPROCESS_H + +# include "../../minishell.h" + +void execute_subprocess(char *exe, t_simple_cmd *cmd, t_minishell *app); + +#endif // SUBPROCESS_H diff --git a/src/subst/simple_filename_exp.c b/src/subst/simple_filename_exp.c index 3e1451b..0f8bd66 100644 --- a/src/subst/simple_filename_exp.c +++ b/src/subst/simple_filename_exp.c @@ -6,7 +6,7 @@ /* By: khais +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/03/02 13:40:10 by jguelen #+# #+# */ -/* Updated: 2025/03/27 18:39:23 by khais ### ########.fr */ +/* Updated: 2025/04/01 18:38:35 by khais ### ########.fr */ /* */ /* ************************************************************************** */ @@ -77,8 +77,6 @@ static char *select_path(char *filepath, char **oldpath, char **path, else return (free(*oldpath), path_split_destroy(path), filepath); } - if (*oldpath != filepath) - free(filepath); return (NULL); } diff --git a/test.sh b/test.sh index e6fcefd..8061ec0 100755 --- a/test.sh +++ b/test.sh @@ -335,6 +335,46 @@ status=1 hello=hi EOF +when_run <