From 6c2dbb0a57890abd8d35de68e416ae60af68fb39 Mon Sep 17 00:00:00 2001 From: wescande Date: Tue, 7 Mar 2017 12:11:13 +0100 Subject: [PATCH] expansion des variables locales au shell. --- 42sh/src/glob/expand_var.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/42sh/src/glob/expand_var.c b/42sh/src/glob/expand_var.c index 31453a98..ed163a76 100644 --- a/42sh/src/glob/expand_var.c +++ b/42sh/src/glob/expand_var.c @@ -6,7 +6,7 @@ /* 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) { - 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); pat = gl->pat; }