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

12
srcs/ms_ext.c
View File

@@ -67,11 +67,11 @@ char *resolve_complete_key(char *src, int *index, t_env *env)
{
t_env *tmp;
char *ret;
if ((tmp = search_key(env, src, *index + 1)) != NULL)
{
if ((ret = replace_env(src, tmp, ft_strlen(tmp->key)
+ 1, *index)) != NULL)
+ 1, *index)) != NULL)
{
ft_strdel(&src);
src = ret;
@@ -79,10 +79,10 @@ char *resolve_complete_key(char *src, int *index, t_env *env)
return (src);
}
else
return return_null("minishell: memory error");
return (return_null("minishell: memory error"));
}
else
return return_null("minishell: variable not found");
return (return_null("minishell: variable not found"));
}
char **res_ext(char **av, t_env *env)
@@ -97,8 +97,8 @@ char **res_ext(char **av, t_env *env)
i[2] = 0;
while (av[i[0]] && av[i[0]][i[2]])
{
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
if (av[i[0]][i[2]] == '~' && (tmp = ft_envgetelem("HOME", env))
!= NULL && (ret = replace_env(av[i[0]], tmp, 1, i[2])) != NULL)
{
ft_strdel(&av[i[0]]);
av[i[0]] = ret;