diff options
| author | nass1pro <nass1pro@gmail.com> | 2020-09-14 16:23:43 +0200 |
|---|---|---|
| committer | nass1pro <nass1pro@gmail.com> | 2020-09-14 16:23:43 +0200 |
| commit | c0855888dc8d442791a67aa27be6dfcd8bfbf17d (patch) | |
| tree | d4989c4783759d402953cf0ebac0b139a5907f80 /src/lexer | |
| parent | 7f08c8ba80240ece1f34caa4fb15e240301fff5e (diff) | |
| parent | 6b2157c5e64cbf1a4ed4cd0b4de40bbeab535de7 (diff) | |
| download | minishell-c0855888dc8d442791a67aa27be6dfcd8bfbf17d.tar.gz minishell-c0855888dc8d442791a67aa27be6dfcd8bfbf17d.tar.bz2 minishell-c0855888dc8d442791a67aa27be6dfcd8bfbf17d.zip | |
Merge branch 'master' of https://github.com/ouaisbrefbams/minishell
Diffstat (limited to 'src/lexer')
| -rw-r--r-- | src/lexer/trim.c | 9 | ||||
| -rw-r--r-- | src/lexer/utils.c | 6 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/lexer/trim.c b/src/lexer/trim.c index 991cecc..24eb99f 100644 --- a/src/lexer/trim.c +++ b/src/lexer/trim.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/16 08:18:36 by nahaddac #+# #+# */ -/* Updated: 2020/09/14 15:40:21 by nahaddac ### ########.fr */ +/* Updated: 2020/09/14 16:23:35 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -43,12 +43,7 @@ int del_quote(char *str) { while (str[i++] != '\0') { - if (str[i] == '\\' && str[i + 1] == '\'') - { - i++; - break; - } - else if (str[i] == '\\') + if (str[i] == '\\') i += 2; if (str[i] == '\'') { diff --git a/src/lexer/utils.c b/src/lexer/utils.c index d440de4..b4846d6 100644 --- a/src/lexer/utils.c +++ b/src/lexer/utils.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/16 08:18:15 by nahaddac #+# #+# */ -/* Updated: 2020/09/14 11:38:18 by nahaddac ### ########.fr */ +/* Updated: 2020/09/14 15:16:35 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -97,8 +97,8 @@ int quote_len(char *input, int i) i++; while (input[i] != quote_type && input[i] != '\0') { - if(input[i] == '\\') - i+=2; + if (quote_type == '"' && input[i] == '\\') + i++; i++; } while (ft_isblank(input[i + 1])) |