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

added inline environment

Browse Source
This commit is contained in:
Tanguy MAZE
2020-01-30 15:45:47 +01:00
parent cd72d29c63
commit 9a44444070
5 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/ms_ext.c
View File

@@ -6,7 +6,7 @@
/* By: tmaze <tmaze@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/25 18:21:47 by tmaze #+# #+# */
/* Updated: 2020/01/25 16:53:59 by tmaze ### ########.fr */
/* Updated: 2020/01/30 15:42:17 by tmaze ### ########.fr */
/* */
/* ************************************************************************** */
@@ -57,9 +57,10 @@ char *replace_env(char *src, t_env *elem, int key_size, int i)
int res_len;
res_len = ft_strlen(src) - key_size + ft_strlen(elem->val);
ft_printf("size replace: %d\n", res_len);
if ((ret = ft_strnew(res_len)) != NULL)
{
ft_strlcpy(ret, src, i + 1);
ft_strncpy(ret, src, i);
ft_strlcat(ret, elem->val, res_len + 1);
ft_strlcat(ret, src + key_size, res_len + 1);
}
@@ -106,10 +107,7 @@ char **res_ext(char **av, t_env *env)
ft_strreplace(&av[i[0]], ret, &i[1], tmp);
else if (av[i[0]][i[1]] == '~' && (tmp = ft_envgetelem("HOME", env))
== NULL)
{
ft_printf("Entry %s not found\n", "HOME");
return (NULL);
}
return (return_null("Entry HOME not found\n"));
else if (av[i[0]][i[1]] == '$'
&& resolve_complete_key(&av[i[0]], &i[1], env) == NULL)
return (NULL);