From 892d8f5b1e9cbd4431969feec6bbd0c92796a05b Mon Sep 17 00:00:00 2001 From: kinou-p Date: Wed, 20 Apr 2022 04:52:13 +0200 Subject: [PATCH] done ? --- Makefile | 4 ++-- includes/minishell.h | 4 ++-- srcs/built_in/utils_builtin.c | 6 ++++-- srcs/main.c | 4 ++-- srcs/pipe/exec_utils.c | 7 ++++--- srcs/pipe/{pipe.c => execution.c} | 8 ++++---- 6 files changed, 18 insertions(+), 15 deletions(-) rename srcs/pipe/{pipe.c => execution.c} (93%) diff --git a/Makefile b/Makefile index 2b4abd2..0baae2b 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,13 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/03/06 12:50:24 by apommier #+# #+# # -# Updated: 2022/04/19 19:29:06 by apommier ### ########.fr # +# Updated: 2022/04/20 04:44:00 by apommier ### ########.fr # # # # **************************************************************************** # NAME = minishell SRCS = srcs/main.c\ - srcs/pipe/pipe.c\ + srcs/pipe/execution.c\ srcs/pipe/pipex_utils.c\ srcs/pipe/exec_utils.c\ srcs/set_cmd/free_cmd.c\ diff --git a/includes/minishell.h b/includes/minishell.h index 6c8e5ed..a6f8539 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/09 22:33:49 by apommier #+# #+# */ -/* Updated: 2022/04/19 19:33:31 by apommier ### ########.fr */ +/* Updated: 2022/04/20 04:44:53 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -65,7 +65,7 @@ int main(int ac, char **av, char **path); char **ft_dup_double(char **env); //pipe.c -void execute(t_cmd *cmd, char **env); +void execute(t_cmd *cmd); //set_cmd.c int error_parsing(void); diff --git a/srcs/built_in/utils_builtin.c b/srcs/built_in/utils_builtin.c index dc4b17e..e432754 100644 --- a/srcs/built_in/utils_builtin.c +++ b/srcs/built_in/utils_builtin.c @@ -3,13 +3,15 @@ /* ::: :::::::: */ /* utils_builtin.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: sadjigui +#+ +:+ +#+ */ +/* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/16 15:04:12 by sadjigui #+# #+# */ -/* Updated: 2022/04/20 00:36:10 by sadjigui ### ########.fr */ +/* Updated: 2022/04/20 04:42:35 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ +#include "../../includes/minishell.h" + int find_len(char *input, int i, char c) { int j; diff --git a/srcs/main.c b/srcs/main.c index 09920fc..05751fe 100644 --- a/srcs/main.c +++ b/srcs/main.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/03/06 13:27:11 by apommier #+# #+# */ -/* Updated: 2022/04/19 16:02:18 by apommier ### ########.fr */ +/* Updated: 2022/04/20 04:45:06 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -63,7 +63,7 @@ char **read_line(char **path, char *input, t_cmd *cmd, int *err_var) if (cmd) { free_double(path); - execute(cmd, cmd->env); + execute(cmd); *err_var = cmd->err_var; path = ft_dup_double(cmd->env); free_cmd(cmd); diff --git a/srcs/pipe/exec_utils.c b/srcs/pipe/exec_utils.c index b800e5d..7d612f9 100644 --- a/srcs/pipe/exec_utils.c +++ b/srcs/pipe/exec_utils.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/04/19 17:36:53 by apommier #+# #+# */ -/* Updated: 2022/04/19 18:13:29 by apommier ### ########.fr */ +/* Updated: 2022/04/20 04:50:19 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -49,7 +49,7 @@ void exit_child(t_cmd *cmd, int exit_pid, int status, int i) cmd->err_var = WTERMSIG(status); ft_putstr_fd("\b\b\b\b\b", 1); if (WTERMSIG(status) == 3) - ft_putstr_fd("^\\Quit", 1); + ft_putstr_fd("^\\Quit\n", 1); } } } @@ -59,7 +59,8 @@ void check_access(t_cmd *cmd) if (!cmd->current_s_cmd->cmd || access(cmd->current_s_cmd->cmd, F_OK)) { ft_putstr_fd("Minishell: command not found: ", 2); - ft_putstr_fd(cmd->current_s_cmd->cmd, 2); + if (cmd->current_s_cmd->cmd) + ft_putstr_fd(cmd->current_s_cmd->cmd, 2); ft_putstr_fd("\n", 2); close(0); close(1); diff --git a/srcs/pipe/pipe.c b/srcs/pipe/execution.c similarity index 93% rename from srcs/pipe/pipe.c rename to srcs/pipe/execution.c index 89bbcf0..5af1fae 100644 --- a/srcs/pipe/pipe.c +++ b/srcs/pipe/execution.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* pipe.c :+: :+: :+: */ +/* execution.c :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2022/04/02 18:51:31 by apommier #+# #+# */ -/* Updated: 2022/04/19 18:12:19 by apommier ### ########.fr */ +/* Created: 2022/04/20 04:43:32 by apommier #+# #+# */ +/* Updated: 2022/04/20 04:44:20 by apommier ### ########.fr */ /* */ /* ************************************************************************** */ @@ -82,7 +82,7 @@ void set_fdin_not_first(t_cmd *cmd, int *fdin) printf("Minishell: open : bad file descriptor\n"); } -void execute(t_cmd *cmd, char **env) +void execute(t_cmd *cmd) { int fdpipe[2]; int fdout;