From 136cd5efb45f325c818b4c7f99bc372e0ffa0fe0 Mon Sep 17 00:00:00 2001 From: Tanguy MAZE Date: Wed, 27 Feb 2019 13:14:53 +0100 Subject: [PATCH] quik add-on =) added secured ft_atoi function still need to test for negative integers --- Makefile | 6 +++--- ft_atois.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ libft.h | 6 +++++- 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 ft_atois.c diff --git a/Makefile b/Makefile index dfa9850..27274c7 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2019/02/25 16:36:34 by tmaze ### ########.fr # +# Updated: 2019/02/27 12:46:59 by tmaze ### ########.fr # # # #******************************************************************************# CC = gcc -CCFLAGS = -Wall -Werror -Wextra +CCFLAGS = -Wall -Werror -Wextra -g CCSTD = NAME = libft.a @@ -19,7 +19,7 @@ NAME = libft.a SRCS = ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strlcat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \ ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c ft_strtrim.c ft_strsplit.c ft_itoa.c ft_putchar.c ft_putstr.c ft_putendl.c ft_putnbr.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c\ ft_lstnew.c ft_lstdelone.c ft_lstdel.c ft_lstadd.c ft_lstiter.c ft_lstmap.c \ -ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_realpath.c ft_iswhitespace.c ft_issign.c ft_hasdigit.c ft_strsplitwhitespace.c +ft_isupper.c ft_islower.c ft_str_is_alpha.c ft_str_is_lowercase.c ft_str_is_numeric.c ft_str_is_printable.c ft_str_is_uppercase.c ft_strcapitalize.c ft_strlcpy.c ft_strlowcase.c ft_strupcase.c ft_lstsize.c ft_lstgetat.c ft_lstgetlast.c ft_sort_params.c ft_print_words_tables.c ft_lstaddend.c ft_strndup.c ft_abs.c ft_strnchr.c ft_strrnchr.c get_next_line.c ft_del_words_tables.c ft_putstrn.c ft_nbrlen.c ft_putstrpad.c ft_putnbrpad.c ft_lstsort.c ft_lstaddsort.c ft_round.c ft_realpath.c ft_iswhitespace.c ft_issign.c ft_hasdigit.c ft_strsplitwhitespace.c ft_atois.c OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_atois.c b/ft_atois.c new file mode 100644 index 0000000..7cae05b --- /dev/null +++ b/ft_atois.c @@ -0,0 +1,46 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_atois.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/02/27 11:58:44 by tmaze #+# #+# */ +/* Updated: 2019/02/27 13:14:18 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_atois(const char *str, int *nb) +{ + int num; + int mult; + int max; + + num = 0; + while (ft_iswhitespace(str[num])) + num++; + max = (str[num] == '-') ? FT_INT_MIN : FT_INT_MAX; + if (str[num] == '+' || str[num] == '-') + num++; + while (str[num] != '\0' && ft_isdigit(str[num])) + num++; + num--; + *nb = 0; + mult = 1; + while (num >= 0 && ft_isdigit(str[num]) && + (max - *nb >= 2000000000)) + { + ft_putnbr(*nb); + ft_putchar('\n'); + ft_putnbr(max - *nb); + ft_putchar('\n'); + *nb += (str[num--] - '0') * mult; + mult *= 10; + } + if (num >= 0 && str[num] == '-') + *nb *= -1; + return (!ft_isdigit(str[num]) || (max - *nb >= 2000000000 + * (max < 0) ? -1 : 1)); +} diff --git a/libft.h b/libft.h index 7adac2d..2f4a973 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2019/02/25 16:37:03 by tmaze ### ########.fr */ +/* Updated: 2019/02/27 12:23:14 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -38,6 +38,9 @@ # define FT_COLOR_BG_CYAN "\x1b[46m" # define FT_COLOR_BG_WHITE "\x1b[47m" +# define FT_INT_MAX 2147483647 +# define FT_INT_MIN -2147483648 + /* ** définition type t_list */ @@ -179,5 +182,6 @@ int ft_issign(char c); int ft_iswhitespace(char c); int ft_hasdigit(char *s); char **ft_strsplitwhitespace(char *s); +int ft_atois(const char *str, int *nb); #endif