From 9dc92563e3d88525349ef7b400f2061994712c27 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Mon, 21 Jan 2019 17:35:57 +0100 Subject: [PATCH] WIP added basic cd command The command only works with `-`, absolut paths and empty arg No option has been added --- includes/minishell.h | 6 +++- srcs/cmd_cd.c | 80 +++++++++++++++++++++++++++++++++++++++++--- srcs/exec.c | 8 +++-- 3 files changed, 86 insertions(+), 8 deletions(-) diff --git a/includes/minishell.h b/includes/minishell.h index d41e38a..2149d52 100644 --- a/includes/minishell.h +++ b/includes/minishell.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/11/18 13:12:34 by tmaze #+# #+# */ -/* Updated: 2019/01/15 15:09:58 by tmaze ### ########.fr */ +/* Updated: 2019/01/21 13:14:47 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,4 +43,8 @@ int cmd_env(char **argv, t_list **env); int cmd_setenv(char **argv, t_list **env); int cmd_unsetenv(char **argv, t_list **env); +int ft_isin(char *str, char c); +char *check_path_slash(char *exec); +char *check_path_dot(char *exec, t_list *env); + #endif diff --git a/srcs/cmd_cd.c b/srcs/cmd_cd.c index 1a57248..4327ef7 100644 --- a/srcs/cmd_cd.c +++ b/srcs/cmd_cd.c @@ -6,15 +6,87 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/01/07 16:44:40 by tmaze #+# #+# */ -/* Updated: 2019/01/16 13:46:47 by tmaze ### ########.fr */ +/* Updated: 2019/01/21 17:06:19 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ #include "minishell.h" -int cmd_cd(char **argv, t_list **env) +void put_error_cd(char *file, char *msg) { - (void)argv; - (void)env; + ft_putstr("cd: "); + ft_putstr(file); + ft_putstr(": "); + ft_putendl(msg); +} + +char *check_path_slash_cd(char *exec) +{ + int i; + struct stat info; + + if (ft_isin(exec, '/') != -1 && ft_isin(exec, '.') == -1) + { + if ((i = access(exec, F_OK)) != 0) + put_error_cd(exec, "no such file or directory"); + if (i != 0) + return (NULL); + if ((i = stat(exec, &info)) != 0) + put_error_cd(exec, "can't determine info"); + if (i != 0) + return (NULL); + if (!S_ISDIR(info.st_mode)) + { + put_error_cd(exec, "not a directory"); + return (NULL); + } + if ((i = access(exec, X_OK)) != 0) + put_error_cd(exec, "permission denied"); + if (i != 0) + return (NULL); + return (exec); + } + return (NULL); +} + +int cmd_cd_core(char *path, t_list **env) +{ + t_envelem *pwd; + char *oldpwd; + + if (check_path_slash_cd(path) == NULL) + return (1); + if (chdir(path) == -1 + || (pwd = env_getelemfromkey("PWD", *env)) == NULL) + { + put_error_cd(path, "error"); + return (1); + } + if ((oldpwd = ft_strdup(pwd->val)) == NULL) + { + put_error_cd(path, "error"); + return (1); + } + if (env_addupdate("PWD", path, env) == NULL + || env_addupdate("OLDPWD", oldpwd, env) == NULL) + { + put_error_cd(path, "error"); + ft_strdel(&oldpwd); + return (1); + } + ft_strdel(&oldpwd); + return (0); +} + +int cmd_cd(char **argv, t_list **env) +{ + t_envelem *elem; + + if (!argv[1] && (elem = env_getelemfromkey("HOME", *env))->val != NULL) + return (cmd_cd_core(elem->val, env)); + else if (argv[1] && argv[1][0] == '/') + return (cmd_cd_core(argv[1], env)); + else if (argv[1] && argv[1][0] == '-' && (elem = env_getelemfromkey("OLDPWD", *env)) != NULL) + return (cmd_cd_core(elem->val, env)); return (0); } diff --git a/srcs/exec.c b/srcs/exec.c index 2528f16..16ba7a6 100644 --- a/srcs/exec.c +++ b/srcs/exec.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/11/27 15:32:29 by tmaze #+# #+# */ -/* Updated: 2019/01/17 17:43:00 by tmaze ### ########.fr */ +/* Updated: 2019/01/21 13:21:04 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -175,6 +175,8 @@ char *check_path(char *exec, t_list *env) ft_strdel(&ret); i++; } + if (path_elems[i] == NULL) + put_error(exec, "command not found"); ft_del_words_tables(&path_elems); return (ret); } @@ -202,14 +204,14 @@ int exec_cmd(char **argv, t_list **env) if ((ret = fork()) == 0) { execve(path, argv, env_tab); - ft_putendl_fd("minishell: error", 2); + ft_putendl_fd("minishell: error", 1); if (ft_strcmp(path, argv[0]) != 0) ft_strdel(&path); ft_del_words_tables(&env_tab); exit(-1); } else if (ret == -1) - ft_putendl_fd("minishell: error", 2); + ft_putendl_fd("minishell: error", 1); if (ret == -1) return (-1); waitpid(ret, NULL, 0);