diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | src/b_sqb.c | 12 | ||||
| -rw-r--r-- | src/b_sqb_err.c | 89 | ||||
| -rw-r--r-- | src/b_sqb_err.h | 20 | ||||
| -rw-r--r-- | src/u_utils.h | 2 |
5 files changed, 116 insertions, 8 deletions
@@ -24,6 +24,7 @@ SRCS_NAME += b_export_next SRCS_NAME += b_export_mute SRCS_NAME += b_pwd SRCS_NAME += b_sqb +SRCS_NAME += b_sqb_err SRCS_NAME += b_sqb_file SRCS_NAME += b_sqb_nbr SRCS_NAME += b_sqb_str diff --git a/src/b_sqb.c b/src/b_sqb.c index fb52e00..a5a0fd5 100644 --- a/src/b_sqb.c +++ b/src/b_sqb.c @@ -14,6 +14,7 @@ #include <stdint.h> #include <unistd.h> +#include "b_sqb_err.h" #include "b_sqb_file.h" #include "b_sqb_nbr.h" #include "b_sqb_str.h" @@ -21,12 +22,6 @@ #include "s_struct.h" #include "u_utils.h" -static void - b_sqb_unexpected_operator(const char op[]) -{ - ft_dprintf(STDERR_FILENO, "[: %s: unexpected operator\n", op); -} - static uint8_t b_get_sqb_id(char *argv[], t_msh *msh) @@ -61,10 +56,11 @@ static uint8_t id = b_get_sqb_id(argv, msh); if (id == FT_ID_SQB_COUNT) { - b_sqb_unexpected_operator(argv[0]); + ft_dprintf(STDERR_FILENO, "[: %s: unexpected operator\n", argv[0]); return (2); } - /* TODO: check errors */ + if (b_sqb_err_check(id, argv) != 0) + return (2); ret = 0; if (id < FT_ID_SQB_NT && id != FT_ID_SQB_Z && id != FT_ID_SQB_N) ret = b_sqb_file_tests(id, argv); diff --git a/src/b_sqb_err.c b/src/b_sqb_err.c new file mode 100644 index 0000000..1755082 --- /dev/null +++ b/src/b_sqb_err.c @@ -0,0 +1,89 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* b_sqb_err.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ +/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#include <libft.h> +#include <stdint.h> +#include <unistd.h> + +#include "d_define.h" +#include "u_utils.h" + +static uint8_t + b_file_err(const uint64_t argc, + char *argv[]) +{ + if (argc > 3) + { + ft_dprintf(STDERR_FILENO, "[: %s: unexpected operator\n", argv[1]); + return (1); + } + return (0); +} + +static uint8_t + b_double_file_err(const uint64_t argc, + char *argv[]) +{ + if (argc > 4) + { + ft_dprintf(STDERR_FILENO, "[: %s: unexpected operator\n", argv[2]); + return (1); + } + else if (argc == 3) + { + ft_dprintf(STDERR_FILENO, "[: %s: argument expected\n", argv[1]); + return (1); + } + return (0); +} + +static uint8_t + b_str_err(const uint64_t argc, + char *argv[]) +{ + if (argc > 4) + { + ft_dprintf(STDERR_FILENO, "[: %s: unexpected operator\n", argv[2]); + return (1); + } + else if (argc == 3) + { + ft_dprintf(STDERR_FILENO, "[: %s: argument expected\n", argv[1]); + return (1); + } + return (0); +} + +uint8_t + b_sqb_err_check(uint8_t id, + char *argv[]) +{ + const uint64_t argc = u_builtins_get_argc((const char**)argv); + + if (id < FT_ID_SQB_NT && id != FT_ID_SQB_Z && id != FT_ID_SQB_N) + { + if (b_file_err(argc, argv) != 0) + return (1); + } + else if (id == FT_ID_SQB_NT || id == FT_ID_SQB_OT) + { + if (b_double_file_err(argc, argv) != 0) + return (1); + } + else if (id == FT_ID_SQB_N || id == FT_ID_SQB_Z || + id == FT_ID_SQB_EQUA || id == FT_ID_SQB_DIFF) + { + if (b_str_err(argc, argv) != 0) + return (1); + } + return (0); +} diff --git a/src/b_sqb_err.h b/src/b_sqb_err.h new file mode 100644 index 0000000..7c27646 --- /dev/null +++ b/src/b_sqb_err.h @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* b_sqb_err.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rbousset <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/02/14 17:19:27 by rbousset #+# #+# */ +/* Updated: 2020/02/14 17:19:29 by rbousset ### ########lyon.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef B_SQB_ERR_H +#define B_SQB_ERR_H + +#include <stdint.h> + +uint8_t b_sqb_err_check(uint8_t id, char *argv[]); + +#endif diff --git a/src/u_utils.h b/src/u_utils.h index 6362e14..9943f41 100644 --- a/src/u_utils.h +++ b/src/u_utils.h @@ -15,6 +15,8 @@ #include <stdint.h> +#include "s_struct.h" + void u_eof_stdin(void); uint64_t u_builtins_get_argc(const char *args[]); char **u_get_env_var_names(t_msh *msh); |