This commit is contained in:
Camille Chauvet 2022-10-28 18:29:59 +02:00
parent 816da7bb1c
commit 83d25dbefd
4 changed files with 30 additions and 68 deletions

View File

@ -6,80 +6,41 @@
# By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ # # By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/09/27 08:39:27 by cchauvet #+# #+# # # Created: 2022/09/27 08:39:27 by cchauvet #+# #+# #
# Updated: 2022/10/23 19:34:26 by cchauvet ### ########.fr # # Updated: 2022/10/28 17:26:03 by cchauvet ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
SRCS = ft_isalpha.c \ CC := gcc
ft_isdigit.c \ SRCS := ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c \
ft_isalnum.c \ ft_strlen.c ft_memset.c ft_bzero.c ft_memcpy.c ft_memmove.c ft_strlcpy.c \
ft_isascii.c \ ft_strlcat.c ft_toupper.c ft_tolower.c ft_strchr.c ft_strrchr.c ft_strncmp.c \
ft_isprint.c \ ft_memchr.c ft_memcmp.c ft_strnstr.c ft_atoi.c ft_calloc.c ft_strdup.c \
ft_strlen.c \ ft_substr.c ft_strjoin.c ft_strtrim.c ft_split.c ft_itoa.c ft_strmapi.c \
ft_memset.c \ ft_striteri.c ft_putchar_fd.c ft_putstr_fd.c ft_putendl_fd.c ft_putnbr_fd.c
ft_bzero.c \ BSRCS := ft_lstnew.c ft_lstadd_front.c ft_lstsize.c ft_lstlast.c \
ft_memcpy.c \ ft_lstadd_back.c ft_lstdelone.c ft_lstclear.c ft_lstiter.c ft_lstmap.c
ft_memmove.c \ OBJS := $(SRCS:.c=.o)
ft_strlcpy.c \ BOBJS := $(BSRCS:.c=.o)
ft_strlcat.c \ NAME := libft.a
ft_toupper.c \ CFLAGS := -Wall -Werror -Wextra
ft_tolower.c \
ft_strchr.c \
ft_strrchr.c \
ft_strncmp.c \
ft_memchr.c \
ft_memcmp.c \
ft_strnstr.c \
ft_atoi.c \
ft_calloc.c \
ft_strdup.c \
ft_substr.c \
ft_strjoin.c \
ft_strtrim.c \
ft_split.c \
ft_itoa.c \
ft_strmapi.c \
ft_striteri.c \
ft_putchar_fd.c \
ft_putstr_fd.c \
ft_putendl_fd.c \
ft_putnbr_fd.c
BSRCS = ft_lstnew.c \
ft_lstadd_front.c \
ft_lstsize.c \
ft_lstlast.c \
ft_lstadd_back.c \
ft_lstdelone.c \
ft_lstclear.c \
ft_lstiter.c \
ft_lstmap.c
OBJS = ${SRCS:.c=.o}
BOBJS = ${BSRCS:.c=.o}
NAME = libft.a
CFLAG = -Wall -Werror -Wextra
%.o: %.c libft.h %.o: %.c libft.h
${CC} ${CFLAG} -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
all: ${NAME} all: $(NAME)
${NAME}: ${OBJS} $(NAME): $(OBJS)
ar -rc ${NAME}.a ${OBJS} ar -rc $(NAME) $(OBJS)
bonus: ${OBJS} ${BOBJS} bonus: $(OBJS) $(BOBJS)
ar -rc ${NAME} ${OBJS} ${BOBJS} ar -rc $(NAME) $(OBJS) $(BOBJS)
clean: clean:
rm -f ${OBJS} ${BOBJS} rm -f $(OBJS) $(BOBJS)
fclean: clean fclean: clean
rm -f ${NAME} rm -f $(NAME)
re: fclean all re: fclean all
.PHONY: bonus extra clean fclean re .PHONY: all bonus clean fclean re

View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/09/27 16:09:01 by cchauvet #+# #+# */ /* Created: 2022/09/27 16:09:01 by cchauvet #+# #+# */
/* Updated: 2022/10/04 14:56:44 by cchauvet ### ########.fr */ /* Updated: 2022/10/28 17:31:12 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/09/26 11:15:04 by cchauvet #+# #+# */ /* Created: 2022/09/26 11:15:04 by cchauvet #+# #+# */
/* Updated: 2022/09/27 11:32:40 by cchauvet ### ########.fr */ /* Updated: 2022/10/28 17:31:44 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,9 +14,9 @@
int ft_isalnum(int c) int ft_isalnum(int c)
{ {
if ((('9' >= c && c >= '0') if (('9' >= c && c >= '0')
|| ('z' >= c && c >= 'a') || ('z' >= c && c >= 'a')
|| ('Z' >= c && c >= 'A'))) || ('Z' >= c && c >= 'A'))
return (1); return (1);
return (0); return (0);
} }

View File

@ -6,7 +6,7 @@
/* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */ /* By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/10/05 19:04:34 by cchauvet #+# #+# */ /* Created: 2022/10/05 19:04:34 by cchauvet #+# #+# */
/* Updated: 2022/10/05 20:47:09 by cchauvet ### ########.fr */ /* Updated: 2022/10/28 18:28:41 by cchauvet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -66,6 +66,7 @@ static char **ft_segsplitter(char **tab, size_t len, const char *s, char c)
start = let_index; start = let_index;
while (s[let_index] != c && s[let_index] != 0) while (s[let_index] != c && s[let_index] != 0)
let_index++; let_index++;
tab[tab_index] = ft_substr(s, start, let_index - start); tab[tab_index] = ft_substr(s, start, let_index - start);
if (tab[tab_index] == NULL) if (tab[tab_index] == NULL)
return (ft_cancel(tab, tab_index)); return (ft_cancel(tab, tab_index));