diff --git a/Makefile b/Makefile index 8abbb60..be2b012 100644 --- a/Makefile +++ b/Makefile @@ -6,20 +6,20 @@ # By: tmaze +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2018/04/07 12:47:06 by tmaze #+# #+# # -# Updated: 2018/04/19 12:24:45 by tmaze ### ########.fr # +# Updated: 2018/04/23 15:45:51 by tmaze ### ########.fr # # # #******************************************************************************# CC = gcc CCFLAGS = -Wall -Werror -Wextra -CCSTD = -std=c99 +CCSTD = 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_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 OBJS = $(SRCS:.c=.o) INCLS = -I. diff --git a/ft_memcpy.c b/ft_memcpy.c index 8a1f94d..97d9faa 100644 --- a/ft_memcpy.c +++ b/ft_memcpy.c @@ -12,7 +12,7 @@ #include "libft.h" -void *ft_memcpy(void *restrict dest, const void *restrict src, size_t n) +void *ft_memcpy(void *dest, const void *src, size_t n) { size_t i; diff --git a/ft_strcat.c b/ft_strcat.c index 557710c..a4f85c9 100644 --- a/ft_strcat.c +++ b/ft_strcat.c @@ -12,7 +12,7 @@ #include "libft.h" -char *ft_strcat(char *restrict dest, const char *src) +char *ft_strcat(char *dest, const char *src) { int dest_len; diff --git a/ft_strlcat.c b/ft_strlcat.c index 14fbdb7..3505d7e 100644 --- a/ft_strlcat.c +++ b/ft_strlcat.c @@ -12,7 +12,7 @@ #include "libft.h" -size_t ft_strlcat(char *restrict dest, const char *src, size_t size) +size_t ft_strlcat(char *dest, const char *src, size_t size) { int dest_len; diff --git a/ft_strlcpy.c b/ft_strlcpy.c index c38c6ae..d6c43fb 100644 --- a/ft_strlcpy.c +++ b/ft_strlcpy.c @@ -12,7 +12,7 @@ #include "libft.h" -size_t ft_strlcpy(char *restrict dst, const char *restrict src, size_t size) +size_t ft_strlcpy(char *dst, const char *src, size_t size) { size_t src_len; diff --git a/ft_strncat.c b/ft_strncat.c index ab1b9ff..fd23bc4 100644 --- a/ft_strncat.c +++ b/ft_strncat.c @@ -12,7 +12,7 @@ #include "libft.h" -char *ft_strncat(char *restrict dest, const char *restrict src, size_t n) +char *ft_strncat(char *dest, const char *src, size_t n) { int dest_len; size_t i; diff --git a/ft_strndup.c b/ft_strndup.c new file mode 100644 index 0000000..f79591f --- /dev/null +++ b/ft_strndup.c @@ -0,0 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strndup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tmaze +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2018/04/23 15:44:36 by tmaze #+# #+# */ +/* Updated: 2018/04/23 15:45:12 by tmaze ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "libft.h" + +char *ft_strndup(const char *s1, size_t n) +{ + char *ret; + + if ((ret = ft_strnew(n)) != NULL) + ft_strncpy(ret, s1, n); + return (ret); +} diff --git a/libft.h b/libft.h index 984f38a..7f3c742 100644 --- a/libft.h +++ b/libft.h @@ -6,7 +6,7 @@ /* By: tmaze +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2018/04/08 00:12:36 by tmaze #+# #+# */ -/* Updated: 2018/04/19 14:25:55 by tmaze ### ########.fr */ +/* Updated: 2018/04/23 15:45:34 by tmaze ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,9 +34,9 @@ typedef struct s_list void *ft_memset(void *b, int c, size_t len); void ft_bzero(void *s, size_t n); -void *ft_memcpy(void *restrict dest, const void *restrict src,\ +void *ft_memcpy(void *dest, const void *src,\ size_t n); -void *ft_memccpy(void *restrict dest, const void *restrict src,\ +void *ft_memccpy(void *dest, const void *src,\ int c, size_t n); void *ft_memmove(void *dest, const void *src, size_t len); void *ft_memchr(const void *s, int c, size_t n); @@ -45,8 +45,8 @@ 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 *restrict dest, const char *src); -char *ft_strncat(char *restrict dest, const char *restrict src,\ +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); char *ft_strchr(const char *s, int c); @@ -119,7 +119,7 @@ int ft_str_is_uppercase(char *str); char *ft_strlowcase(char *s); char *ft_strupcase(char *s); char *ft_strcapitalize(char *str); -size_t ft_strlcpy(char *restrict dst, const char *restrict src,\ +size_t ft_strlcpy(char *dst, const char *src,\ size_t size); size_t ft_lstsize(t_list *lst); t_list *ft_lstgetat(t_list *lst, size_t ind); @@ -127,5 +127,6 @@ t_list *ft_lstgetlast(t_list *lst); void ft_sort_params(int ac, char **av); void ft_print_words_tables(char **tab); t_list *ft_lstaddend(t_list **alst, t_list *new); +char *ft_strndup(const char *s1, size_t n); #endif