aboutsummaryrefslogtreecommitdiff
path: root/ft_strlcat.c
diff options
context:
space:
mode:
authorCharles <sircharlesaze@gmail.com>2019-10-12 13:54:35 +0200
committerCharles <sircharlesaze@gmail.com>2019-10-12 13:54:35 +0200
commitbbdc932411501e239757985023942f93d1b21f46 (patch)
treeb391f9d4874bbed2f9b56ccc0890634b38408b83 /ft_strlcat.c
parent84409d8d3fa8bd9bae28b3523aa6d0c0b3a68406 (diff)
downloadlibft-bbdc932411501e239757985023942f93d1b21f46.tar.gz
libft-bbdc932411501e239757985023942f93d1b21f46.tar.bz2
libft-bbdc932411501e239757985023942f93d1b21f46.zip
Fixed ft_strlcat and ft_strnstr to pass Libftest tests
Diffstat (limited to 'ft_strlcat.c')
-rw-r--r--ft_strlcat.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/ft_strlcat.c b/ft_strlcat.c
index ad21642..241e158 100644
--- a/ft_strlcat.c
+++ b/ft_strlcat.c
@@ -6,7 +6,7 @@
/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2019/10/07 10:31:37 by cacharle #+# #+# */
-/* Updated: 2019/10/09 12:43:28 by cacharle ### ########.fr */
+/* Updated: 2019/10/12 13:09:02 by cacharle ### ########.fr */
/* */
/* ************************************************************************** */
@@ -16,6 +16,7 @@
size_t ft_strlcat(char *dst, const char *src, size_t size)
{
size_t i;
+ size_t j;
size_t dst_len;
size_t src_len;
@@ -23,12 +24,15 @@ size_t ft_strlcat(char *dst, const char *src, size_t size)
src_len = ft_strlen(src);
if (size == 0)
return (src_len);
- i = dst_len;
- while (i < size - 1)
+ i = 0;
+ j = dst_len;
+ while (src[i] && j < size - 1)
{
- dst[i] = src[i - dst_len];
+ dst[j] = src[i];
i++;
+ j++;
}
+ dst[j] = '\0';
if (dst[size - 1] != '\0')
return (src_len + size);
return (dst_len + src_len);