Kinou/libft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push

Browse Source
This commit is contained in:
kinou 2020-12-12 13:54:37 +01:00
parent 36ee00be39
commit ed652c647e
15 changed files with 71 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ft_atoi.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:09:17 by apommier #+# #+# */
/* Updated: 2020/11/29 17:02:15 by apommier ### ########.fr */
/* Updated: 2020/12/12 12:05:13 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,7 @@ int ft_atoi(const char *nptr)
minus = 1;
nbr = 0;
i = 0;
while (nptr[i] == 32)
while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == 32)
i++;
if (nptr[i] == '+')
i++;

4
ft_isalnum.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:10:08 by apommier #+# #+# */
/* Updated: 2020/12/11 18:10:51 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:26:43 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,7 +14,7 @@
int ft_isalnum(int c)
{
if (c <= 9 && c >= 0)
if (c <= '9' && c >= '0')
return (1);
else if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
return (1);

4
ft_isalpha.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:10:17 by apommier #+# #+# */
/* Updated: 2020/12/11 18:11:03 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:28:12 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,7 +14,7 @@
int ft_isalpha(int c)
{
if ((c > 64 && c < 90) || (c > 96 && c < 122))
if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
return (1);
else
return (0);

4
ft_isdigit.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:10:39 by apommier #+# #+# */
/* Updated: 2020/12/11 18:11:30 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:27:06 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,7 +14,7 @@
int ft_isdigit(int c)
{
if (c <= 9 && c >= 0)
if (c <= '9' && c >= '0')
return (1);
else
return (0);

6
ft_lstclear.c
View File

@ -6,7 +6,7 @@
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/12/09 19:58:04 by apommier #+# #+# */
/* Updated: 2020/12/11 18:39:14 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:15:23 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,8 +19,8 @@ void ft_lstclear(t_list **lst, void (*del)(void*))
chr = *lst;
while (*lst)
{
chr = *lst->next;
del(*lst->content);
chr = (*lst)->next;
del((*lst)->content);
free(*lst);
*lst = chr;
}

4
ft_lstdelone.c
View File

@ -6,7 +6,7 @@
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/12/09 19:54:40 by apommier #+# #+# */
/* Updated: 2020/12/11 17:46:48 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:10:11 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,7 +15,7 @@
void ft_lstdelone(t_list *lst, void (*del)(void*))
{
if (!lst)
return;
return ;
del(lst->content);
free(lst);
}

24
ft_memccpy.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:11:04 by apommier #+# #+# */
/* Updated: 2020/11/29 16:57:52 by apommier ### ########.fr */
/* Updated: 2020/12/12 12:44:27 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -15,21 +15,17 @@
void *ft_memccpy(void *dest, const void *src, int c, size_t n)
{
char *p;
char *p1;
const char *p1;
size_t i;
p = (char*)dest;
p1 = (char*)src;
while (n > 0 && *p1 != c)
p1 = (const char*)src;
while (i < n)
{
*p = *p1;
p++;
p1++;
n--;
p[i] = p1[i];
if ((unsigned char)p[i] == (unsigned char)c)
return (dest + i + 1);
i++;
}
if (*p1 == (char)c)
{
*p = *p1;
p++;
}
return ((void*)p);
return (0);
}

4
ft_memchr.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:11:39 by apommier #+# #+# */
/* Updated: 2020/12/11 16:04:15 by apommier ### ########.fr */
/* Updated: 2020/12/12 13:53:45 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -19,7 +19,7 @@ void *ft_memchr(const void *s, int c, size_t n)
str = (unsigned char*)s;
while (n)
{
if (c == *str)
if ((unsigned char)c == *str)
return (str);
n--;
str++;

20
ft_memcpy.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:12:03 by apommier #+# #+# */
/* Updated: 2020/12/11 18:15:39 by apommier ### ########.fr */
/* Updated: 2020/12/12 12:38:43 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -14,17 +14,19 @@
void *ft_memcpy(void *dest, const void *src, size_t n)
{
unsigned char *p;
unsigned char *p2;
int i;
size_t i;
char *p;
const char *p1;
p = (char*)dest;
p1 = (const char*)src;
if (!dest || !src)
return (0);
i = 0;
p = (unsigned char*)dest;
p2 = (unsigned char*)src;
while (n > 0 && p2[i])
while (i < n)
{
n--;
p[i] = p2[i];
p[i] = p1[i];
i++;
}
return (dest);

4
ft_memmove.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:12:14 by apommier #+# #+# */
/* Updated: 2020/12/11 18:48:18 by apommier ### ########.fr */
/* Updated: 2020/12/12 12:09:49 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -23,7 +23,7 @@ void *ft_memmove(void *dest, const void *src, size_t n)
{
while (n)
{
((unsigned char*)dest)[n] = ((unsigned char*)src)[n];
((unsigned char*)dest)[n - 1] = ((unsigned char*)src)[n - 1];
n--;
}
}

4
ft_putnbr_fd.c
View File

@ -6,7 +6,7 @@
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/12/08 23:25:57 by apommier #+# #+# */
/* Updated: 2020/12/11 17:10:10 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:42:09 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -25,6 +25,4 @@ void ft_putnbr_fd(int n, int fd)
if (nbr >= 10)
ft_putnbr_fd(nbr / 10, fd);
ft_putchar_fd(nbr % 10 + '0', fd);
if (nbr < 10)
ft_putchar_fd(nbr + '0', fd);
}

34
ft_split.c
View File

@ -6,7 +6,7 @@
/* By: apommier <alexpomms@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/12/07 00:54:12 by apommier #+# #+# */
/* Updated: 2020/12/11 16:27:08 by apommier ### ########.fr */
/* Updated: 2020/12/12 11:44:32 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,39 +16,44 @@ int fill_tab(char *s, char c, char *dest)
{
int i;
i = 0;
while (s[i] != c || s[i])
while (s[i] != c && s[i])
i++;
dest = (char*)ft_calloc(i + 1, sizeof(char));
dest = (char*)malloc(sizeof(char) * i + 1);
if (dest == 0)
return (0);
i = 0;
while (s[i] != c || s[i])
while (s[i] != c && s[i])
{
dest[i] = s[i];
i++;
}
dest[i] = 0;
return (1);
}
void call(char *s, char c, char **dest, int j)
{
int i;
int k;
k = 0;
i = 0;
while (s[k] == c)
k++;
while (j > i)
{
if (fill_tab(s, c, dest[i]))
j--;
else
if (!fill_tab(&s[k], c, dest[i]))
{
while (i - 1)
{
free(dest[i - 1]);
i--;
}
free(dest);
return ;
}
while (s[k] != c)
k++;
k++;
i++;
}
}
@ -61,17 +66,20 @@ char **ft_split(char const *s, char c)
j = 0;
i = 0;
if (s[i] == c)
i++;
while (s[i])
{
if (s[i] == c)
{
if (j)
j++;
while (s[i] == c)
i++;
}
dest = (char**)malloc(sizeof(char*) * j);
if (dest == 0)
i++;
}
if (!(dest = (char**)malloc(sizeof(char*) * (j + 1))))
return (0);
dest[j] = 0;
call((char*)s, c, dest, j);
return (dest);
}

4
ft_strchr.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:12:32 by apommier #+# #+# */
/* Updated: 2020/12/11 18:51:57 by apommier ### ########.fr */
/* Updated: 2020/12/12 10:16:26 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,7 +17,7 @@ char *ft_strchr(const char *s, int c)
unsigned char *str;
str = (unsigned char*)s;
while ((*str != c) || (*str != 0))
while ((*str != c) && (*str != 0))
str++;
if (*str == c)
return ((char*)str);

2
ft_strrchr.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 00:13:52 by apommier #+# #+# */
/* Updated: 2020/12/11 18:24:45 by apommier ### ########.fr */
/* Updated: 2020/12/12 09:09:46 by apommier ### ########.fr */
/* */
/* ************************************************************************** */

5
ft_strtrim.c
View File

@ -6,7 +6,7 @@
/* By: apommier <apommier@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2020/11/29 23:52:05 by apommier #+# #+# */
/* Updated: 2020/12/11 16:21:55 by apommier ### ########.fr */
/* Updated: 2020/12/12 10:09:53 by apommier ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,6 +21,7 @@ static int is_set(char const *set, char c)
{
if (set[i] == c)
return (1);
i++;
}
return (0);
}
@ -41,7 +42,7 @@ char *ft_strtrim(char const *s1, char const *set)
j++;
len = len - i - j;
dest = malloc(sizeof(char) * (len + 1));
if (dest == 0)
if (dest == 0 || s1 == 0 || (size_t)i == ft_strlen(s1))
return (0);
j = 0;
while (s1[i] && len - j)