This commit is contained in:
kinou 2020-12-12 18:56:10 +01:00
parent efa90f7f19
commit d05dd0fafa
7 changed files with 41 additions and 25 deletions

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:11:04 by apommier #+# #+# */ /* Created: 2020/11/29 00:11:04 by apommier #+# #+# */
/* Updated: 2020/12/12 12:44:27 by apommier ### ########.fr */ /* Updated: 2020/12/12 14:07:04 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,6 +18,7 @@ void *ft_memccpy(void *dest, const void *src, int c, size_t n)
const char *p1; const char *p1;
size_t i; size_t i;
i = 0;
p = (char*)dest; p = (char*)dest;
p1 = (const char*)src; p1 = (const char*)src;
while (i < n) while (i < n)

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:11:51 by apommier #+# #+# */ /* Created: 2020/11/29 00:11:51 by apommier #+# #+# */
/* Updated: 2020/12/11 16:11:54 by apommier ### ########.fr */ /* Updated: 2020/12/12 14:14:51 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,8 +19,8 @@ int ft_memcmp(const void *s1, const void *s2, size_t n)
i = 0; i = 0;
while (n) while (n)
{ {
if (((char*)s1)[i] != ((char*)s2)[i]) if (((unsigned char*)s1)[i] != ((unsigned char*)s2)[i])
return (((char*)s1)[i] - ((char*)s2)[i]); return (((unsigned char*)s1)[i] - ((unsigned char*)s2)[i]);
n--; n--;
i++; i++;
} }

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:12:57 by apommier #+# #+# */ /* Created: 2020/11/29 00:12:57 by apommier #+# #+# */
/* Updated: 2020/11/29 17:10:54 by apommier ### ########.fr */ /* Updated: 2020/12/12 15:40:58 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,17 +14,21 @@
size_t ft_strlcat(char *dst, const char *src, size_t size) size_t ft_strlcat(char *dst, const char *src, size_t size)
{ {
int i; size_t i;
int j; size_t k;
j = 0; if (!size)
i = ft_strlen(dst); return (ft_strlen(src));
while (size - 1 - i) i = 0;
k = ft_strlen(dst);
if (k >= size)
return (ft_strlen(src) + size);
while (size - k - 1 && src[i])
{ {
dst[i] = src[j]; dst[k + i] = src[i];
i++; i++;
j++; size--;
} }
dst[i] = 0; dst[k + i] = 0;
return (ft_strlen(dst) + ft_strlen(src)); return (k + ft_strlen(src));
} }

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:07 by apommier #+# #+# */ /* Created: 2020/11/29 00:13:07 by apommier #+# #+# */
/* Updated: 2020/12/11 16:16:21 by apommier ### ########.fr */ /* Updated: 2020/12/12 16:07:05 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -19,8 +19,12 @@ size_t ft_strlcpy(char *dst, const char *src, size_t size)
j = 0; j = 0;
i = 0; i = 0;
if (!src || !dst)
return (0);
while (src[i]) while (src[i])
i++; i++;
if (!size)
return (i);
while (size - 1 && src[j] != 0) while (size - 1 && src[j] != 0)
{ {
dst[j] = src[j]; dst[j] = src[j];

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:31 by apommier #+# #+# */ /* Created: 2020/11/29 00:13:31 by apommier #+# #+# */
/* Updated: 2020/12/11 18:32:24 by apommier ### ########.fr */ /* Updated: 2020/12/12 17:58:26 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,12 +17,16 @@ int ft_strncmp(const char *s1, const char *s2, size_t n)
int i; int i;
i = 0; i = 0;
if (!s1 || !s2 || !n)
return (0);
while (n && s1[i] && s2[i]) while (n && s1[i] && s2[i])
{ {
if (s1[i] != s2[i]) if (s1[i] != s2[i])
return ((unsigned char)(s1[i] - s2[i])); return ((char)(s1[i] - s2[i]));
n--; n--;
i++; i++;
} }
return ((unsigned char)(s1[i] - s2[i])); if (!s1[i] || !s2[i])
return ((unsigned char)s1[i] - (unsigned char)s2[i]);
return (0);
} }

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:42 by apommier #+# #+# */ /* Created: 2020/11/29 00:13:42 by apommier #+# #+# */
/* Updated: 2020/12/11 16:17:45 by apommier ### ########.fr */ /* Updated: 2020/12/12 18:13:44 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -18,9 +18,11 @@ char *ft_strnstr(const char *big, const char *little, size_t len)
int j; int j;
i = 0; i = 0;
if (little[i] == 0) if (!len)
return (0);
if (!little[i])
return ((char*)big); return ((char*)big);
while (big[i] && len - i) while (big[i] && len - i - 1)
{ {
j = 0; j = 0;
if (little[j] != big[i]) if (little[j] != big[i])
@ -31,6 +33,8 @@ char *ft_strnstr(const char *big, const char *little, size_t len)
j++; j++;
if (little[j] == 0) if (little[j] == 0)
return ((char*)&big[i]); return ((char*)&big[i]);
else
i++;
} }
} }
return (0); return (0);

View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */ /* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:52 by apommier #+# #+# */ /* Created: 2020/11/29 00:13:52 by apommier #+# #+# */
/* Updated: 2020/12/12 09:09:46 by apommier ### ########.fr */ /* Updated: 2020/12/12 18:55:00 by apommier ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,10 +17,9 @@ char *ft_strrchr(const char *s, int c)
char *str; char *str;
char *last; char *last;
if (!s) last = 0;
return (0);
str = (char*)s; str = (char*)s;
while (*str != 0) while (*str)
{ {
if (*str == c) if (*str == c)
last = str; last = str;