diff options
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | include/ft_ctype.h | 35 | ||||
| -rw-r--r-- | include/ft_get_next_line.h (renamed from include/get_next_line.h) | 10 | ||||
| -rw-r--r-- | include/ft_io.h (renamed from src/io/ft_printf.c) | 27 | ||||
| -rw-r--r-- | include/ft_lst.h | 36 | ||||
| -rw-r--r-- | include/ft_mem.h | 31 | ||||
| -rw-r--r-- | include/ft_printf.h | 27 | ||||
| -rw-r--r-- | include/ft_str.h | 66 | ||||
| -rw-r--r-- | include/ft_types.h | 26 | ||||
| -rw-r--r-- | include/libft.h | 150 | ||||
| -rw-r--r-- | src/io/ft_get_next_line.c (renamed from src/io/get_next_line/get_next_line.c) | 18 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_asprintf.c (renamed from src/io/ft_asprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_dprintf.c (renamed from src/io/ft_dprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_printf.c | 88 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_snprintf.c (renamed from src/io/ft_snprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_sprintf.c (renamed from src/io/ft_sprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_vasprintf.c (renamed from src/io/ft_vasprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_vdprintf.c (renamed from src/io/ft_vdprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_vprintf.c (renamed from src/io/ft_vprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_vsnprintf.c (renamed from src/io/ft_vsnprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/ft_vsprintf.c (renamed from src/io/ft_vsprintf.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert.c (renamed from src/io/ft_printf/convert.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_char.c (renamed from src/io/ft_printf/convert_char.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_hex.c (renamed from src/io/ft_printf/convert_hex.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_int.c (renamed from src/io/ft_printf/convert_int.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_none.c (renamed from src/io/ft_printf/convert_none.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_percent.c (renamed from src/io/ft_printf/convert_percent.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_ptr.c (renamed from src/io/ft_printf/convert_ptr.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_str.c (renamed from src/io/ft_printf/convert_str.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_uint.c (renamed from src/io/ft_printf/convert_uint.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/convert_written.c (renamed from src/io/ft_printf/convert_written.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/extract.c (renamed from src/io/ft_printf/extract.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/length_modifier.c (renamed from src/io/ft_printf/length_modifier.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/list.c (renamed from src/io/ft_printf/list.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/parse.c (renamed from src/io/ft_printf/parse.c) | 0 | ||||
| -rw-r--r-- | src/io/ft_printf/internals/utils.c (renamed from src/io/ft_printf/utils.c) | 0 | ||||
| -rw-r--r-- | src/lst/ft_lstreverse_ret.c | 3 | ||||
| -rw-r--r-- | src/mem/ft_memccpy.c | 12 | ||||
| -rw-r--r-- | src/mem/ft_memchr.c | 8 | ||||
| -rw-r--r-- | src/mem/ft_memcmp.c | 12 | ||||
| -rw-r--r-- | src/mem/ft_memcpy.c | 4 | ||||
| -rw-r--r-- | src/mem/ft_memmove.c | 4 | ||||
| -rw-r--r-- | src/mem/ft_memset.c | 4 | ||||
| -rw-r--r-- | src/str/ft_atoi_strict.c | 3 | ||||
| -rw-r--r-- | src/str/ft_strncpy.c | 4 | ||||
| -rw-r--r-- | src/str/ft_strtol.c | 4 | ||||
| m--------- | test/ctest | 0 | ||||
| -rw-r--r-- | test/str/ft_strlen_test.c | 17 | ||||
| -rw-r--r-- | test/test_libft.h | 1 |
49 files changed, 334 insertions, 280 deletions
@@ -6,7 +6,7 @@ # By: cacharle <marvin@42.fr> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2019/10/08 15:45:53 by cacharle #+# #+# # -# Updated: 2020/01/16 10:23:07 by cacharle ### ########.fr # +# Updated: 2020/01/17 10:51:24 by cacharle ### ########.fr # # # # **************************************************************************** # @@ -26,30 +26,36 @@ TEST_DIR = test # AVAILABLE_FEATURES = get_next_line ft_printf ft_lst CONF_FILE = libft.conf -# ifndef (FEATURES) -# endif +ifndef (FEATURES) +endif ifeq ($(wildcard $(CONF_FILE)),) $(warning "No configuration file found with name $(CONF_FILE), using default") FEATURES = get_next_line + CCFLAGS += -D FT_FEATURES_FT_GET_NEXT_LINE else FEATURES = $(shell sed -n 's/FEATURES=//p' $(CONF_FILE)) endif ifeq ($(findstring get_next_line,$(FEATURES)),) - FIND_ARGS += -not -path "*get_next_line*" + FIND_ARGS += -not -name "ft_get_next_line.c" +else + CCFLAGS += -D FT_FEATURES_FT_GET_NEXT_LINE endif ifeq ($(findstring ft_printf,$(FEATURES)),) FIND_ARGS += -not -path "*printf*" +else + CCFLAGS += -D FT_FEATURES_FT_PRINTF endif ifeq ($(findstring ft_lst,$(FEATURES)),) - FIND_ARGS += -not -name "ft_lst*" + FIND_ARGS += -not -name "ft_lst*.c" +else + CCFLAGS += -D FT_FEATURES_FT_LST endif -SRC = $(shell find $(SRC_DIR) $(FIND_ARGS) -name *.c) +SRC = $(shell find $(SRC_DIR) $(FIND_ARGS) -name "*.c") OBJ = $(SRC:$(SRC_DIR)/%.c=$(BUILD_DIR)/%.o) -HEADER_FILES = libft.h get_next_line.h -HEADER = $(addprefix $(INCLUDE_DIR)/,$(HEADER_FILES)) +HEADER = $(shell find $(INCLUDE_DIR) -name "*.h") all: make_build_dirs $(NAME) @@ -67,7 +73,7 @@ make_build_dirs: $(NAME): $(OBJ) $(HEADER) @echo "Linking: $@" - @$(LIB) $(NAME) $(OBJ) + @$(LIB) $@ $(OBJ) $(BUILD_DIR)/%.o: $(SRC_DIR)/%.c @echo "Compiling: $@" diff --git a/include/ft_ctype.h b/include/ft_ctype.h new file mode 100644 index 0000000..44e88b8 --- /dev/null +++ b/include/ft_ctype.h @@ -0,0 +1,35 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_ctype.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 09:59:10 by cacharle #+# #+# */ +/* Updated: 2020/01/17 10:00:13 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_CTYPE_H +# define FT_CTYPE_H + +/* +** assertion +*/ + +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); + +/* +** conversion +*/ + +int ft_toupper(int c); +int ft_tolower(int c); +int ft_todigit(int c); + +#endif diff --git a/include/get_next_line.h b/include/ft_get_next_line.h index 9d15202..03bf344 100644 --- a/include/get_next_line.h +++ b/include/ft_get_next_line.h @@ -6,20 +6,20 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/09 13:52:59 by cacharle #+# #+# */ -/* Updated: 2020/01/15 07:22:07 by cacharle ### ########.fr */ +/* Updated: 2020/01/17 10:53:43 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#ifndef GET_NEXT_LINE_H -# define GET_NEXT_LINE_H +#ifndef FT_GET_NEXT_LINE_H +# define FT_GET_NEXT_LINE_H # include <unistd.h> # include <stdlib.h> # include <limits.h> # include "libft.h" -# ifndef BUFFER_SIZE -# define BUFFER_SIZE 32 +# ifndef GNL_BUFFER_SIZE +# define GNL_BUFFER_SIZE 32 # endif # define GNL_STATUS_LINE 1 diff --git a/src/io/ft_printf.c b/include/ft_io.h index 1b92bb2..8c633fb 100644 --- a/src/io/ft_printf.c +++ b/include/ft_io.h @@ -1,24 +1,25 @@ /* ************************************************************************** */ /* */ /* ::: :::::::: */ -/* ft_printf.c :+: :+: :+: */ +/* ft_io.h :+: :+: :+: */ /* +:+ +:+ +:+ */ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ -/* Created: 2019/11/21 02:31:32 by cacharle #+# #+# */ -/* Updated: 2019/11/21 03:41:54 by cacharle ### ########.fr */ +/* Created: 2020/01/17 09:47:14 by cacharle #+# #+# */ +/* Updated: 2020/01/17 10:07:47 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#include "libft.h" +#ifndef FT_IO_H +# define FT_IO_H -int ft_printf(const char *format, ...) -{ - int ret; - va_list ap; +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); - va_start(ap, format); - ret = ft_vprintf(format, ap); - va_end(ap); - return (ret); -} +#endif diff --git a/include/ft_lst.h b/include/ft_lst.h new file mode 100644 index 0000000..134df71 --- /dev/null +++ b/include/ft_lst.h @@ -0,0 +1,36 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_lst.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 09:58:02 by cacharle #+# #+# */ +/* Updated: 2020/01/17 09:58:45 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_LST_H +# define FT_LST_H + +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 *)); +t_list *ft_lstreverse_ret(t_list *lst); +void ft_lstreverse(t_list **lst); + +#endif diff --git a/include/ft_mem.h b/include/ft_mem.h new file mode 100644 index 0000000..d1e47f6 --- /dev/null +++ b/include/ft_mem.h @@ -0,0 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_mem.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 09:56:20 by cacharle #+# #+# */ +/* Updated: 2020/01/17 09:57:54 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_MEM_H +# define FT_MEM_H + +void ft_bzero(void *s, size_t n); +void *ft_memset(void *s, int c, size_t n); +void *ft_memcpy(void *dest, const void *src, size_t n); +void *ft_memccpy(void *dest, const void *src, int c, size_t n); +void *ft_memmove(void *dst, const void *src, size_t len); +void *ft_memchr(const void *s, int c, size_t n); +int ft_memcmp(const void *s1, const void *s2, size_t n); +void *ft_calloc(size_t count, size_t size); + +/* +** bloat ? +*/ + +void ft_memdel(void **ap); + +#endif diff --git a/include/ft_printf.h b/include/ft_printf.h new file mode 100644 index 0000000..615039b --- /dev/null +++ b/include/ft_printf.h @@ -0,0 +1,27 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_printf.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 10:05:59 by cacharle #+# #+# */ +/* Updated: 2020/01/17 10:10:18 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_PRINTF_H +# define FT_PRINTF_H + +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/include/ft_str.h b/include/ft_str.h new file mode 100644 index 0000000..105da79 --- /dev/null +++ b/include/ft_str.h @@ -0,0 +1,66 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_str.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 09:50:14 by cacharle #+# #+# */ +/* Updated: 2020/01/17 10:22:38 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_STR_H +# define FT_STR_H + +/* +** std +*/ + +size_t ft_strlen(const char *s); +char *ft_strcpy(char *dest, const char *src); +char *ft_strncpy(char *dest, const char *src, size_t n); +char *ft_strdup(const char *s); +char *ft_strndup(const char *s1, size_t n); +char *ft_strcat(char *dest, const char *src); +char *ft_strncat(char *dest, const char *src, size_t n); +size_t ft_strlcat(char *dst, const char *src, size_t size); +size_t ft_strlcpy(char *dst, const char *src, size_t size); +char *ft_strchr(const char *s, int c); +char *ft_strrchr(const char *s, int c); +char *ft_strstr(const char *haystack, const char *needle); +char *ft_strnstr(const char *haystack, const char *needle, size_t len); +int ft_strcmp(const char *s1, const char *s2); +int ft_strncmp(const char *s1, const char *s2, size_t n); +int ft_atoi(const char *nptr); + +/* +** extra +*/ + +void ft_striter(char *s, void (*f)(char *)); +void ft_striteri(char *s, void (*f)(unsigned int, char *)); +char *ft_substr(char const *s, unsigned int start, size_t len); +char *ft_strjoin(char const *s1, char const *s2); +char *ft_strtrim(char const *s1, char const *set); +char **ft_split(char const *s, char c); +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); +char *ft_itoa(int n); +int ft_strict_atoi(const char *s); +long ft_strtol(const char *s, char **endptr, int base); + +/* +** bloat ? +*/ + +char *ft_strnew(size_t size); +void ft_strdel(char **as); +void ft_strclr(char *s); +char *ft_strmap(char const *s, char (*f)(char)); +char *ft_strmapi(char *s, char (*f)(unsigned int, char)); +int ft_strequ(char const *s1, char const *s2); +int ft_strnequ(char const *s1, char const *s2, size_t n); + +#endif diff --git a/include/ft_types.h b/include/ft_types.h new file mode 100644 index 0000000..948e33d --- /dev/null +++ b/include/ft_types.h @@ -0,0 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_types.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2020/01/17 09:59:15 by cacharle #+# #+# */ +/* Updated: 2020/01/17 10:16:14 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef FT_TYPES_H +# define FT_TYPES_H + +typedef unsigned char t_ftbyte; +typedef int t_ftbool; + +typedef char t_ftchar; +typedef unsigned char t_ftuchar; +typedef int t_ftint; +typedef unsigned int t_ftuint; +typedef long int t_ftlong; +typedef unsigned long int t_ftulong; + +#endif diff --git a/include/libft.h b/include/libft.h index d7dc175..0b4d608 100644 --- a/include/libft.h +++ b/include/libft.h @@ -6,7 +6,7 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ -/* Updated: 2020/01/16 10:25:57 by cacharle ### ########.fr */ +/* Updated: 2020/01/17 10:51:40 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,148 +18,32 @@ # include <stdlib.h> # include <stddef.h> # include <limits.h> - # include <errno.h> +# include "ft_types.h" +# include "ft_ctype.h" +# include "ft_io.h" +# include "ft_mem.h" +# include "ft_str.h" + +# ifdef FT_FEATURES_FT_LST +# include "ft_lst.h" +# endif + +# ifdef FT_FEATURES_FT_GET_NEXT_LINE +# include "ft_get_next_line.h" +# endif -# include "get_next_line.h" +# ifdef FT_FEATURES_FT_PRINTF +# include "ft_printf.h" +# endif # ifdef __linux__ # include <stdio.h> # define OPEN_MAX FOPEN_MAX # endif -# define MIN(x, y) ((x) < (y) ? (x) : (y)) -# define MAX(x, y) ((x) > (y) ? (x) : (y)) - -typedef unsigned char t_byte; -typedef int t_bool; - # define TRUE 1 # define FALSE 0 -/* -** 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 *)); -t_list *ft_lstreverse_ret(t_list *lst); -void ft_lstreverse(t_list **lst); - -/* -** mem -*/ - -void *ft_memset(void *s, int c, size_t n); -void ft_bzero(void *s, size_t n); -void *ft_memcpy(void *dest, const void *src, size_t n); -void *ft_memccpy(void *dest, const void *src, int c, size_t n); -void *ft_memmove(void *dst, const void *src, size_t len); -void *ft_memchr(const void *s, int c, size_t n); -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); - -/* -** str -*/ - -size_t ft_strlen(const char *s); -char *ft_strdup(const char *s); -char *ft_strcpy(char *dest, const char *src); -char *ft_strncpy(char *dest, const char *src, size_t n); -char *ft_strcat(char *dest, const char *src); -char *ft_strncat(char *dest, const char *src, size_t n); -size_t ft_strlcat(char *dst, const char *src, size_t size); -size_t ft_strlcpy(char *dst, const char *src, size_t size); -char *ft_strchr(const char *s, int c); -char *ft_strrchr(const char *s, int c); -char *ft_strstr(const char *haystack, const char *needle); -char *ft_strnstr(const char *haystack, - const char *needle, size_t len); -int ft_strcmp(const char *s1, const char *s2); -int ft_strncmp(const char *s1, const char *s2, size_t n); -void ft_striter(char *s, void (*f)(char *)); -void ft_striteri(char *s, void (*f)(unsigned int, char *)); -int ft_atoi(const char *nptr); - -char *ft_strnew(size_t size); -void ft_strdel(char **as); -void ft_strclr(char *s); -char *ft_strmap(char const *s, char (*f)(char)); -char *ft_strmapi(char *s, char (*f)(unsigned int, char)); -int ft_strequ(char const *s1, char const *s2); -int ft_strnequ(char const *s1, char const *s2, size_t n); -char *ft_substr(char const *s, unsigned int start, size_t len); -char *ft_strjoin(char const *s1, char const *s2); -char *ft_strtrim(char const *s1, char const *set); -char **ft_split(char const *s, char c); - -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); -char *ft_itoa(int n); -int ft_strict_atoi(const char *s); -long ft_strtol(const char *s, char **endptr, int base); - #endif diff --git a/src/io/get_next_line/get_next_line.c b/src/io/ft_get_next_line.c index e51f152..4aecf3c 100644 --- a/src/io/get_next_line/get_next_line.c +++ b/src/io/ft_get_next_line.c @@ -6,13 +6,11 @@ /* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/10/19 09:08:36 by cacharle #+# #+# */ -/* Updated: 2020/01/15 07:26:50 by cacharle ### ########.fr */ +/* Updated: 2020/01/17 10:53:23 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ -#include "get_next_line.h" - -#define HAS_NEWLINE(str, split_at) ((split_at = gnl_find_newline(str)) != -1) +#include "libft.h" static int gnl_find_newline(char *str) { @@ -46,12 +44,12 @@ static int gnl_read_line(int fd, char **line, char *rest) int split_at; char *buf; - if ((buf = malloc(sizeof(char) * (BUFFER_SIZE + 1))) == NULL) + if ((buf = malloc(sizeof(char) * (GNL_BUFFER_SIZE + 1))) == NULL) return (gnl_free_return(line, NULL, GNL_STATUS_ERROR)); - while ((ret = read(fd, buf, BUFFER_SIZE)) > 0) + while ((ret = read(fd, buf, GNL_BUFFER_SIZE)) > 0) { buf[ret] = '\0'; - if (HAS_NEWLINE(buf, split_at)) + if ((split_at = gnl_find_newline(buf)) != -1) { ft_strcpy(rest, buf + split_at + 1); buf[split_at] = '\0'; @@ -88,15 +86,15 @@ static int gnl_read_line(int fd, char **line, char *rest) int get_next_line(int fd, char **line) { int split_at; - static char rest[OPEN_MAX][BUFFER_SIZE + 1] = {{0}}; + static char rest[OPEN_MAX][GNL_BUFFER_SIZE + 1] = {{0}}; - if (fd < 0 || fd > OPEN_MAX || line == NULL || BUFFER_SIZE <= 0) + if (fd < 0 || fd > OPEN_MAX || line == NULL || GNL_BUFFER_SIZE <= 0) return (GNL_STATUS_ERROR); if ((*line = ft_strdup("")) == NULL) return (GNL_STATUS_ERROR); if (rest[fd][0] == '\0') return (gnl_read_line(fd, line, rest[fd])); - if (HAS_NEWLINE(rest[fd], split_at)) + if ((split_at = gnl_find_newline(rest[fd])) != -1) { free(*line); if ((*line = (cha |