aboutsummaryrefslogtreecommitdiff
path: root/src/preprocess/preprocess.c
diff options
context:
space:
mode:
authorCharles Cabergs <me@cacharle.xyz>2020-10-10 10:34:20 +0200
committerCharles Cabergs <me@cacharle.xyz>2020-10-10 10:34:20 +0200
commit5b681182824ae45b5a27d1503de32fa2760c5800 (patch)
treefcbe26572ed46649c9931750c284a0573414bef1 /src/preprocess/preprocess.c
parent0e3db10c626f54a6c6aa94aa59648782e8602c02 (diff)
downloadminishell-5b681182824ae45b5a27d1503de32fa2760c5800.tar.gz
minishell-5b681182824ae45b5a27d1503de32fa2760c5800.tar.bz2
minishell-5b681182824ae45b5a27d1503de32fa2760c5800.zip
Norming interpolation
Diffstat (limited to 'src/preprocess/preprocess.c')
-rw-r--r--src/preprocess/preprocess.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/preprocess/preprocess.c b/src/preprocess/preprocess.c
index 03ae203..3852b8b 100644
--- a/src/preprocess/preprocess.c
+++ b/src/preprocess/preprocess.c
@@ -6,7 +6,7 @@
/* By: charles <charles@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/04/03 08:58:49 by charles #+# #+# */
-/* Updated: 2020/10/09 15:31:33 by cacharle ### ########.fr */
+/* Updated: 2020/10/10 10:32:53 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -79,15 +79,15 @@ char **preprocess(t_tok_lst **tokens, t_env env)
curr = *tokens;
while (curr != NULL)
{
- if (curr->tag & (TAG_STR | TAG_STR_DOUBLE))
+ if (curr->tag & (TAG_STR | TAG_STR_DOUBLE) && (i = -1))
{
- i = -1;
while ((str = curr->content) != NULL && str[++i] != '\0')
{
if (escape(str + i, curr->tag))
continue;
if (str[i] == '$')
- i = interpolate(str, i, &curr, prev_tag, env) - 1;
+ i = interpolate((void*[2]){str, &curr},
+ i, prev_tag, env) - 1;
}
}
prev_tag = curr->tag;