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

Corrected extension in setenv

Browse Source
This commit is contained in:
Tanguy MAZE 2020-02-07 15:57:21 +01:00
parent e550d2bb37
commit 7db099a010
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libft/includes/libft.h
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */
/* Updated: 2019/12/06 09:57:17 by tmaze ### ########.fr */ /* Updated: 2020/02/07 15:25:43 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

2
libft/srcs/ft_envupdate.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/12/05 19:10:38 by tmaze #+# #+# */ /* Created: 2019/12/05 19:10:38 by tmaze #+# #+# */
/* Updated: 2019/12/05 19:10:52 by tmaze ### ########.fr */ /* Updated: 2020/02/07 15:26:10 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

9
srcs/cmd_setenv.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/09/20 14:41:08 by tmaze #+# #+# */ /* Created: 2019/09/20 14:41:08 by tmaze #+# #+# */
/* Updated: 2019/11/10 21:38:30 by tmaze ### ########.fr */ /* Updated: 2020/02/07 15:56:06 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,14 +21,11 @@ int cmd_setenv(char **argv, t_env **env)
{ {
if (argv[1] && (tmp = ft_envgetelem(new->key, *env)) != NULL) if (argv[1] && (tmp = ft_envgetelem(new->key, *env)) != NULL)
{ {
ft_strdel(&(tmp->val)); ft_envupdate(new->key, *env, new->val);
tmp->val = new->val; ft_envdelelem(&new);
ft_strdel(&(new->key));
ft_memdel((void**)&new);
} }
else else
ft_envaddend(env, new); ft_envaddend(env, new);
ft_envclean(env);
return (0); return (0);
} }
else if (argv[1] && argv[1][0] != '=' && !ft_strchr(argv[1], '=')) else if (argv[1] && argv[1][0] != '=' && !ft_strchr(argv[1], '='))

4
srcs/ms_ext.c
View File

@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */ /* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */ /* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */
/* Updated: 2020/02/01 15:56:43 by tmaze ### ########.fr */ /* Updated: 2020/02/07 15:55:59 by tmaze ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -55,7 +55,7 @@ char *replace_env(char *src, t_env *elem, int key_size, int i)
{ {
ft_strncpy(ret, src, i); ft_strncpy(ret, src, i);
ft_strlcat(ret, elem->val, res_len + 1); ft_strlcat(ret, elem->val, res_len + 1);
ft_strlcat(ret, src + key_size, res_len + 1); ft_strlcat(ret, &src[i] + key_size, res_len + 1);
} }
else else
ft_printf("minishell: memory error\n"); ft_printf("minishell: memory error\n");