tvdu29/minishell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WIP added basic cd command

Browse Source 
The command only works with `-`, absolut paths and empty arg
No option has been added
This commit is contained in:
Tanguy MAZE 2019-01-21 17:35:57 +01:00
parent 0dfcd409df
commit 9dc92563e3
3 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/minishell.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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

80
srcs/cmd_cd.c
View File

@ -6,15 +6,87 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}

8
srcs/exec.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);