refactoring exec

This commit is contained in:
LuckyLaszlo
2021-12-01 17:24:32 +01:00
parent b08da252de
commit b3f74c4179
9 changed files with 60 additions and 27 deletions

View File

@@ -6,19 +6,24 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/16 01:57:38 by lperrey #+# #+# */
/* Updated: 2021/11/30 13:37:09 by lperrey ### ########.fr */
/* Updated: 2021/12/01 17:16:55 by lperrey ### ########.fr */
/* */
/* ************************************************************************** */
#include "minishell.h"
static int search_cmd_path(char *cmd_name, char **cmd_path,
char *path[]);
char *path[]);
static t_builtin_f search_builtin(char *cmd_name);
static int handle_access_error(char *file_name);
// https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_08_02
// faire des test sur la valeur de errno selon les cas (if directory, if pathname invalid, ...)
/*
2.8.2 Exit Status for Commands
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
#tag_18_08_02
*/
// TODO : faire des test sur la valeur de errno selon les cas (if directory, if pathname invalid, ...)
int cmd_find_access(t_cmd *cmd, char *path[])
{
@@ -29,29 +34,26 @@ int cmd_find_access(t_cmd *cmd, char *path[])
else
{
cmd->path = ft_strdup(cmd->argv[0]);
if (!cmd->path)
if (!cmd->path)
return (0);
}
}
else
{
cmd->builtin_func = search_builtin(cmd->argv[0]);
if (cmd->builtin_func)
cmd->builtin_f = search_builtin(cmd->argv[0]);
if (cmd->builtin_f)
return (1);
if (search_cmd_path(cmd->argv[0], &cmd->path, path) == -1)
return (0);
if (!cmd->path)
{
cmd->error = EXIT_CMD_NOT_FOUND;
ft_putstr_fd("minishell: ", 2);
ft_putstr_fd(cmd->argv[0], 2);
ft_putstr_fd(": command not found\n", 2);
shell_error(cmd->argv[0], ": command not found");
}
}
return (1);
}
static int search_cmd_path(char *cmd_name, char **cmd_path, char *path[])
{
int i;