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

moved env functions to libft

Browse Source
This commit is contained in:
Tanguy Maze
2019-12-25 11:45:05 +01:00
parent 2362474fd6
commit 8a421600f4
18 changed files with 320 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
srcs/cmd_env.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/09/20 14:33:48 by tmaze #+# #+# */
/* Updated: 2019/11/08 21:55:51 by tmaze ### ########.fr */
/* Updated: 2019/12/09 09:59:58 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -39,6 +39,14 @@ t_env *envcpy(t_env *env)
return (cpy);
}
int env_cleanup(t_env *env_cp, int code)
{
ft_envdel(&env_cp);
if (code == 2)
ft_putstr_fd("minishell: env: Env copy error\n", 2);
return (code);
}
int cmd_env(char **argv, t_env **env)
{
int i;
@@ -54,11 +62,7 @@ int cmd_env(char **argv, t_env **env)
while (it)
{
if ((new = envcpy(it)) == NULL)
{
ft_envdel(&env_cp);
ft_putstr_fd("minishell: env: Env copy error\n", 2);
return (2);
}
return (env_cleanup(env_cp, 2));
ft_envaddend(&env_cp, new);
it = it->next;
}
@@ -69,6 +73,5 @@ int cmd_env(char **argv, t_env **env)
exec_cmd(argv + i, &env_cp);
else
put_env(env_cp);
ft_envdel(&env_cp);
return (0);
return (env_cleanup(env_cp, 0));
}