From 06ffb44757597505cc6b91322e49de66e36eeb02 Mon Sep 17 00:00:00 2001 From: Loic Deridder Date: Tue, 18 Feb 2025 14:35:37 +0100 Subject: [PATCH] small fixes --- srcs/execution/exec_cmd.c | 18 ++++++++++-------- srcs/msh_struct.c | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/srcs/execution/exec_cmd.c b/srcs/execution/exec_cmd.c index 58ca483..181b637 100644 --- a/srcs/execution/exec_cmd.c +++ b/srcs/execution/exec_cmd.c @@ -11,7 +11,9 @@ /* ************************************************************************** */ #include "../../includes/minishell.h" +#include #include +#include int count_cmds(t_ast_n **pline) { @@ -27,13 +29,14 @@ int count_cmds(t_ast_n **pline) char *find_path(char *cmd, char **env) { - char *tmp; - char *path; - char **paths; - int i; + char *tmp; + char *path; + char **paths; + int i; + struct stat st; - if (access(cmd, F_OK) == 0 && access(cmd, X_OK) == 0) - return (cmd); + if (stat(cmd, &st) && S_ISREG(st.st_mode) && access(cmd, X_OK) == 0) + return (ft_strdup(cmd)); i = 0; while (env[i] && ft_strnstr(env[i], "PATH=", 5) == NULL) i++; @@ -50,8 +53,7 @@ char *find_path(char *cmd, char **env) return (free_tab(paths), path); free(path); } - free_tab(paths); - return (NULL); + return (free_tab(paths), NULL); } void return_error(char *arg, char *msg, int code, t_ast_n *node) diff --git a/srcs/msh_struct.c b/srcs/msh_struct.c index 9bc292a..0cd18dc 100644 --- a/srcs/msh_struct.c +++ b/srcs/msh_struct.c @@ -56,7 +56,7 @@ void free_msh(t_msh *msh) close(msh->hist); if (msh->here_fd != -1) close(msh->here_fd); - free(msh->input); + ft_free(&msh->input); ft_free(&msh->prev_input); free(msh); }