wordsplit: handle double quotes

This commit is contained in:
Khaïs COLIN 2025-02-17 13:51:08 +01:00
parent 5276aba278
commit 1676cf6696
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
2 changed files with 27 additions and 7 deletions

View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/13 17:02:32 by khais #+# #+# */
/* Updated: 2025/02/14 18:45:45 by khais ### ########.fr */
/* Updated: 2025/02/17 13:54:58 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -76,7 +76,15 @@ t_wordlist *minishell_wordsplit(char *original)
// be delimited.
if (original[idx] == '\0')
wordlist = delimit(wordlist, &token, &currently_in_word);
else if (original[idx] == '\'')
// If the current character is single-quote, or double-quote and it is
// not quoted, it shall affect quoting for subsequent characters up to
// the end of the quoted text. The rules for quoting are as described in
// Quoting . The result token shall contain exactly the characters that
// appear in the input, unmodified, including any embedded or enclosing
// quotes or substitution operators, between the <quotation-mark> and
// the end of the quoted text. The token shall not be delimited by the
// end of the quoted field.
else if (original[idx] == '\'' || original[idx] == '"')
currently_in_quotes = quote_flip(&token, original[idx], currently_in_quotes);
// If the current character is an unquoted <blank>, any token containing
// the previous character is delimited and the current character shall

View file

@ -6,7 +6,7 @@
/* By: khais <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/02/13 15:17:56 by khais #+# #+# */
/* Updated: 2025/02/14 17:37:46 by khais ### ########.fr */
/* Updated: 2025/02/17 13:52:55 by khais ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,7 +19,7 @@
/*
** https://bash-hackers.gabe565.com/syntax/words/
*/
void test_wordsplit_singleword(void)
static void test_wordsplit_singleword(void)
{
t_wordlist *words;
@ -29,7 +29,7 @@ void test_wordsplit_singleword(void)
wordlist_destroy(words);
}
void test_wordsplit_singleword_with_blanks(void)
static void test_wordsplit_singleword_with_blanks(void)
{
t_wordlist *words;
@ -39,7 +39,7 @@ void test_wordsplit_singleword_with_blanks(void)
wordlist_destroy(words);
}
void test_wordsplit_multiword(void)
static void test_wordsplit_multiword(void)
{
t_wordlist *words;
@ -54,7 +54,7 @@ void test_wordsplit_multiword(void)
wordlist_destroy(words);
}
void test_wordsplit_multiword_with_single_quotes(void)
static void test_wordsplit_multiword_with_single_quotes(void)
{
t_wordlist *words;
@ -65,10 +65,22 @@ void test_wordsplit_multiword_with_single_quotes(void)
wordlist_destroy(words);
}
static void test_wordsplit_multiword_with_double_quotes(void)
{
t_wordlist *words;
words = minishell_wordsplit("\t echo\t\" \t The file is named $MYFILE \" \t");
assert_strequal("echo", wordlist_get(words, 0)->word);
assert_strequal("\" \t The file is named $MYFILE \"", wordlist_get(words, 1)->word);
assert(NULL == wordlist_get(words, 2));
wordlist_destroy(words);
}
int main(void) {
test_wordsplit_singleword();
test_wordsplit_singleword_with_blanks();
test_wordsplit_multiword();
test_wordsplit_multiword_with_single_quotes();
test_wordsplit_multiword_with_double_quotes();
return (0);
}