diff options
| author | Charles <sircharlesaze@gmail.com> | 2020-07-19 17:09:46 +0200 |
|---|---|---|
| committer | Charles <sircharlesaze@gmail.com> | 2020-07-19 17:09:46 +0200 |
| commit | a478d95bed0f24f9783714600af48a6c1cde2aae (patch) | |
| tree | 795385ad007440663d6b8e2a2c0582eb4525e77c /src/eval | |
| parent | e9a8977e3867a4a5d93e405c82acc1aac44a0678 (diff) | |
| download | minishell-a478d95bed0f24f9783714600af48a6c1cde2aae.tar.gz minishell-a478d95bed0f24f9783714600af48a6c1cde2aae.tar.bz2 minishell-a478d95bed0f24f9783714600af48a6c1cde2aae.zip | |
Fixing directory cmd and $?
Diffstat (limited to 'src/eval')
| -rw-r--r-- | src/eval/cmd.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/src/eval/cmd.c b/src/eval/cmd.c index 1e59347..a7a6f71 100644 --- a/src/eval/cmd.c +++ b/src/eval/cmd.c @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/06/14 10:41:31 by charles #+# #+# */ -/* Updated: 2020/07/18 09:31:43 by charles ### ########.fr */ +/* Updated: 2020/07/19 16:53:54 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -65,15 +65,30 @@ int forked_cmd(void *void_param) return (param->builtin->func(param->argv, param->env)); else { + errno = 0; ret = execve(param->exec_path, param->argv, (char**)param->env->data); if (ret == -1) { - ft_putstr_fd(g_basename, STDERR_FILENO); - ft_putstr_fd(": ", STDERR_FILENO); - ft_putstr_fd(param->exec_path, STDERR_FILENO); - ft_putstr_fd(": ", STDERR_FILENO); - ft_putendl_fd(strerror(errno), STDERR_FILENO); - ret = 126; + if (errno == ENOEXEC) + return (0); + struct stat statbuf; + if (stat(param->exec_path, &statbuf) != -1 && S_ISDIR(statbuf.st_mode)) + { + ft_putstr_fd(g_basename, STDERR_FILENO); + ft_putstr_fd(": ", STDERR_FILENO); + ft_putstr_fd(param->exec_path, STDERR_FILENO); + ft_putendl_fd(": Is a directory", STDERR_FILENO); + ret = 126; + } + else + { + ft_putstr_fd(g_basename, STDERR_FILENO); + ft_putstr_fd(": ", STDERR_FILENO); + ft_putstr_fd(param->exec_path, STDERR_FILENO); + ft_putstr_fd(": ", STDERR_FILENO); + ft_putendl_fd(strerror(errno), STDERR_FILENO); + ret = 126; + } } return (ret); } |