diff --git a/inc/execute_cmd.h b/inc/execute_cmd.h index d57e26d..1e9d0bb 100644 --- a/inc/execute_cmd.h +++ b/inc/execute_cmd.h @@ -6,7 +6,7 @@ /* By: dayano +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/21 21:39:18 by dayano #+# #+# */ -/* Updated: 2025/04/25 20:46:25 by dayano ### ########.fr */ +/* Updated: 2025/04/28 12:00:45 by dayano ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,4 +25,6 @@ char *get_path_line(char **envp); void free_str_array(char **str); void print_cmd_not_found(t_cmd *cmd); +void execute_cmd(t_cmd *cmd, t_minish *minish); + #endif diff --git a/inc/main.h b/inc/main.h index 14f4b7e..d3118a6 100644 --- a/inc/main.h +++ b/inc/main.h @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.h :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: ttsubo +#+ +:+ +#+ */ +/* By: dayano +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/03 12:50:38 by ttsubo #+# #+# */ -/* Updated: 2025/04/27 16:28:37 by ttsubo ### ########.fr */ +/* Updated: 2025/04/28 12:00:56 by dayano ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/invoke_cmd/pipeline_helper_2.c b/src/invoke_cmd/pipeline_helper_2.c deleted file mode 100644 index 72e332f..0000000 --- a/src/invoke_cmd/pipeline_helper_2.c +++ /dev/null @@ -1,64 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* pipeline_helper_2.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: dayano +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/24 14:52:38 by dayano #+# #+# */ -/* Updated: 2025/04/24 14:59:55 by dayano ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "main.h" - -void perror_exit(char *msg) -{ - perror(msg); - exit(EXIT_FAILURE); -} - -void perror_exit_status(char *msg, int status) -{ - perror(msg); - exit(status); -} - -char *get_path_line(char **envp) -{ - int i; - - i = 0; - while (envp[i]) - { - if (ft_strncmp(envp[i], "PATH=", PATH_PREFIX_LEN) == 0) - return (envp[i] + PATH_PREFIX_LEN); - i++; - } - return (NULL); -} - -char *join_path(char *dir, char *cmd) -{ - char *full_path; - int len_dir; - int len_cmd; - - if (dir[ft_strlen(dir) - 1] == '/') - { - full_path = ft_strjoin(dir, cmd); - if (!full_path) - return (NULL); - return (full_path); - } - len_dir = ft_strlen(dir); - len_cmd = ft_strlen(cmd); - full_path = malloc(len_dir + len_cmd + 2); - if (!full_path) - return (NULL); - ft_strlcpy(full_path, dir, len_dir + 1); - full_path[len_dir] = '/'; - full_path[len_dir + 1] = '\0'; - ft_strlcpy(full_path + len_dir + 1, cmd, len_cmd + 1); - return (full_path); -} diff --git a/src/main.c b/src/main.c index a06e97d..2ffbdef 100644 --- a/src/main.c +++ b/src/main.c @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* main.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: ttsubo +#+ +:+ +#+ */ +/* By: dayano +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/03 12:50:11 by ttsubo #+# #+# */ -/* Updated: 2025/04/28 11:55:41 by ttsubo ### ########.fr */ +/* Updated: 2025/04/28 12:01:09 by dayano ### ########.fr */ /* */ /* ************************************************************************** */ @@ -45,7 +45,7 @@ static bool prompt(char *program_name, t_minish *minish, int *status) char **tokens; t_cmd **cmds; - (void) status; + (void)status; line = readline("minish>"); if (!line) return (false);