jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

expansion des variables locales au shell.

Browse source
This commit is contained in:
wescande 2017-03-07 12:11:13 +01:00
parent 1c41155c50
commit 6c2dbb0a57
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
42sh/src/glob/expand_var.c
View file

@ -6,7 +6,7 @@
/* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */ /* By: wescande <wescande@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/06 16:09:27 by wescande #+# #+# */ /* Created: 2017/02/06 16:09:27 by wescande #+# #+# */
/* Updated: 2017/03/03 20:38:36 by wescande ### ########.fr */ /* Updated: 2017/03/07 12:07:53 by wescande ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -73,7 +73,8 @@ void expand_var(t_glob *gl)
{ {
if (var && *var) if (var && *var)
{ {
content = ft_getenv(data_singleton()->env, var); if (!(content = ft_getenv(data_singleton()->env, var)))
content = ft_getenv(data_singleton()->local_var, var);
insert_var(gl, pat, var, content); insert_var(gl, pat, var, content);
pat = gl->pat; pat = gl->pat;
} }