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

WIP cd options

Browse Source 
Nearly there ^^
added cd options

need to iron out bug with pwd that only shows physical path
This commit is contained in:
Tanguy MAZE 2019-01-30 17:04:15 +01:00
parent f88be73e8b
commit f04da8b91f
2 changed files with 48 additions and 21 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/28 13:20:28 by tmaze ### ########.fr # # Updated: 2019/01/30 15:50:42 by tmaze ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -16,7 +16,7 @@ CCSTD :=
NAME := minishell NAME := minishell
SRCS := main.c exec.c cmd_echo.c cmd_cd.c cmd_env.c cmd_setenv.c cmd_unsetenv.c ms_env.c ft_realpath.c SRCS := main.c exec.c cmd_echo.c cmd_cd.c cmd_env.c cmd_setenv.c cmd_unsetenv.c ms_env.c
OBJS_DIR := objs OBJS_DIR := objs
OBJS := $(SRCS:.c=.o) OBJS := $(SRCS:.c=.o)
INCLS := -Iincludes -Ilibft INCLS := -Iincludes -Ilibft

65
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/29 16:12:21 by tmaze ### ########.fr */ /* Updated: 2019/01/30 17:02:05 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -49,12 +49,50 @@ char *check_path_slash_cd(char *exec)
return (NULL); return (NULL);
} }
int cmd_cd_core(char *path, t_list **env, char opt) int cmd_cd_update_env(char *path, t_list **env, char opt)
{ {
t_envelem *pwd; t_envelem *pwd;
char *oldpwd; char *oldpwd;
char *c_path; char *c_path;
char *tmp; char p_path[4096];
ft_bzero(p_path, 4096);
if (getcwd(p_path, 4096) == NULL)
{
put_error_cd(path, "error");
return (1);
}
if ((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 (ft_realpath(path, &c_path) == NULL)
{
put_error_cd(path, "error");
return (1);
}
if (env_addupdate("PWD", ((opt == 'P') ? p_path : c_path), env) == NULL
|| env_addupdate("OLDPWD", oldpwd, env) == NULL)
{
put_error_cd(path, "error");
ft_strdel(&oldpwd);
ft_strdel(&c_path);
return (1);
}
ft_strdel(&oldpwd);
ft_strdel(&c_path);
return (0);
}
int cmd_cd_core(char *path, t_list **env, char opt)
{
t_envelem *pwd;
if (check_path_slash_cd(path) == NULL) if (check_path_slash_cd(path) == NULL)
{ {
@ -67,20 +105,7 @@ int cmd_cd_core(char *path, t_list **env, char opt)
put_error_cd(path, "error"); put_error_cd(path, "error");
return (1); return (1);
} }
if ((oldpwd = ft_strdup(pwd->val)) == NULL) return (cmd_cd_update_env(path, env, opt));
{
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);
} }
char cd_getparams(char **argv, size_t *i) char cd_getparams(char **argv, size_t *i)
@ -90,6 +115,7 @@ char cd_getparams(char **argv, size_t *i)
ret[1] = '\0'; ret[1] = '\0';
ret[0] = 'L'; ret[0] = 'L';
*i = 0;
while (argv[++(*i)] && argv[*i][0] == '-' && ft_strlen(argv[*i]) > 1) while (argv[++(*i)] && argv[*i][0] == '-' && ft_strlen(argv[*i]) > 1)
{ {
j = 1; j = 1;
@ -97,6 +123,7 @@ char cd_getparams(char **argv, size_t *i)
ret[0] = 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[0] = 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] = '\0'; ret[0] = '\0';
@ -119,8 +146,8 @@ int cmd_cd(char **argv, t_list **env)
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, opt)); return (cmd_cd_core(elem->val, env, opt));
else if (argv[i] && argv[1][0] == '/') else if (argv[i] && argv[i][0] == '/')
return (cmd_cd_core(argv[1], env, opt)); return (cmd_cd_core(argv[i], 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, opt)); 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)