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

WIP cd builtin

Browse Source 
need to implement -P and -L (default) options
This commit is contained in:
Tanguy MAZE 2019-01-28 17:00:16 +01:00
parent 784e71d719
commit 9a1bc7b613
3 changed files with 26 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,7 +6,7 @@
# By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ # # By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2018/11/22 14:43:33 by tmaze #+# #+# # # Created: 2018/11/22 14:43:33 by tmaze #+# #+# #
# Updated: 2019/01/27 15:09:17 by tmaze ### ########.fr # # Updated: 2019/01/28 13:20:28 by tmaze ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -39,7 +39,7 @@ libft/libft.a:
$(MAKE) -Clibft all $(MAKE) -Clibft all
clean: clean:
rm -rf $(OBJS_DIR) rm -rf $(OBJS)
$(MAKE) -Clibft clean $(MAKE) -Clibft clean
fclean: clean fclean: clean

100
srcs/cmd_cd.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/01/07 16:44:40 by tmaze #+# #+# */ /* Created: 2019/01/07 16:44:40 by tmaze #+# #+# */
/* Updated: 2019/01/27 16:32:01 by tmaze ### ########.fr */ /* Updated: 2019/01/28 16:53:32 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -25,7 +25,7 @@ char *check_path_slash_cd(char *exec)
int i; int i;
struct stat info; struct stat info;
if (ft_isin(exec, '/') != -1 && ft_isin(exec, '.') == -1) if (exec[0] == '/')
{ {
if ((i = access(exec, F_OK)) != 0) if ((i = access(exec, F_OK)) != 0)
put_error_cd(exec, "no such file or directory"); put_error_cd(exec, "no such file or directory");
@ -49,11 +49,13 @@ char *check_path_slash_cd(char *exec)
return (NULL); return (NULL);
} }
int cmd_cd_core(char *path, t_list **env) int cmd_cd_core(char *path, t_list **env, char opt)
{ {
t_envelem *pwd; t_envelem *pwd;
char *oldpwd; char *oldpwd;
char *tmp;
opt = '\0';
if (check_path_slash_cd(path) == NULL) if (check_path_slash_cd(path) == NULL)
{ {
put_error_cd(path, "invalid path"); put_error_cd(path, "invalid path");
@ -83,63 +85,25 @@ int cmd_cd_core(char *path, t_list **env)
char cd_getparams(char **argv, size_t *i) char cd_getparams(char **argv, size_t *i)
{ {
char ret; char ret[2];
size_t j; size_t j;
ret = 'L'; ret[1] = '\0';
while (argv[++*i] && argv[*i][0] == '-' && ft_strlen(argv[*i]) > 1) ret[0] = 'L';
while (argv[++(*i)] && argv[*i][0] == '-' && ft_strlen(argv[*i]) > 1)
{ {
j = 0; j = 1;
while (argv[*i][j] && (argv[*i][j] == 'L' || argv[*i][j] == 'P')) while (argv[*i][j] && (argv[*i][j] == 'L' || argv[*i][j] == 'P'))
ret = argv[*i][j++]; ret[0] = argv[*i][j++];
if (argv[*i][j] && argv[*i][j] != 'L' && argv[*i][j] != 'P') if (argv[*i][j] && argv[*i][j] != 'L' && argv[*i][j] != 'P')
{ {
ret = argv[*i][j]; put_error_cd(ret, "invalid option");
put_error_cd(&ret, "invalid option");
put_error_cd("usage", "cd [-L|-P] [dir]"); put_error_cd("usage", "cd [-L|-P] [dir]");
ret = '\0'; ret[0] = '\0';
break ; break ;
} }
} }
return (ret); return (ret[0]);
}
int ft_isfstcmp(char *path, char *cmp)
{
size_t i;
i = 0;
while (path[i] == '/')
i++;
return (ft_strncmp(&path[i], cmp, ft_strlen(cmp)));
}
int cmd_cd2(char **argv, t_list **env)
{
t_envelem *elem;
char *path;
char *tmp;
char opt;
size_t i;
i = 0;
path = NULL;
if ((opt = cd_getparams(argv, &i)) == '\0')
return (1);
if (!argv[i] && (elem = env_getelemfromkey("HOME", *env)) != NULL && elem->val != NULL)
tmp = elem->val;
else if (argv[i] && argv[i][0] == '.' && (elem = env_getelemfromkey("PWD", *env)) != NULL && elem->val != NULL)
{
if ((tmp = ft_strnew(ft_strlen(argv[i]) + ft_strlen(elem->val) + 1)) == NULL)
put_error_cd(argv[i], "memory error");
if (tmp == NULL)
return (1);
ft_strcat(tmp, elem->val);
ft_strcat(tmp, "/");
ft_strcat(tmp, argv[i]);
}
else if ()
return (0);
} }
int cmd_cd(char **argv, t_list **env) int cmd_cd(char **argv, t_list **env)
@ -147,7 +111,6 @@ int cmd_cd(char **argv, t_list **env)
t_envelem *elem; t_envelem *elem;
size_t i; size_t i;
char *path; char *path;
char *tmp;
char opt; char opt;
int ret; int ret;
@ -155,40 +118,21 @@ int cmd_cd(char **argv, t_list **env)
if ((opt = cd_getparams(argv, &i)) == '\0') if ((opt = cd_getparams(argv, &i)) == '\0')
return (1); return (1);
if (!argv[i] && (elem = env_getelemfromkey("HOME", *env)) != NULL && elem->val != NULL) if (!argv[i] && (elem = env_getelemfromkey("HOME", *env)) != NULL && elem->val != NULL)
return (cmd_cd_core(elem->val, env)); return (cmd_cd_core(elem->val, env, opt));
else if (argv[i] && argv[1][0] == '/') else if (argv[i] && argv[1][0] == '/')
return (cmd_cd_core(argv[1], env)); return (cmd_cd_core(argv[1], env, opt));
else if (argv[i] && argv[i][0] == '-' && (elem = env_getelemfromkey("OLDPWD", *env)) != NULL) else if (argv[i] && argv[i][0] == '-' && (elem = env_getelemfromkey("OLDPWD", *env)) != NULL)
return (cmd_cd_core(elem->val, env)); return (cmd_cd_core(elem->val, env, opt));
else if (argv[i] && argv[i][0] == '.' && (elem = env_getelemfromkey("PWD", *env)) != NULL && elem->val != NULL) else if (argv[i] && argv[i][0] != '/' && (elem = env_getelemfromkey("PWD", *env)) != NULL && elem->val != NULL)
{ {
if ((tmp = ft_strnew(ft_strlen(elem->val) + ft_strlen(argv[i]) + 1)) == NULL) if ((path = ft_strnew(ft_strlen(elem->val) + ft_strlen(argv[i]) + 1)) == NULL)
put_error_cd(argv[1], "memory error"); put_error_cd(argv[i], "memory error");
if (tmp == NULL)
return (1);
ft_strcpy(tmp, elem->val);
tmp[ft_strlen(tmp)] = '/';
ft_strcat(tmp, argv[1]);
if (ft_realpath(tmp, &path) == NULL)
put_error_cd(argv[1], "memory error");
ret = cmd_cd_core(path, env);
ft_strdel(&tmp);
ft_strdel(&path);
return (ret);
}
else if (argv[1] && (elem = env_getelemfromkey("PWD", *env)) != NULL && elem->val != NULL)
{
if ((path = ft_strnew(ft_strlen(elem->val) + ft_strlen(argv[1]) + 1)) == NULL)
put_error_cd(argv[1], "memory error");
if (path == NULL) if (path == NULL)
return (1); return (1);
ft_strcpy(path, elem->val); ft_strcpy(path, elem->val);
path[ft_strlen(path)] = '/'; path[ft_strlen(path)] = '/';
ft_strcat(path, argv[1]); ft_strcat(path, argv[i]);
ft_putendl(path); ret = cmd_cd_core(path, env, opt);
ft_putendl("plop");
ret = cmd_cd_core(path, env);
ft_strdel(&tmp);
ft_strdel(&path); ft_strdel(&path);
return (ret); return (ret);
} }

4
srcs/ft_realpath.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/01/27 14:42:35 by tmaze #+# #+# */ /* Created: 2019/01/27 14:42:35 by tmaze #+# #+# */
/* Updated: 2019/01/27 15:35:06 by tmaze ### ########.fr */ /* Updated: 2019/01/28 15:32:44 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -46,7 +46,7 @@ char *ft_realpath(char *r_path, char **a_path)
while (tab_path[i]) while (tab_path[i])
{ {
if ((strcmp = ft_strcmp(tab_path[i], "..")) == 0 if ((strcmp = ft_strcmp(tab_path[i], "..")) == 0
|| ft_strcmp(tab_path[i], ".") == 0 || (strcmp == 0 && i == 0)) || ft_strcmp(tab_path[i], ".") == 0)
{ {
j = i; j = i;
if (strcmp == 0 && i != 0) if (strcmp == 0 && i != 0)