willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract into helper for norminette

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-27 16:46:47 +01:00
parent abdab3156c
commit e366689f91
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/executor/executor_absolute_path.c
View File

@ -12,15 +12,10 @@
#include "minishell.h" #include "minishell.h"
char *executor_absolute_path(t_minishell *msh, char *cmd) static char *resolve_relative(t_minishell *msh, char *cmd)
{ {
char **path;
t_environment *path_env;
char *executable; char *executable;
int i;
if (cmd[0] == '/' || cmd[0] == '.')
{
if (access(cmd, F_OK) == 0) if (access(cmd, F_OK) == 0)
{ {
executable = ft_strdup_safe(msh, cmd); executable = ft_strdup_safe(msh, cmd);
@ -30,6 +25,30 @@ char *executor_absolute_path(t_minishell *msh, char *cmd)
} }
return (NULL); return (NULL);
} }
static char *resolve_path(t_minishell *msh, char *path, char *cmd)
{
char *executable;
executable = malloc_safe(msh, ft_strlen(path) + ft_strlen(cmd) + 2);
ft_strlcpy(executable, path, ft_strlen(path) + 1);
ft_strlcat(executable, "/", ft_strlen(path) + 2);
ft_strlcat(executable, cmd, ft_strlen(path) + ft_strlen(cmd) + 2);
if (access(executable, F_OK) == 0)
return (executable);
free_safe(msh, (void **)&executable);
return (NULL);
}
char *executor_absolute_path(t_minishell *msh, char *cmd)
{
char **path;
t_environment *path_env;
char *executable;
int i;
if (cmd[0] == '/' || cmd[0] == '.')
return (resolve_relative(msh, cmd));
path_env = environment_get(msh, "PATH"); path_env = environment_get(msh, "PATH");
if (!path_env) if (!path_env)
return (NULL); return (NULL);
@ -37,16 +56,9 @@ char *executor_absolute_path(t_minishell *msh, char *cmd)
i = 0; i = 0;
while (path[i] != NULL) while (path[i] != NULL)
{ {
executable = malloc_safe(msh, ft_strlen(path[i]) + ft_strlen(cmd) + 2); executable = resolve_path(msh, path[i], cmd);
ft_strlcpy(executable, path[i], ft_strlen(path[i]) + 1); if (executable)
ft_strlcat(executable, "/", ft_strlen(path[i]) + 2);
ft_strlcat(executable, cmd, ft_strlen(path[i]) + ft_strlen(cmd) + 2);
if (access(executable, F_OK) == 0)
{
ft_free_arr(path);
return (executable); return (executable);
}
free_safe(msh, (void **)&executable);
i++; i++;
} }
return (ft_free_arr(path), NULL); return (ft_free_arr(path), NULL);