From 4cb2fd324491ae3ab09015b570ff35cc15b65aed Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Thu, 8 Jan 2026 12:58:15 +0000 Subject: [PATCH] input checker --- Makefile | 2 +- headers/parsing.h | 3 ++- main.c | 10 +++++++++- parsing/checker.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ test_one.c | 2 +- 5 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 parsing/checker.c diff --git a/Makefile b/Makefile index ce5dc8d..443234b 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ INSERTION = insertion.c FLAGS_FILES = algorithms_sort.c flag.c -PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c +PARSING = ft_atoi.c parsing.c ft_strncmp.c ft_split.c ft_strlen.c ft_substr.c checker.c STACK_UTILS = push.c rev_rotate.c rotate.c stack_add.c stack_remove.c stacks_len.c swap.c print_stacks.c diff --git a/headers/parsing.h b/headers/parsing.h index ad07753..76e26d3 100644 --- a/headers/parsing.h +++ b/headers/parsing.h @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2026/01/07 08:03:08 by mteriier #+# #+# */ -/* Updated: 2026/01/07 08:03:10 by mteriier ### ########lyon.fr */ +/* Updated: 2026/01/08 12:56:19 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ @@ -22,5 +22,6 @@ int ft_strncmp(const char *s1, const char *s2, int n); size_t ft_strlen(const char *s); char *ft_substr(char const *s, unsigned int start, size_t len); char **ft_split(char const *s, char c); +int checker(int argc, char **argv); #endif diff --git a/main.c b/main.c index da33874..cdd0ad0 100644 --- a/main.c +++ b/main.c @@ -6,14 +6,22 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/08 18:32:35 by mteriier #+# #+# */ -/* Updated: 2025/12/14 16:55:43 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 12:57:04 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */ #include "push_swap.h" +#include "parsing.h" +#include int main(int argc, char **argv) { + if (!checker(argc, argv)) + { + write(2, "Error !\n", 8); + return (1); + } + if (argc > 1) test1(argc, argv); return (0); diff --git a/parsing/checker.c b/parsing/checker.c new file mode 100644 index 0000000..516047c --- /dev/null +++ b/parsing/checker.c @@ -0,0 +1,50 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* checker.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: dgaillet +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2026/01/08 12:37:12 by dgaillet #+# #+# */ +/* Updated: 2026/01/08 12:54:19 by dgaillet ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#include "push_swap.h" + +static int check_digits(char *str) +{ + int i; + + i = 0; + while (str[i]) + { + if (!ft_isdigit(str[i]) && str[i] != ' ') + return (0); + i++; + } + return (1); +} + +int checker(int argc, char **argv) +{ + int i; + + i = 0; + while (++i < argc) + { + if (ft_strncmp("--simple", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--medium", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--complex", argv[1], ft_strlen(argv[1]))) + continue ; + if (ft_strncmp("--adaptative", argv[1], ft_strlen(argv[1]))) + continue ; + if (check_digits(argv[1])) + continue ; + else + return (0); + } + return (1); +} diff --git a/test_one.c b/test_one.c index 1a0ee0c..a878e3f 100644 --- a/test_one.c +++ b/test_one.c @@ -6,7 +6,7 @@ /* By: mteriier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/12/22 12:33:58 by mteriier #+# #+# */ -/* Updated: 2026/01/07 14:58:10 by dgaillet ### ########lyon.fr */ +/* Updated: 2026/01/08 12:57:57 by dgaillet ### ########lyon.fr */ /* */ /* ************************************************************************** */