From ed652c647ef4ededab28222bca07930defa3c28e Mon Sep 17 00:00:00 2001 From: kinou Date: Sat, 12 Dec 2020 13:54:37 +0100 Subject: [PATCH] push --- ft_atoi.c | 4 ++-- ft_isalnum.c | 4 ++-- ft_isalpha.c | 4 ++-- ft_isdigit.c | 4 ++-- ft_lstclear.c | 6 +++--- ft_lstdelone.c | 4 ++-- ft_memccpy.c | 26 +++++++++++--------------- ft_memchr.c | 4 ++-- ft_memcpy.c | 20 +++++++++++--------- ft_memmove.c | 4 ++-- ft_putnbr_fd.c | 4 +--- ft_split.c | 36 ++++++++++++++++++++++-------------- ft_strchr.c | 4 ++-- ft_strrchr.c | 8 ++++---- ft_strtrim.c | 5 +++-- 15 files changed, 71 insertions(+), 66 deletions(-) diff --git a/ft_atoi.c b/ft_atoi.c index 2f59458..a9db23e 100644 --- a/ft_atoi.c +++ b/ft_atoi.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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++; diff --git a/ft_isalnum.c b/ft_isalnum.c index 9dafa7a..7f628b5 100644 --- a/ft_isalnum.c +++ b/ft_isalnum.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); diff --git a/ft_isalpha.c b/ft_isalpha.c index f9cbf7f..51292d2 100644 --- a/ft_isalpha.c +++ b/ft_isalpha.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); diff --git a/ft_isdigit.c b/ft_isdigit.c index b47d808..81ca1f0 100644 --- a/ft_isdigit.c +++ b/ft_isdigit.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); diff --git a/ft_lstclear.c b/ft_lstclear.c index 3fe9aa7..d768b5a 100644 --- a/ft_lstclear.c +++ b/ft_lstclear.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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; } diff --git a/ft_lstdelone.c b/ft_lstdelone.c index 02c40d1..d932649 100644 --- a/ft_lstdelone.c +++ b/ft_lstdelone.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); } diff --git a/ft_memccpy.c b/ft_memccpy.c index 017cd6e..2d60423 100644 --- a/ft_memccpy.c +++ b/ft_memccpy.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ @@ -14,22 +14,18 @@ void *ft_memccpy(void *dest, const void *src, int c, size_t n) { - char *p; - char *p1; + char *p; + 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); } diff --git a/ft_memchr.c b/ft_memchr.c index bdc3371..6a0fb37 100644 --- a/ft_memchr.c +++ b/ft_memchr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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++; diff --git a/ft_memcpy.c b/ft_memcpy.c index 8ed1530..c7a96a1 100644 --- a/ft_memcpy.c +++ b/ft_memcpy.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); diff --git a/ft_memmove.c b/ft_memmove.c index 81e5238..b602c38 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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--; } } diff --git a/ft_putnbr_fd.c b/ft_putnbr_fd.c index 7573a65..faa08fd 100644 --- a/ft_putnbr_fd.c +++ b/ft_putnbr_fd.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); } diff --git a/ft_split.c b/ft_split.c index 61e6038..92dc6f9 100644 --- a/ft_split.c +++ b/ft_split.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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) - j++; + { + if (j) + j++; + while (s[i] == c) + i++; + } i++; } - dest = (char**)malloc(sizeof(char*) * j); - if (dest == 0) + if (!(dest = (char**)malloc(sizeof(char*) * (j + 1)))) return (0); + dest[j] = 0; call((char*)s, c, dest, j); return (dest); } diff --git a/ft_strchr.c b/ft_strchr.c index 70dab1f..ca7253c 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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); diff --git a/ft_strrchr.c b/ft_strrchr.c index f50638e..941a8ca 100644 --- a/ft_strrchr.c +++ b/ft_strrchr.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */ @@ -14,9 +14,9 @@ char *ft_strrchr(const char *s, int c) { - char *str; - char *last; - + char *str; + char *last; + if (!s) return (0); str = (char*)s; diff --git a/ft_strtrim.c b/ft_strtrim.c index f86400d..0cb1f61 100644 --- a/ft_strtrim.c +++ b/ft_strtrim.c @@ -6,7 +6,7 @@ /* By: apommier +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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)