diff --git a/Makefile b/Makefile index c4f5c8a..cddeef8 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2019/03/19 15:18:00 by tmaze ### ########.fr # +# Updated: 2019/03/20 16:46:56 by tmaze ### ########.fr # # # #******************************************************************************# @@ -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_atois.c ft_getline.c ft_printf.c ft_printf_check_fields.c ft_printf_check_type.c ft_printf_tools.c ft_printf_tools_char.c ft_printf_tools_float.c ft_printf_tools_float.c ft_printf_tools_hexa.c ft_printf_tools_int.c ft_printf_tools_lenght.c ft_printf_tools_malloc_size.c ft_printf_tools_oct.c ft_printf_tools_prec_size.c ft_printf_tools_str.c ft_printf_tools_unsigned_int.c ft_printf_tools_wchar_t.c ft_printf_tools_wstr.c ft_putendl2.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 ft_getline.c ft_printf.c ft_printf_check_fields.c ft_printf_check_type.c ft_printf_tools.c ft_printf_tools_char.c ft_printf_tools_float.c ft_printf_tools_float.c ft_printf_tools_hexa.c ft_printf_tools_int.c ft_printf_tools_lenght.c ft_printf_tools_malloc_size.c ft_printf_tools_oct.c ft_printf_tools_prec_size.c ft_printf_tools_str.c ft_printf_tools_unsigned_int.c ft_printf_tools_wchar_t.c ft_printf_tools_wstr.c ft_putendl2.c ft_putendl_fd2.c OBJDIR = objs OBJS = $(SRCS:.c=.o) diff --git a/ft_putendl2.c b/ft_putendl2.c index 0093d64..af66e22 100644 --- a/ft_putendl2.c +++ b/ft_putendl2.c @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/03/19 15:14:49 by tmaze #+# #+# */ -/* Updated: 2019/03/19 15:18:45 by tmaze ### ########.fr */ +/* Updated: 2019/03/20 17:00:52 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ int ft_putendl2(char const *s) { char *str; - if (s != NULL && (str = ft_strnew(ft_strlen(s))) != NULL) + if (s != NULL && (str = ft_strnew(ft_strlen(s) + 1)) != NULL) { ft_strcpy(str, s); ft_strcat(str, "\n"); diff --git a/ft_putendl_fd2.c b/ft_putendl_fd2.c new file mode 100644 index 0000000..b9f4635 --- /dev/null +++ b/ft_putendl_fd2.c @@ -0,0 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putendl_fd2.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/03/20 16:44:51 by tmaze #+# #+# */ +/* Updated: 2019/03/20 17:00:16 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +int ft_putendl_fd2(char const *s, int fd) +{ + char *str; + + if (s != NULL && (str = ft_strnew(ft_strlen(s) + 1)) != NULL) + { + ft_strcpy(str, s); + ft_strcat(str, "\n"); + ft_putstr_fd(str, fd); + ft_strdel(&str); + return (0); + } + return (1); +} diff --git a/libft.h b/libft.h index 9bd6d39..8efb2a0 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2019/03/19 15:18:55 by tmaze ### ########.fr */ +/* Updated: 2019/03/20 16:46:41 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -362,5 +362,6 @@ char **ft_strsplitwhitespace(char *s); int ft_atois(const char *str, int *nb); int ft_getline(char **line); int ft_putendl2(char const *s); +int ft_putendl_fd2(char const *s, int fd); #endif