willem/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WAY better quote handling

Browse Source
This commit is contained in:
Quinten Mennen 2025-02-27 18:48:41 +01:00
parent f33d88642d
commit 15b7de994e
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/lexer/lexer_read_word.c
View File

@ -1,17 +1,33 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* :::::::: */ /* ::: :::::::: */
/* lexer_read_word.c :+: :+: */ /* lexer_read_word.c :+: :+: :+: */
/* +:+ */ /* +:+ +:+ +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */ /* Created: 2025/02/05 19:03:47 by qmennen #+# #+# */
/* Updated: 2025/02/26 16:13:59 by whaffman ######## odam.nl */ /* Updated: 2025/02/27 18:47:33 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "minishell.h" #include "minishell.h"
static int match_quotes(t_minishell *msh, t_lexer *lexer)
{
int i;
int qts;
i = lexer->pos;
qts = 0;
while (lexer->input[i])
{
if (lexer->input[i] == '\'' || lexer->input[i] == '"')
qts++;
i++;
}
return ((qts % 2) == 0);
}
static char *parse_quotes(t_minishell *msh, t_lexer *lexer) static char *parse_quotes(t_minishell *msh, t_lexer *lexer)
{ {
int start; int start;
@ -28,13 +44,7 @@ static char *parse_quotes(t_minishell *msh, t_lexer *lexer)
len = lexer->pos - start; len = lexer->pos - start;
word = malloc_safe(msh, sizeof(char) * len + 1); word = malloc_safe(msh, sizeof(char) * len + 1);
ft_strlcpy(word, lexer->input + start, len + 1); ft_strlcpy(word, lexer->input + start, len + 1);
if (lexer->current_char == qc)
lexer_readchar(lexer); lexer_readchar(lexer);
else
{
free_safe(msh, (void **)&word);
return (NULL);
}
return (word); return (word);
} }
@ -43,18 +53,19 @@ char *lexer_readword(t_minishell *msh, t_lexer *lexer)
int start; int start;
int len; int len;
char *word; char *word;
char c;
start = lexer->pos; start = lexer->pos;
if (!match_quotes(msh, lexer))
return (NULL);
if (lexer->current_char == '"' || lexer->current_char == '\'') if (lexer->current_char == '"' || lexer->current_char == '\'')
{
return (parse_quotes(msh, lexer)); return (parse_quotes(msh, lexer));
} c = lexer->current_char;
while (ft_isprint(lexer->current_char) && lexer->current_char != '<' while (ft_isprint(c) && c != '<' &&c != '>' && c != '|' && c != '\0'
&& lexer->current_char != '>' && lexer->current_char != '|' && !ft_isspace(lexer->current_char))
&& lexer->current_char != '\0' && !ft_isspace(lexer->current_char)
&& lexer->current_char != '"' && lexer->current_char != '\'')
{ {
lexer_readchar(lexer); lexer_readchar(lexer);
c = lexer->current_char;
} }
len = lexer->pos - start; len = lexer->pos - start;
word = malloc_safe(msh, sizeof(char) * len + 1); word = malloc_safe(msh, sizeof(char) * len + 1);