From 496afe8e8a82d6db730bf835eb5fbe1ef3a142be Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 15 Jan 2020 11:40:48 +0100 Subject: Added ft_strtol, ft_isspace, ft_todigit, ft_strict_atoi, modified ft_atoi to use ft_strtol --- include/libft.h | 144 +++++++++++++++++++--------------------- src/ctype/ft_isspace.c | 19 ++++++ src/ctype/ft_todigit.c | 20 ++++++ src/io/ft_printf/ft_vasprintf.h | 6 +- src/str/ft_atoi.c | 29 +------- src/str/ft_strict_atoi.c | 38 +++++++++++ src/str/ft_strtol.c | 78 ++++++++++++++++++++++ 7 files changed, 230 insertions(+), 104 deletions(-) create mode 100644 src/ctype/ft_isspace.c create mode 100644 src/ctype/ft_todigit.c create mode 100644 src/str/ft_strict_atoi.c create mode 100644 src/str/ft_strtol.c diff --git a/include/libft.h b/include/libft.h index 3777f8a..e81f262 100644 --- a/include/libft.h +++ b/include/libft.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2020/01/15 10:03:22 by cacharle ### ########.fr */ +/* Updated: 2020/01/15 11:33:27 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,7 @@ # include # include # include +# include # include "get_next_line.h" # define TRUE 1 @@ -33,7 +34,70 @@ typedef int t_bool; # define FALSE 0 /* -** memory +** ctype +*/ + +int ft_isalpha(int c); +int ft_isdigit(int c); +int ft_isalnum(int c); +int ft_isascii(int c); +int ft_isprint(int c); +int ft_isspace(int c); +int ft_toupper(int c); +int ft_tolower(int c); +int ft_todigit(int c); + +/* +** io +*/ + +void ft_putendl(char *s); +void ft_putchar(char c); +void ft_putstr(char const *s); +void ft_putnbr(int n); +void ft_putchar_fd(char c, int fd); +void ft_putstr_fd(char *s, int fd); +void ft_putendl_fd(char *s, int fd); +void ft_putnbr_fd(int n, int fd); +char *ft_strndup(const char *s1, size_t n); +int ft_printf(const char *format, ...); +int ft_sprintf(char *str, const char *format, ...); +int ft_snprintf(char *str, size_t size, + const char *format, ...); +int ft_asprintf(char **ret, const char *format, ...); +int ft_dprintf(int fd, const char *format, ...); + +int ft_vprintf(const char *format, va_list ap); +int ft_vsprintf(char *str, const char *format, va_list ap); +int ft_vsnprintf(char *str, size_t size, const char *format, + va_list ap); +int ft_vasprintf(char **ret, const char *format, va_list ap); +int ft_vdprintf(int fd, const char *format, va_list ap); + +/* +** lst +*/ + +typedef struct s_list +{ + void *content; + struct s_list *next; +} t_list; + +t_list *ft_lstnew(void const *content); +void ft_lstadd_front(t_list **alst, t_list *new); +int ft_lstsize(t_list *lst); +t_list *ft_lstlast(t_list *lst); +void ft_lstadd_back(t_list **alst, t_list *new); +void ft_lstdelone(t_list *lst, void (*del)(void *)); +void ft_lstclear(t_list **lst, void (*del)(void *)); +void ft_lstiter(t_list *lst, void (*f)(void *)); +t_list *ft_lstmap(t_list *lst, void *(*f)(void *), + void (*del)(void *)); +void ft_lstpop_front(t_list **lst, void (*del)(void *)); + +/* +** mem */ void *ft_memset(void *s, int c, size_t n); @@ -46,9 +110,10 @@ int ft_memcmp(const void *s1, const void *s2, size_t n); void *ft_memalloc(size_t size); void ft_memdel(void **ap); +void *ft_calloc(size_t count, size_t size); /* -** string +** str */ size_t ft_strlen(const char *s); @@ -86,78 +151,9 @@ char *ft_strjoin_free(char const *s1, char const *s2, int free_nb); char *ft_strjoin_free_snd(char const *s1, char const *s2); int ft_strcount(char *str, char c); - -/* -** character -*/ - -int ft_isalpha(int c); -int ft_isdigit(int c); -int ft_isalnum(int c); -int ft_isascii(int c); -int ft_isprint(int c); -int ft_toupper(int c); -int ft_tolower(int c); - -/* -** allocation -*/ - -void *ft_calloc(size_t count, size_t size); char *ft_itoa(int n); +int ft_strict_atoi(const char *s); +long ft_strtol(const char *s, char **endptr, int base); -/* -** fildes -*/ - -void ft_putendl(char *s); -void ft_putchar(char c); -void ft_putstr(char const *s); -void ft_putnbr(int n); -void ft_putchar_fd(char c, int fd); -void ft_putstr_fd(char *s, int fd); -void ft_putendl_fd(char *s, int fd); -void ft_putnbr_fd(int n, int fd); -char *ft_strndup(const char *s1, size_t n); - -/* -** list -*/ - -typedef struct s_list -{ - void *content; - struct s_list *next; -} t_list; - -t_list *ft_lstnew(void const *content); -void ft_lstadd_front(t_list **alst, t_list *new); -int ft_lstsize(t_list *lst); -t_list *ft_lstlast(t_list *lst); -void ft_lstadd_back(t_list **alst, t_list *new); -void ft_lstdelone(t_list *lst, void (*del)(void *)); -void ft_lstclear(t_list **lst, void (*del)(void *)); -void ft_lstiter(t_list *lst, void (*f)(void *)); -t_list *ft_lstmap(t_list *lst, void *(*f)(void *), - void (*del)(void *)); -void ft_lstpop_front(t_list **lst, void (*del)(void *)); - -/* -** ft_*printf -*/ - -int ft_printf(const char *format, ...); -int ft_sprintf(char *str, const char *format, ...); -int ft_snprintf(char *str, size_t size, - const char *format, ...); -int ft_asprintf(char **ret, const char *format, ...); -int ft_dprintf(int fd, const char *format, ...); - -int ft_vprintf(const char *format, va_list ap); -int ft_vsprintf(char *str, const char *format, va_list ap); -int ft_vsnprintf(char *str, size_t size, const char *format, - va_list ap); -int ft_vasprintf(char **ret, const char *format, va_list ap); -int ft_vdprintf(int fd, const char *format, va_list ap); #endif diff --git a/src/ctype/ft_isspace.c b/src/ctype/ft_isspace.c new file mode 100644 index 0000000..18b6dba --- /dev/null +++ b/src/ctype/ft_isspace.c @@ -0,0 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isspace.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/15 11:33:36 by cacharle #+# #+# */ +/* Updated: 2020/01/15 11:35:07 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_isspace(int c) +{ + return (c == ' ' || c == '\t' || c == '\n' + || c == '\v' || c == '\f' || c == '\r'); +} diff --git a/src/ctype/ft_todigit.c b/src/ctype/ft_todigit.c new file mode 100644 index 0000000..bfa7f99 --- /dev/null +++ b/src/ctype/ft_todigit.c @@ -0,0 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_todigit.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/15 10:37:57 by cacharle #+# #+# */ +/* Updated: 2020/01/15 10:38:46 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_todigit(int c) +{ + if (!ft_isdigit(c)) + return (-1); + return (c & 0x0F); +} diff --git a/src/io/ft_printf/ft_vasprintf.h b/src/io/ft_printf/ft_vasprintf.h index 4110557..2d364c8 100644 --- a/src/io/ft_printf/ft_vasprintf.h +++ b/src/io/ft_printf/ft_vasprintf.h @@ -6,12 +6,12 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/29 00:06:46 by cacharle #+# #+# */ -/* Updated: 2019/11/13 09:29:23 by cacharle ### ########.fr */ +/* Updated: 2020/01/15 11:39:15 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#ifndef HEADER_H -# define HEADER_H +#ifndef FT_VASPRINTF_H +# define FT_VASPRINTF_H # include # include diff --git a/src/str/ft_atoi.c b/src/str/ft_atoi.c index 0ad6022..fa31407 100644 --- a/src/str/ft_atoi.c +++ b/src/str/ft_atoi.c @@ -6,38 +6,13 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:46:16 by cacharle #+# #+# */ -/* Updated: 2020/01/15 09:26:14 by cacharle ### ########.fr */ +/* Updated: 2020/01/15 10:56:06 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include "libft.h" -#define MIN_INT -2147483648 -#define MAX_INT 2147483647 - int ft_atoi(const char *str) { - unsigned int nb; - int i; - int is_negative; - - while (*str == ' ' || *str == '\t' || *str == '\n' - || *str == '\v' || *str == '\f' || *str == '\r') - str++; - is_negative = 0; - if (*str == '-' || *str == '+') - if (*str++ == '-') - is_negative = 1; - i = 0; - nb = 0; - while (ft_isdigit(str[i])) - { - if (!is_negative && nb > (unsigned int)MAX_INT) - return (-1); - else if (nb > (unsigned int)MIN_INT) - return (0); - nb *= 10; - nb += str[i++] & 0x0F; - } - return ((int)(is_negative ? -nb : nb)); + return ((int)ft_strtol(str, (char**)NULL, 10)); } diff --git a/src/str/ft_strict_atoi.c b/src/str/ft_strict_atoi.c new file mode 100644 index 0000000..c25ebdd --- /dev/null +++ b/src/str/ft_strict_atoi.c @@ -0,0 +1,38 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strict_atoi.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/15 10:06:29 by cacharle #+# #+# */ +/* Updated: 2020/01/15 11:32:17 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_strict_atoi(const char *s) +{ + char *end; + long ret; + + if (*s != '-' && !ft_isdigit(*s)) + { + errno = EINVAL; + return (0); + } + errno = 0; + ret = ft_strtol(s, &end, 10); + if (errno == ERANGE || ret > INT_MAX || ret < INT_MIN) + { + errno = ERANGE; + return (0); + } + if (*end != '\0') + { + errno = EINVAL; + return (0); + } + return (ret); +} diff --git a/src/str/ft_strtol.c b/src/str/ft_strtol.c new file mode 100644 index 0000000..447f1af --- /dev/null +++ b/src/str/ft_strtol.c @@ -0,0 +1,78 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtol.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/15 10:26:45 by cacharle #+# #+# */ +/* Updated: 2020/01/15 11:39:34 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +#define STRTOL_STD_BASE "0123456789abcdefghijklmnopqrstuvwxyz" + +static int strtol_handle_base(int base, const char **str) +{ + if (base != 16 && base != 0) + return (base); + if (base == 16 && **str == '0' && (*str)[1] == 'x') + { + *str += 2; + return (base); + } + if (**str == '0') + { + (*str)++; + if (**str == 'x') + { + (*str)++; + return (16); + } + else + return (8); + } + return (10); +} + +static long errno_return(int err) +{ + errno = err; + return (0); +} + +/* +** If there is no digits doesn't put str in endptr like the original, +** instead it puts the address of the char after spaces and sign. +** Too much lines and annoyance, I can't be bothered. +*/ + +long ft_strtol(const char *str, char **endptr, int base) +{ + t_bool is_negative; + long long nb; + char base_str[37]; + + if (base > 36) + return (errno_return(EINVAL)); + while (ft_isspace(*str)) + str++; + is_negative = *str == '-' ? TRUE : FALSE; + if (*str == '-' || *str == '+') + str++; + base = strtol_handle_base(base, &str); + ft_strncpy(base_str, STRTOL_STD_BASE, base); + nb = 0; + while (ft_strchr(base_str, *str) != NULL) + { + nb *= base; + nb += ft_strchr(base_str, ft_tolower(*str)) - base_str; + if (((long)nb ^ (long)(nb / base)) < 0) + return (errno_return(ERANGE)); + } + if (endptr != NULL) + *endptr = (char*)str; + return (is_negative ? -nb : nb); +} -- cgit