From da64c1d6a5115b69b11ad88a532ceccfa52bc9cf Mon Sep 17 00:00:00 2001 From: Mathys Comin Date: Tue, 24 Mar 2026 03:44:39 +0100 Subject: [PATCH 1/2] fix tab error --- > | 10 ++++++++++ >> | 9 +++++++++ includes/parsing.h | 5 +++-- src/main.c | 7 +++++-- src/parse/check.c | 26 ++++++++++++++++++++++++-- 5 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 > create mode 100644 >> diff --git a/> b/> new file mode 100644 index 0000000..a5d8fb8 --- /dev/null +++ b/> @@ -0,0 +1,10 @@ +> +>> +build +includes +libs +Makefile +minishell +Readme.md +src +valgrind_supp diff --git a/>> b/>> new file mode 100644 index 0000000..9c47ad4 --- /dev/null +++ b/>> @@ -0,0 +1,9 @@ +>> +build +includes +libs +Makefile +minishell +Readme.md +src +valgrind_supp diff --git a/includes/parsing.h b/includes/parsing.h index 095eb0c..35095fa 100644 --- a/includes/parsing.h +++ b/includes/parsing.h @@ -3,10 +3,10 @@ /* ::: :::::::: */ /* parsing.h :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apuyane +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/30 07:27:45 by mcomin #+# #+# */ -/* Updated: 2026/03/21 22:44:09 by apuyane ### ########.fr */ +/* Updated: 2026/03/24 03:39:37 by mcomin ### ########.fr */ /* */ /* ************************************************************************** */ @@ -55,5 +55,6 @@ char **add_dir(char *directory, char **old_dir); int strmatch(char *pattern, char *name); char *get_matching(char *pattern, char **elements); char *get_rand_numbers(int n); +char *reload_input_tab(char *input); #endif \ No newline at end of file diff --git a/src/main.c b/src/main.c index 0678065..2fa0441 100755 --- a/src/main.c +++ b/src/main.c @@ -49,11 +49,14 @@ void process_input(t_data *data, char *line) redir = count_redir_input(line); if (!is_invalid(line, data)) { - if (redir) + if (redir || ft_strchr(line, '\t')) { tmp = ft_strdup(line); free_single(line); - line = reload_input_redir(tmp, redir); + if (ft_strchr(tmp, '\t')) + line = reload_input_tab(tmp); + else + line = reload_input_redir(tmp, redir); free(tmp); } if (!parsing(data, line)) diff --git a/src/parse/check.c b/src/parse/check.c index 34d1665..61e233c 100644 --- a/src/parse/check.c +++ b/src/parse/check.c @@ -3,15 +3,37 @@ /* ::: :::::::: */ /* check.c :+: :+: :+: */ /* +:+ +:+ +:+ */ -/* By: apuyane +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/03/10 02:59:44 by mcomin #+# #+# */ -/* Updated: 2026/03/21 05:59:29 by apuyane ### ########.fr */ +/* Updated: 2026/03/24 03:39:57 by mcomin ### ########.fr */ /* */ /* ************************************************************************** */ #include "parsing.h" +char *reload_input_tab(char *input) +{ + char *new_input; + int i; + int j; + + new_input = ft_calloc(ft_strlen(input) + 1, sizeof(char)); + if (!new_input) + return (NULL); + i = -1; + j = 0; + while (input[++i]) + { + if (input[i] == '\t') + new_input[j] = ' '; + else + new_input[j] = input[i]; + j++; + } + return (new_input); +} + int count_redir_input(char *input) { int i; From 97f9bca15a6682ddc7b6ada92016a04be7cc944e Mon Sep 17 00:00:00 2001 From: Mathys Comin Date: Tue, 24 Mar 2026 04:07:39 +0100 Subject: [PATCH 2/2] better invalid function --- >> | 9 --------- src/main.c | 7 ++++--- src/parse/error.c | 2 +- > => test | 3 +-- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100644 >> rename > => test (93%) diff --git a/>> b/>> deleted file mode 100644 index 9c47ad4..0000000 --- a/>> +++ /dev/null @@ -1,9 +0,0 @@ ->> -build -includes -libs -Makefile -minishell -Readme.md -src -valgrind_supp diff --git a/src/main.c b/src/main.c index 2fa0441..ff3c606 100755 --- a/src/main.c +++ b/src/main.c @@ -19,10 +19,11 @@ bool is_invalid(char *line, t_data *data) { - if (is_empty_or_spaces(line) || check_syntax(line)) + if (is_empty_or_spaces(line)) + return (true); + else if (check_syntax(line)) { - if (check_syntax(line)) - data->exit_code = 2; + data->exit_code = 2; return (true); } return (false); diff --git a/src/parse/error.c b/src/parse/error.c index 97847a0..72136b2 100644 --- a/src/parse/error.c +++ b/src/parse/error.c @@ -6,7 +6,7 @@ /* By: mcomin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/02/04 01:46:10 by mcomin #+# #+# */ -/* Updated: 2026/03/03 02:27:45 by mcomin ### ########.fr */ +/* Updated: 2026/03/24 04:06:46 by mcomin ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/> b/test similarity index 93% rename from > rename to test index a5d8fb8..806c4a7 100644 --- a/> +++ b/test @@ -1,5 +1,3 @@ -> ->> build includes libs @@ -7,4 +5,5 @@ Makefile minishell Readme.md src +test valgrind_supp