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

bug fix env -i && cd error message

Browse Source
This commit is contained in:
Tanguy MAZE 2020-02-14 12:22:35 +01:00
parent 7db099a010
commit b9c1a344b2
6 changed files with 31 additions and 10 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: 2019/03/27 16:51:02 by tmaze #+# #+# # # Created: 2019/03/27 16:51:02 by tmaze #+# #+# #
# Updated: 2020/02/01 15:54:10 by tmaze ### ########.fr # # Updated: 2020/02/14 11:56:31 by tmaze ### ########.fr #
# # # #
#******************************************************************************# #******************************************************************************#
@ -41,12 +41,14 @@ SRC = main.c \
cmd_setenv.c \ cmd_setenv.c \
cmd_unsetenv.c \ cmd_unsetenv.c \
cmd_cd.c \ cmd_cd.c \
cmd_cd_utils.c \
cmd_echo.c \ cmd_echo.c \
ms_exec.c \ ms_exec.c \
ms_ext.c \ ms_ext.c \
put_error_cd.c \ put_error_cd.c \
ms_exec_utils.c \ ms_exec_utils.c \
def_env.c \ def_env.c \
envnew.c \
check_path_slash_cd.c check_path_slash_cd.c
OBJ = $(SRC:.c=.o) OBJ = $(SRC:.c=.o)

2
includes/minishell.h
View File

@ -50,4 +50,6 @@ t_env *def_env(void);
void *return_null(char *msg); void *return_null(char *msg);
t_env *cd_updateenv(char *key, char *val, t_env **env);
#endif #endif

1
libft/includes/libft.h
View File

@ -374,6 +374,7 @@ int ft_putendl_fd2(char const *s, int fd);
void ft_envdelelem(t_env **elem); void ft_envdelelem(t_env **elem);
void ft_envdel(t_env **env); void ft_envdel(t_env **env);
t_env *ft_envnew(char *env); t_env *ft_envnew(char *env);
t_env *ft_envnewinit(char *key, char *val, t_env *env);
t_env *ft_envaddend(t_env **alst, t_env *new); t_env *ft_envaddend(t_env **alst, t_env *new);
t_env *ft_envgetelem(char *key, t_env *env); t_env *ft_envgetelem(char *key, t_env *env);
char *ft_envtochar(t_env *env); char *ft_envtochar(t_env *env);

15
libft/srcs/ft_envnew.c
View File

@ -27,3 +27,18 @@ t_env *ft_envnew(char *env)
ft_envdelelem(&ret); ft_envdelelem(&ret);
return (ret); return (ret);
} }
t_env *ft_envnewinit(char *key, char *val, t_env *env)
{
t_env *ret;
int i;
i = 0;
ret = NULL;
if ((ret = (t_env*)ft_memalloc(sizeof(t_env))) != NULL)
if ((ret->key = ft_strdup(key)) != NULL)
if ((ret->val = ft_strdup(val)) != NULL)
return (ret);
ft_envdelelem(&ret);
return (ret);
}

4
srcs/cmd_cd.c
View File

@ -25,8 +25,8 @@ int cmd_cd_update_env(char *path, t_env **env, char opt)
if (getcwd(p_path, 4096) == NULL || (oldpwd = ft_strdup(pwd->val)) == NULL if (getcwd(p_path, 4096) == NULL || (oldpwd = ft_strdup(pwd->val)) == NULL
|| ft_realpath(path, &c_path) == NULL) || ft_realpath(path, &c_path) == NULL)
return (put_error_cd2(path, "error")); return (put_error_cd2(path, "error"));
if (ft_envupdate("PWD", *env, ((opt == 'P') ? p_path : c_path)) == NULL if (cd_updateenv("PWD", ((opt == 'P') ? p_path : c_path), env) == NULL
|| ft_envupdate("OLDPWD", *env, oldpwd) == NULL) || cd_updateenv("OLDPWD", oldpwd, env) == NULL)
{ {
ft_strdel(&oldpwd); ft_strdel(&oldpwd);
ft_strdel(&c_path); ft_strdel(&c_path);

7
srcs/main.c
View File

@ -78,14 +78,15 @@ int cleanup(char **argv, t_env *env)
return (0); return (0);
} }
int main(void) int main(int ac , char **av, char **envp)
{ {
extern char **environ;
char **argv; char **argv;
t_env *env; t_env *env;
char *cmd; char *cmd;
if ((env = env2lst(environ)) == NULL) (void)ac;
(void)av;
if ((env = env2lst(envp)) == NULL)
return (2); return (2);
while (1) while (1)
{ {