From 8735f25286aa988c6bf23720f265b0bb293c602e Mon Sep 17 00:00:00 2001
From: Camille Chauvet <cchauvet@2C7.42angouleme.fr>
Date: Tue, 27 Sep 2022 17:25:41 +0200
Subject: [PATCH] d

---
 Makefile     |  14 ++++++--------
 a.out        | Bin 15152 -> 0 bytes
 ft_atoi.c    |   9 +++++----
 ft_memccpy.c |  26 ++++++++++++++++++++++++++
 ft_strlcat.c |  34 ++++++++++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 12 deletions(-)
 delete mode 100755 a.out
 create mode 100644 ft_memccpy.c
 create mode 100644 ft_strlcat.c

diff --git a/Makefile b/Makefile
index 2f03087..7a9f0b0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2022/09/27 08:39:27 by cchauvet          #+#    #+#              #
-#    Updated: 2022/09/27 16:08:49 by cchauvet         ###   ########.fr        #
+#    Updated: 2022/09/27 17:11:15 by cchauvet         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -28,13 +28,11 @@ SRCS = ft_isalpha.c \
 	   ft_memchr.c \
 	   ft_memcmp.c \
 	   ft_strdup.c \
-	   ft_calloc.c
-
-COMMENT = ft_strlcpy.c \
 	   ft_strlcat.c \
-	   ft_strnstr.c \
 	   ft_atoi.c \
-	   ft_strdup.c
+	   ft_memccpy.c \
+	   ft_calloc.c \
+	   ft_strlcpy.c
 
 OBJS = ${SRCS:.c=.o}
 
@@ -60,5 +58,5 @@ re:
 	ar rc ${NAME}.a ${OBJS}
 
 so:
-	$(CC) -nostartfiles -fPIC $(CFLAGS) $(SRC)
-	gcc -nostartfiles -shared -o libft.so $(OBJ)
+	gcc -nostartfiles -fPIC $(CFLAG) $(SRCS)
+	gcc -nostartfiles -shared -o libft.so $(OBJS)
diff --git a/a.out b/a.out
deleted file mode 100755
index 4b38cfff6fb4b86132e67f17dbbf052efa27470b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15152
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
G6aNGL7GxU$

diff --git a/ft_atoi.c b/ft_atoi.c
index bb70a98..f8d5710 100644
--- a/ft_atoi.c
+++ b/ft_atoi.c
@@ -6,7 +6,7 @@
 /*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/09/27 16:14:34 by cchauvet          #+#    #+#             */
-/*   Updated: 2022/09/27 16:22:36 by cchauvet         ###   ########.fr       */
+/*   Updated: 2022/09/27 16:45:19 by cchauvet         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,8 +18,9 @@ int	ft_atoi(const char *nptr)
 	int		out;
 	int		sign;
 
+	str = (char *) nptr;
 	out = 0;
-	while (*str == " ")
+	while (*str == ' ')
 		str++;
 	sign = 1;
 	if (*str == '-')
@@ -30,7 +31,7 @@ int	ft_atoi(const char *nptr)
 	while (ft_isdigit(*str))
 	{
 		out = 10 * out + *str - 48;
-		*str++;
+		str++;
 	}
-	return (out * sign)
+	return (out * sign);
 }
diff --git a/ft_memccpy.c b/ft_memccpy.c
new file mode 100644
index 0000000..71e068b
--- /dev/null
+++ b/ft_memccpy.c
@@ -0,0 +1,26 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_memccpy.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/09/27 16:53:36 by cchauvet          #+#    #+#             */
+/*   Updated: 2022/09/27 17:21:51 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	*memccpy(void *dest, const void *src, int c, size_t n)
+{
+	int		*tab;
+	size_t	max;
+
+	tab = (int *) src;
+	while (max < ft_strlen((char *) tab) && tab[max] == c)
+		max++;
+	if (max < n)
+		max = n;
+	return (ft_memcpy(dest, src, max));
+}
diff --git a/ft_strlcat.c b/ft_strlcat.c
new file mode 100644
index 0000000..81b030b
--- /dev/null
+++ b/ft_strlcat.c
@@ -0,0 +1,34 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strlcat.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cchauvet <cchauvet@student.42angoulem      +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/09/27 17:02:13 by cchauvet          #+#    #+#             */
+/*   Updated: 2022/09/27 17:23:07 by cchauvet         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*strlcat(char *dst, const char *src, size_t size)
+{
+	size_t	max;
+	char	*str;
+	int		i;
+
+	str = (char *) src;
+	max = size;
+	if (ft_strlen(str) > max)
+		max = ft_strlen(str);
+	if (ft_strlen(dst) > max)
+		max = ft_strlen(dst);
+	i = 0;
+	while (i < max)
+	{
+		dst[i] = str[i];
+		i++;
+	}
+	return (dst);
+}