diff options
| author | nass1pro <nass1pro@gmail.com> | 2020-09-14 11:47:11 +0200 |
|---|---|---|
| committer | nass1pro <nass1pro@gmail.com> | 2020-09-14 11:47:11 +0200 |
| commit | 5c5096d5c6d67686c1ad896cbb7a1b5386abf597 (patch) | |
| tree | 8e8873d3c8a2860f83d62a45dcfdfd3cfc4bea17 /src | |
| parent | c51d31b8b751585153500729c25ae2f02d179e45 (diff) | |
| download | minishell-5c5096d5c6d67686c1ad896cbb7a1b5386abf597.tar.gz minishell-5c5096d5c6d67686c1ad896cbb7a1b5386abf597.tar.bz2 minishell-5c5096d5c6d67686c1ad896cbb7a1b5386abf597.zip | |
update quote trim
Diffstat (limited to 'src')
| -rw-r--r-- | src/lexer/lexer.c | 2 | ||||
| -rw-r--r-- | src/lexer/trim.c | 11 | ||||
| -rw-r--r-- | src/lexer/utils.c | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/lexer/lexer.c b/src/lexer/lexer.c index d8e8a6e..79401f2 100644 --- a/src/lexer/lexer.c +++ b/src/lexer/lexer.c @@ -6,7 +6,7 @@ /* By: nahaddac <nahaddac@student.42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/07/16 08:18:25 by nahaddac #+# #+# */ -/* Updated: 2020/09/13 18:12:03 by charles ### ########.fr */ +/* Updated: 2020/09/14 11:30:24 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/lexer/trim.c b/src/lexer/trim.c index d6eea5e..351ad36 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/13 20:42:05 by charles ### ########.fr */ +/* Updated: 2020/09/14 11:30:18 by nahaddac ### ########.fr */ /* */ /* ************************************************************************** */ @@ -33,14 +33,19 @@ void del_space(char *str) void del_quote(char *str) { - int i; + size_t i; i = 0; if (str[0] == '\'') { while (str[i++] != '\0') { - if (str[i] == '\\') + if (str[i] == '\\' && str[i + 1] == '\'') + { + i++; + break; + } + else if (str[i] == '\\') i += 2; if (str[i] == '\'') break ; diff --git a/src/lexer/utils.c b/src/lexer/utils.c index 7df4955..d440de4 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/13 17:23:29 by charles ### ########.fr */ +/* Updated: 2020/09/14 11:38:18 by nahaddac ### ########.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++; + if(input[i] == '\\') + i+=2; i++; } while (ft_isblank(input[i + 1])) |