diff options
| author | Cabergs Charles <cacharle@w-r4-p5.s19.be> | 2019-10-07 11:35:51 +0200 |
|---|---|---|
| committer | Cabergs Charles <cacharle@w-r4-p5.s19.be> | 2019-10-07 11:35:51 +0200 |
| commit | 10b4feb67c8af2b099dabd66f948b02e180bae0d (patch) | |
| tree | e97d3d4701a79ac2087534dd350225e556127a76 | |
| parent | 9a2b208985ac7d4644c718ada74770b98eeb4598 (diff) | |
| download | libft-10b4feb67c8af2b099dabd66f948b02e180bae0d.tar.gz libft-10b4feb67c8af2b099dabd66f948b02e180bae0d.tar.bz2 libft-10b4feb67c8af2b099dabd66f948b02e180bae0d.zip | |
Normed everything
Created a few dummy functions to resolve functions
having more than 25 lines.
| -rw-r--r-- | ft_atoi.c | 62 | ||||
| -rw-r--r-- | ft_bzero.c | 22 | ||||
| -rw-r--r-- | ft_isalnum.c | 16 | ||||
| -rw-r--r-- | ft_isalpha.c | 16 | ||||
| -rw-r--r-- | ft_isascii.c | 16 | ||||
| -rw-r--r-- | ft_isdigit.c | 16 | ||||
| -rw-r--r-- | ft_isprint.c | 16 | ||||
| -rw-r--r-- | ft_itoa.c | 17 | ||||
| -rw-r--r-- | ft_memalloc.c | 26 | ||||
| -rw-r--r-- | ft_memccpy.c | 46 | ||||
| -rw-r--r-- | ft_memchr.c | 36 | ||||
| -rw-r--r-- | ft_memcmp.c | 40 | ||||
| -rw-r--r-- | ft_memcpy.c | 34 | ||||
| -rw-r--r-- | ft_memdel.c | 18 | ||||
| -rw-r--r-- | ft_memmove.c | 65 | ||||
| -rw-r--r-- | ft_memset.c | 16 | ||||
| -rw-r--r-- | ft_putchar.c | 18 | ||||
| -rw-r--r-- | ft_putchar_fd.c | 16 | ||||
| -rw-r--r-- | ft_putendl.c | 18 | ||||
| -rw-r--r-- | ft_putendl_fd.c | 18 | ||||
| -rw-r--r-- | ft_putnbr.c | 16 | ||||
| -rw-r--r-- | ft_putnbr_fd.c | 16 | ||||
| -rw-r--r-- | ft_putstr.c | 18 | ||||
| -rw-r--r-- | ft_putstr_fd.c | 18 | ||||
| -rw-r--r-- | ft_strcat.c | 40 | ||||
| -rw-r--r-- | ft_strchr.c | 36 | ||||
| -rw-r--r-- | ft_strclr.c | 18 | ||||
| -rw-r--r-- | ft_strcmp.c | 24 | ||||
| -rw-r--r-- | ft_strcpy.c | 32 | ||||
| -rw-r--r-- | ft_strdel.c | 16 | ||||
| -rw-r--r-- | ft_strdup.c | 43 | ||||
| -rw-r--r-- | ft_strequ.c | 16 | ||||
| -rw-r--r-- | ft_striter.c | 18 | ||||
| -rw-r--r-- | ft_striteri.c | 28 | ||||
| -rw-r--r-- | ft_strjoin.c | 26 | ||||
| -rw-r--r-- | ft_strlcat.c | 14 | ||||
| -rw-r--r-- | ft_strlen.c | 24 | ||||
| -rw-r--r-- | ft_strmap.c | 42 | ||||
| -rw-r--r-- | ft_strmapi.c | 42 | ||||
| -rw-r--r-- | ft_strncat.c | 40 | ||||
| -rw-r--r-- | ft_strncmp.c | 16 | ||||
| -rw-r--r-- | ft_strncpy.c | 34 | ||||
| -rw-r--r-- | ft_strnequ.c | 16 | ||||
| -rw-r--r-- | ft_strnew.c | 28 | ||||
| -rw-r--r-- | ft_strnstr.c | 26 | ||||
| -rw-r--r-- | ft_strrchr.c | 32 | ||||
| -rw-r--r-- | ft_strsplit.c | 113 | ||||
| -rw-r--r-- | ft_strstr.c | 20 | ||||
| -rw-r--r-- | ft_strsub.c | 38 | ||||
| -rw-r--r-- | ft_strtrim.c | 48 | ||||
| -rw-r--r-- | ft_tolower.c | 26 | ||||
| -rw-r--r-- | ft_toupper.c | 26 | ||||
| -rw-r--r-- | libft.h | 110 |
53 files changed, 1111 insertions, 481 deletions
@@ -1,33 +1,53 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_atoi.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:46:16 by cacharle #+# #+# */ +/* Updated: 2019/10/07 11:34:37 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #define MIN_INT (1 << 31) #define MAX_INT (~(1 << 31)) -int ft_atoi(const char *nptr) +static int precheck(const char **nptr) { - unsigned int nb; - int i; - int is_negative; + int is_negative; - while (*nptr == ' ' || *nptr == '\t'|| *nptr == '\n' - || *nptr == '\v'|| *nptr == '\f'|| *nptr == '\r') - nptr++; - is_negative = 0; - if (*nptr == '-' || *nptr == '+') + while (**nptr == ' ' || **nptr == '\t' || **nptr == '\n' + || **nptr == '\v' || **nptr == '\f' || **nptr == '\r') + (*nptr)++; + is_negative = 0; + if (**nptr == '-' || **nptr == '+') { - if (*nptr == '-') - is_negative = 1; - nptr++; + if (**nptr == '-') + is_negative = 1; + (*nptr)++; } - i = 0; - nb = 0; + return (is_negative); +} + +int ft_atoi(const char *nptr) +{ + unsigned int nb; + int i; + int is_negative; + + is_negative = precheck(&nptr); + i = 0; + nb = 0; while (nptr[i] >= '0' && nptr[i] <= '9') { - if (!is_negative && nb > (unsigned int)MAX_INT) - return (-1); - else if (nb > (unsigned int)MIN_INT) - return (0); - nb *= 10; - nb += nptr[i] - '0'; - i++; + if (!is_negative && nb > (unsigned int)MAX_INT) + return (-1); + else if (nb > (unsigned int)MIN_INT) + return (0); + nb *= 10; + nb += nptr[i] - '0'; + i++; } return ((int)(is_negative ? -nb : nb)); } @@ -1,10 +1,22 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_bzero.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:50:10 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:50:22 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -void ft_bzero(void *s, size_t n) +void ft_bzero(void *s, size_t n) { - char *s_char_ptr; + char *s_char_ptr; - s_char_ptr = (char*)s; - while (n-- > 0) - s_char_ptr[n] = 0; + s_char_ptr = (char*)s; + while (n-- > 0) + s_char_ptr[n] = 0; } diff --git a/ft_isalnum.c b/ft_isalnum.c index d98da91..1ee1e0f 100644 --- a/ft_isalnum.c +++ b/ft_isalnum.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isalnum.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:41:40 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:41:56 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -int ft_isalnum(int c) +int ft_isalnum(int c) { - return (ft_isalpha(c) || ft_isdigit(c)); + return (ft_isalpha(c) || ft_isdigit(c)); } diff --git a/ft_isalpha.c b/ft_isalpha.c index cd09abb..070ff6a 100644 --- a/ft_isalpha.c +++ b/ft_isalpha.c @@ -1,4 +1,16 @@ -int ft_isalpha(int c) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isalpha.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:54:52 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:54:57 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_isalpha(int c) { - return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')); + return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')); } diff --git a/ft_isascii.c b/ft_isascii.c index 7742ded..5bb79cb 100644 --- a/ft_isascii.c +++ b/ft_isascii.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isascii.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:54:30 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:54:37 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #define MAX_CHAR ((1 << 7) - 1) -int ft_isascii(int c) +int ft_isascii(int c) { - return (c >= 0 && c <= MAX_CHAR); + return (c >= 0 && c <= MAX_CHAR); } diff --git a/ft_isdigit.c b/ft_isdigit.c index a41e1fd..f8a5850 100644 --- a/ft_isdigit.c +++ b/ft_isdigit.c @@ -1,4 +1,16 @@ -int ft_isdigit(int c) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isdigit.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:41:20 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:41:25 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_isdigit(int c) { - return (c >= '0' && c <= '9'); + return (c >= '0' && c <= '9'); } diff --git a/ft_isprint.c b/ft_isprint.c index 6834120..397271d 100644 --- a/ft_isprint.c +++ b/ft_isprint.c @@ -1,4 +1,16 @@ -int ft_isprint(int c) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_isprint.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:52:09 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:52:10 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_isprint(int c) { - return (c >= ' ' && c <= '~'); + return (c >= ' ' && c <= '~'); } @@ -1,7 +1,18 @@ -#include <stdlib.h> +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_itoa.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:19:56 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:21:23 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ +#include <stdlib.h> -static int count_len(int nbr) +static int count_len(int nbr) { int counter; unsigned int u_nbr; @@ -23,7 +34,7 @@ static int count_len(int nbr) return (counter); } -char *ft_itoa(int n) +char *ft_itoa(int n) { char *str; int len; diff --git a/ft_memalloc.c b/ft_memalloc.c index 3c81f10..c485bfd 100644 --- a/ft_memalloc.c +++ b/ft_memalloc.c @@ -1,13 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memalloc.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:07:14 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:07:47 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include <string.h> -void *ft_memalloc(size_t size) +void *ft_memalloc(size_t size) { - void *ptr; + void *ptr; - if ((ptr = malloc(size)) == NULL) - return (NULL); - while (size-- > 0) - ((unsigned char*)ptr)[size] = 0; - return (ptr); + if ((ptr = malloc(size)) == NULL) + return (NULL); + while (size-- > 0) + ((unsigned char*)ptr)[size] = 0; + return (ptr); } diff --git a/ft_memccpy.c b/ft_memccpy.c index 9cc483a..20104ab 100644 --- a/ft_memccpy.c +++ b/ft_memccpy.c @@ -1,22 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memccpy.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:01:53 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:03:07 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -void *ft_memccpy(void *dest, const void *src, int c, size_t n) +void *ft_memccpy(void *dest, const void *src, int c, size_t n) { - size_t i; - unsigned char *uc_dest; - unsigned char *uc_src; + size_t i; + unsigned char *uc_dest; + unsigned char *uc_src; - uc_dest = (unsigned char*)dest; - uc_src = (unsigned char*)src; - i = 0; - while (i < n) - { - uc_dest[i] = uc_src[i]; - if (uc_dest[i] == (unsigned char)c) - break ; - i++; - } - if (i == n) - return (NULL); - return (dest + i + 1); + uc_dest = (unsigned char*)dest; + uc_src = (unsigned char*)src; + i = 0; + while (i < n) + { + uc_dest[i] = uc_src[i]; + if (uc_dest[i] == (unsigned char)c) + break ; + i++; + } + if (i == n) + return (NULL); + return (dest + i + 1); } diff --git a/ft_memchr.c b/ft_memchr.c index 662a6c7..26b196f 100644 --- a/ft_memchr.c +++ b/ft_memchr.c @@ -1,17 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:55:31 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:56:35 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -void *ft_memchr(const void *s, int c, size_t n) +void *ft_memchr(const void *s, int c, size_t n) { - size_t i; - unsigned char *uc_s; + size_t i; + unsigned char *uc_s; - uc_s = (unsigned char*)s; - i = 0; - while (i < n) - { - if (uc_s[i] == (unsigned char)c) - return (uc_s + i); - i++; - } - return (NULL); + uc_s = (unsigned char*)s; + i = 0; + while (i < n) + { + if (uc_s[i] == (unsigned char)c) + return (uc_s + i); + i++; + } + return (NULL); } diff --git a/ft_memcmp.c b/ft_memcmp.c index 76cd47d..32a2cc4 100644 --- a/ft_memcmp.c +++ b/ft_memcmp.c @@ -1,19 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memcmp.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:56:44 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:59:58 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -int ft_memcmp(const void *s1, const void *s2, size_t n) +int ft_memcmp(const void *s1, const void *s2, size_t n) { - size_t i; - unsigned char *uc_s1; - unsigned char *uc_s2; + size_t i; + unsigned char *uc_s1; + unsigned char *uc_s2; - uc_s1 = (unsigned char*)s1; - uc_s2 = (unsigned char*)s2; - i = 0; - if (n == 0) - return (0); - while (i < n && uc_s1[i] == uc_s2[i]) - i++; - if (i == n) - i--; - return (uc_s1[i] - uc_s2[i]); + uc_s1 = (unsigned char*)s1; + uc_s2 = (unsigned char*)s2; + i = 0; + if (n == 0) + return (0); + while (i < n && uc_s1[i] == uc_s2[i]) + i++; + if (i == n) + i--; + return (uc_s1[i] - uc_s2[i]); } diff --git a/ft_memcpy.c b/ft_memcpy.c index 1ac2708..da243f2 100644 --- a/ft_memcpy.c +++ b/ft_memcpy.c @@ -1,16 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memcpy.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:00:07 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:00:46 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -void *ft_memcpy(void *dest, const void *src, size_t n) +void *ft_memcpy(void *dest, const void *src, size_t n) { - size_t i; + size_t i; - if (dest == NULL && src == NULL) - return (NULL); - i = 0; - while (i < n) - { - *((char*)dest + i) = *((char*)src + i); - i++; - } - return (dest); + if (dest == NULL && src == NULL) + return (NULL); + i = 0; + while (i < n) + { + *((char*)dest + i) = *((char*)src + i); + i++; + } + return (dest); } diff --git a/ft_memdel.c b/ft_memdel.c index 6d4cd6f..206e5af 100644 --- a/ft_memdel.c +++ b/ft_memdel.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memdel.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:00:56 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:01:06 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> -void ft_memdel(void **ap) +void ft_memdel(void **ap) { - free(*ap); - *ap = NULL; + free(*ap); + *ap = NULL; } diff --git a/ft_memmove.c b/ft_memmove.c index 54555cb..282ea52 100644 --- a/ft_memmove.c +++ b/ft_memmove.c @@ -1,38 +1,43 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memmove.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:03:21 by cacharle #+# #+# */ +/* Updated: 2019/10/07 11:17:29 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include <string.h> #define BUF_SIZE 4096 -void *ft_memmove(void *dest, const void *src, size_t n) +void *ft_memmove(void *dest, const void *src, size_t n) { - size_t i; - size_t j; - size_t k; - unsigned char tmp[BUF_SIZE]; - unsigned char *uc_dest; - unsigned char *uc_src; + size_t i; + size_t j; + size_t k; + unsigned char tmp[BUF_SIZE]; - if (dest == NULL && src == NULL) - return (NULL); - uc_dest = (unsigned char*) dest; - uc_src = (unsigned char*) src; - i = 0; - while (i < n) - { - j = 0; - while (j < BUF_SIZE && i < n) - { - tmp[j] = uc_src[i]; - j++; - i++; - } - k = 0; - while (k < j) - { - uc_dest[k] = tmp[k]; - k++; - } - i++; - } - return (dest); + if (dest == NULL && src == NULL) + return (NULL); + i = 0; + while (i < n) + { + j = 0; + while (j < BUF_SIZE && i < n) + { + tmp[j] = ((unsigned char*)src)[i]; + j++; + i++; + } + k = -1; + while (++k < j) + ((unsigned char*)dest)[k] = tmp[k]; + i++; + } + return (dest); } diff --git a/ft_memset.c b/ft_memset.c index e09db6c..9e3a541 100644 --- a/ft_memset.c +++ b/ft_memset.c @@ -1,8 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_memset.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:01:23 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:01:38 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -void *ft_memset(void *s, int c, size_t n) +void *ft_memset(void *s, int c, size_t n) { - unsigned char uchar_c; + unsigned char uchar_c; uchar_c = (unsigned char)c; while (n-- > 0) diff --git a/ft_putchar.c b/ft_putchar.c index 5718181..d8dc595 100644 --- a/ft_putchar.c +++ b/ft_putchar.c @@ -1,8 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putchar.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:53:31 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:53:40 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> -void ft_putchar(char c) +void ft_putchar(char c) { - /* if (c < 0) */ - /* write(1, "", 1); */ - write(STDOUT_FILENO, &c, 1); + write(STDOUT_FILENO, &c, 1); } diff --git a/ft_putchar_fd.c b/ft_putchar_fd.c index 405bbe4..89c7ed9 100644 --- a/ft_putchar_fd.c +++ b/ft_putchar_fd.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putchar_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:42:34 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:42:40 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> -void ft_putchar_fd(char c, int fd) +void ft_putchar_fd(char c, int fd) { - write(fd, &c, 1); + write(fd, &c, 1); } diff --git a/ft_putendl.c b/ft_putendl.c index 0e9eaed..5bd86e5 100644 --- a/ft_putendl.c +++ b/ft_putendl.c @@ -1,8 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putendl.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:42:54 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:43:01 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> #include "libft.h" -void ft_putendl(char const *s) +void ft_putendl(char const *s) { - ft_putstr(s); - ft_putchar('\n'); + ft_putstr(s); + ft_putchar('\n'); } diff --git a/ft_putendl_fd.c b/ft_putendl_fd.c index 58ca452..c1ed236 100644 --- a/ft_putendl_fd.c +++ b/ft_putendl_fd.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putendl_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:44:06 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:44:14 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -void ft_putendl_fd(char const *s, int fd) +void ft_putendl_fd(char const *s, int fd) { - ft_putstr_fd(s, fd); - ft_putchar_fd('\n', fd); + ft_putstr_fd(s, fd); + ft_putchar_fd('\n', fd); } diff --git a/ft_putnbr.c b/ft_putnbr.c index 856c429..9e1f894 100644 --- a/ft_putnbr.c +++ b/ft_putnbr.c @@ -1,14 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putnbr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:52:33 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:53:09 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> #include "libft.h" -void ft_putnbr(int n) +void ft_putnbr(int n) { unsigned int p_n; p_n = n; if (n < 0) { - ft_putchar('-'); + ft_putchar('-'); p_n = -n; } if (p_n > 9) diff --git a/ft_putnbr_fd.c b/ft_putnbr_fd.c index c49de56..db91e06 100644 --- a/ft_putnbr_fd.c +++ b/ft_putnbr_fd.c @@ -1,14 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putnbr_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:40:35 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:40:52 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> #include "libft.h" -void ft_putnbr_fd(int n, int fd) +void ft_putnbr_fd(int n, int fd) { unsigned int p_n; p_n = n; if (n < 0) { - ft_putchar_fd('-', fd); + ft_putchar_fd('-', fd); p_n = -n; } if (p_n > 9) diff --git a/ft_putstr.c b/ft_putstr.c index 1bfe06c..0e87847 100644 --- a/ft_putstr.c +++ b/ft_putstr.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putstr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:52:12 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:52:15 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> -void ft_putstr(char const *s) +void ft_putstr(char const *s) { - while (*s) - write(STDOUT_FILENO, s++, 1); + while (*s) + write(STDOUT_FILENO, s++, 1); } diff --git a/ft_putstr_fd.c b/ft_putstr_fd.c index d7c2756..7053650 100644 --- a/ft_putstr_fd.c +++ b/ft_putstr_fd.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_putstr_fd.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:40:15 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:40:22 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <unistd.h> -void ft_putstr_fd(char const *s, int fd) +void ft_putstr_fd(char const *s, int fd) { - while (*s) - write(fd, s++, 1); + while (*s) + write(fd, s++, 1); } diff --git a/ft_strcat.c b/ft_strcat.c index 5f03164..e7289db 100644 --- a/ft_strcat.c +++ b/ft_strcat.c @@ -1,17 +1,29 @@ -char *ft_strcat(char *dest, const char *src) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strcat.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:09:41 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:39:51 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +char *ft_strcat(char *dest, const char *src) { - int i; - int j; + int i; + int j; - i = 0; - while (dest[i]) - i++; - j = 0; - while (src[j]) - { - dest[i + j] = src[j]; - j++; - } - dest[i + j] = '\0'; - return (dest); + i = 0; + while (dest[i]) + i++; + j = 0; + while (src[j]) + { + dest[i + j] = src[j]; + j++; + } + dest[i + j] = '\0'; + return (dest); } diff --git a/ft_strchr.c b/ft_strchr.c index 67b969e..048b2ec 100644 --- a/ft_strchr.c +++ b/ft_strchr.c @@ -1,17 +1,29 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:14:47 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:40:04 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> -char *ft_strchr(const char *s, int c) +char *ft_strchr(const char *s, int c) { - char *cursor; + char *cursor; - cursor = (char*)s; - while (*cursor) - { - if (*cursor == (char)c) - return (cursor); - cursor++; - } - if (c == 0) - return (cursor); - return (NULL); + cursor = (char*)s; + while (*cursor) + { + if (*cursor == (char)c) + return (cursor); + cursor++; + } + if (c == 0) + return (cursor); + return (NULL); } diff --git a/ft_strclr.c b/ft_strclr.c index 17fdc1f..2f936bf 100644 --- a/ft_strclr.c +++ b/ft_strclr.c @@ -1,5 +1,17 @@ -void ft_strclr(char *s) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strclr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:15:18 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:15:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +void ft_strclr(char *s) { - while (*s) - *s++ = '\0'; + while (*s) + *s++ = '\0'; } diff --git a/ft_strcmp.c b/ft_strcmp.c index 8a86b2a..df1a2e2 100644 --- a/ft_strcmp.c +++ b/ft_strcmp.c @@ -1,9 +1,21 @@ -int ft_strcmp(const char *s1, const char *s2) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strcmp.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:16:07 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:16:19 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_strcmp(const char *s1, const char *s2) { - int i; + int i; - i = 0; - while (s1[i] && s2[i] && s1[i] == s2[i]) - i++; - return ((unsigned char)s1[i] - (unsigned char)s2[i]); + i = 0; + while (s1[i] && s2[i] && s1[i] == s2[i]) + i++; + return ((unsigned char)s1[i] - (unsigned char)s2[i]); } diff --git a/ft_strcpy.c b/ft_strcpy.c index 8f3946d..6d94aef 100644 --- a/ft_strcpy.c +++ b/ft_strcpy.c @@ -1,13 +1,25 @@ -char *ft_strcpy(char *dest, const char *src) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strcpy.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:38:36 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:39:03 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +char *ft_strcpy(char *dest, const char *src) { - int i; + int i; - i = 0; - while (src[i]) - { - dest[i] = src[i]; - i++; - } - dest[i] = '\0'; - return (dest); + i = 0; + while (src[i]) + { + dest[i] = src[i]; + i++; + } + dest[i] = '\0'; + return (dest); } diff --git a/ft_strdel.c b/ft_strdel.c index 62debcc..d62d36d 100644 --- a/ft_strdel.c +++ b/ft_strdel.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strdel.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:39:14 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:39:33 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -void ft_strdel(char **as) +void ft_strdel(char **as) { - ft_memdel((void*)as); + ft_memdel((void*)as); } diff --git a/ft_strdup.c b/ft_strdup.c index e3609cc..8a0ce90 100644 --- a/ft_strdup.c +++ b/ft_strdup.c @@ -1,22 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strdup.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:18:07 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:37:21 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include "libft.h" -char *ft_strdup(const char *s) +char *ft_strdup(const char *s) { - char *clone; - size_t i; - size_t len; + char *clone; + size_t i; + size_t len; - len = ft_strlen(s); - if ((clone = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - i = 0; - while (i < len) - { - clone[i] = s[i]; - i++; - } - clone[i] = '\0'; - return (clone); + len = ft_strlen(s); + if ((clone = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + i = 0; + while (i < len) + { + clone[i] = s[i]; + i++; + } + clone[i] = '\0'; + return (clone); } - diff --git a/ft_strequ.c b/ft_strequ.c index bd2469c..ea41207 100644 --- a/ft_strequ.c +++ b/ft_strequ.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strequ.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:18:34 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:18:41 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -int ft_strequ(char const *s1, char const *s2) +int ft_strequ(char const *s1, char const *s2) { - return (ft_strcmp(s1, s2) == 0); + return (ft_strcmp(s1, s2) == 0); } diff --git a/ft_striter.c b/ft_striter.c index a4e69bc..a3a2306 100644 --- a/ft_striter.c +++ b/ft_striter.c @@ -1,5 +1,17 @@ -void ft_striter(char *s, void (*f)(char *)) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_striter.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:38:16 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:38:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +void ft_striter(char *s, void (*f)(char *)) { - while (*s) - (*f)(s++); + while (*s) + (*f)(s++); } diff --git a/ft_striteri.c b/ft_striteri.c index 305138f..0d3ccdf 100644 --- a/ft_striteri.c +++ b/ft_striteri.c @@ -1,11 +1,23 @@ -void ft_striteri(char *s, void (*f)(unsigned int, char *)) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_striteri.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:33:09 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:37:37 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +void ft_striteri(char *s, void (*f)(unsigned int, char *)) { - unsigned int i; + unsigned int i; - i = 0; - while (s[i]) - { - (*f)(i, &s[i]); - i++; - } + i = 0; + while (s[i]) + { + (*f)(i, &s[i]); + i++; + } } diff --git a/ft_strjoin.c b/ft_strjoin.c index 3befb18..a282c53 100644 --- a/ft_strjoin.c +++ b/ft_strjoin.c @@ -1,13 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strjoin.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:35:26 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:38:07 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include "libft.h" -char * ft_strjoin(char const *s1, char const *s2) +char *ft_strjoin(char const *s1, char const *s2) { - char *joined; + char *joined; - if ((joined = (char*)malloc(sizeof(char) * (ft_strlen(s1) + ft_strlen(s2) + 1))) - == NULL) - return (NULL); - joined = ft_strcpy(joined, s1); - return (ft_strcat(joined, s2)); + if ((joined = (char*)malloc(sizeof(char) + * (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL) + return (NULL); + joined = ft_strcpy(joined, s1); + return (ft_strcat(joined, s2)); } diff --git a/ft_strlcat.c b/ft_strlcat.c index 6c550f3..7d5a957 100644 --- a/ft_strlcat.c +++ b/ft_strlcat.c @@ -1,7 +1,19 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strlcat.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:31:37 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:32:03 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> #include "libft.h" -size_t ft_strlcat(char *dst, const char *src, size_t size) +size_t ft_strlcat(char *dst, const char *src, size_t size) { size_t i; size_t dst_len; diff --git a/ft_strlen.c b/ft_strlen.c index 9568fa2..9d62897 100644 --- a/ft_strlen.c +++ b/ft_strlen.c @@ -1,11 +1,23 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strlen.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:32:48 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:32:59 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -size_t ft_strlen(const char *s) +size_t ft_strlen(const char *s) { - size_t counter; + size_t counter; - counter = 0; - while (s[counter]) - counter++; - return (counter); + counter = 0; + while (s[counter]) + counter++; + return (counter); } diff --git a/ft_strmap.c b/ft_strmap.c index 7fc3051..8661a68 100644 --- a/ft_strmap.c +++ b/ft_strmap.c @@ -1,21 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strmap.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:29:52 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:31:29 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include "libft.h" -char *ft_strmap(char const *s, char (*f)(char)) +char *ft_strmap(char const *s, char (*f)(char)) { - size_t i; - size_t len; - char *mapped; + size_t i; + size_t len; + char *mapped; - len = ft_strlen(s); - if ((mapped = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - i = 0; - while (i < len) - { - mapped[i] = (*f)(s[i]); - i++; - } - mapped[i] = '\0'; - return (mapped); + len = ft_strlen(s); + if ((mapped = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + i = 0; + while (i < len) + { + mapped[i] = (*f)(s[i]); + i++; + } + mapped[i] = '\0'; + return (mapped); } diff --git a/ft_strmapi.c b/ft_strmapi.c index da75c98..a03395e 100644 --- a/ft_strmapi.c +++ b/ft_strmapi.c @@ -1,21 +1,33 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strmapi.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:29:32 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:31:12 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include "libft.h" -char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) +char *ft_strmapi(char const *s, char (*f)(unsigned int, char)) { - size_t i; - size_t len; - char *mapped; + size_t i; + size_t len; + char *mapped; - len = ft_strlen(s); - if ((mapped = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - i = 0; - while (i < len) - { - mapped[i] = (*f)((unsigned int)i, s[i]); - i++; - } - mapped[i] = '\0'; - return (mapped); + len = ft_strlen(s); + if ((mapped = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + i = 0; + while (i < len) + { + mapped[i] = (*f)((unsigned int)i, s[i]); + i++; + } + mapped[i] = '\0'; + return (mapped); } diff --git a/ft_strncat.c b/ft_strncat.c index 41e9f67..3bbb41f 100644 --- a/ft_strncat.c +++ b/ft_strncat.c @@ -1,19 +1,31 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strncat.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:28:37 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:30:53 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -char *ft_strncat(char *dest, const char *src, size_t n) +char *ft_strncat(char *dest, const char *src, size_t n) { - size_t i; - size_t j; + size_t i; + size_t j; - i = 0; - while (dest[i]) - i++; - j = 0; - while (j < n && src[j]) - { - dest[i + j] = src[j]; - j++; - } - dest[i + j] = '\0'; - return (dest); + i = 0; + while (dest[i]) + i++; + j = 0; + while (j < n && src[j]) + { + dest[i + j] = src[j]; + j++; + } + dest[i + j] = '\0'; + return (dest); } diff --git a/ft_strncmp.c b/ft_strncmp.c index 0f24a1e..7246d5b 100644 --- a/ft_strncmp.c +++ b/ft_strncmp.c @@ -1,8 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strncmp.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:27:34 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:27:59 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -int ft_strncmp(const char *s1, const char *s2, size_t n) +int ft_strncmp(const char *s1, const char *s2, size_t n) { - size_t i; + size_t i; if (n == 0) return (0); diff --git a/ft_strncpy.c b/ft_strncpy.c index 100c813..4a4efed 100644 --- a/ft_strncpy.c +++ b/ft_strncpy.c @@ -1,16 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strncpy.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:26:59 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:28:17 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> -char *ft_strncpy(char *dest, const char *src, size_t n) +char *ft_strncpy(char *dest, const char *src, size_t n) { - size_t i; + size_t i; - i = 0; - while (src[i] && i < n) - { - dest[i] = src[i]; - i++; - } - while (i < n) - dest[i++] = '\0'; - return (dest); + i = 0; + while (src[i] && i < n) + { + dest[i] = src[i]; + i++; + } + while (i < n) + dest[i++] = '\0'; + return (dest); } diff --git a/ft_strnequ.c b/ft_strnequ.c index 6eb58bf..34d0627 100644 --- a/ft_strnequ.c +++ b/ft_strnequ.c @@ -1,6 +1,18 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strnequ.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:30:27 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:30:33 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -int ft_strnequ(char const *s1, char const *s2, size_t n) +int ft_strnequ(char const *s1, char const *s2, size_t n) { - return (ft_strncmp(s1, s2, n) == 0); + return (ft_strncmp(s1, s2, n) == 0); } diff --git a/ft_strnew.c b/ft_strnew.c index defe2e0..4274d5d 100644 --- a/ft_strnew.c +++ b/ft_strnew.c @@ -1,14 +1,26 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strnew.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:17:34 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:17:59 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include <string.h> -char *ft_strnew(size_t size) +char *ft_strnew(size_t size) { - char *str; + char *str; - if ((str = (char*)malloc(sizeof(char) * (size + 1))) == NULL) - return (NULL); - str[size] = '\0'; - while (size-- > 0) - str[size] = '\0'; - return (str); + if ((str = (char*)malloc(sizeof(char) * (size + 1))) == NULL) + return (NULL); + str[size] = '\0'; + while (size-- > 0) + str[size] = '\0'; + return (str); } diff --git a/ft_strnstr.c b/ft_strnstr.c index 4109f2d..5f4bb91 100644 --- a/ft_strnstr.c +++ b/ft_strnstr.c @@ -1,24 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strnstr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:25:13 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:26:11 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include <string.h> #include "libft.h" -#include <stdio.h> -char *ft_strnstr(const char *big, const char *little, size_t len) +char *ft_strnstr(const char *big, const char *little, size_t len) { - size_t i; - size_t j; - size_t little_len; + size_t i; + size_t j; + size_t little_len; - little_len = ft_strlen(little); + little_len = ft_strlen(little); if (little_len == 0 || len == 0) return ((char*)big); - i = 0; + i = 0; while (i < len && big[i]) { j = 0; while (i + j < len && little[j] && big[i + j]) { - /* printf(" %lu", i + j); */ if (little[j] != big[i + j]) break ; j++; diff --git a/ft_strrchr.c b/ft_strrchr.c index 7f01501..b94a776 100644 --- a/ft_strrchr.c +++ b/ft_strrchr.c @@ -1,16 +1,28 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strrchr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:26:24 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:26:46 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <string.h> #include "libft.h" -char *ft_strrchr(const char *s, int c) +char *ft_strrchr(const char *s, int c) { - size_t i; + size_t i; - i = ft_strlen(s); - while (s[i] != (char)c) - { - if (i == 0) - return (NULL); - i--; - } - return ((char*)s + i); + i = ft_strlen(s); + while (s[i] != (char)c) + { + if (i == 0) + return (NULL); + i--; + } + return ((char*)s + i); } diff --git a/ft_strsplit.c b/ft_strsplit.c index 2002add..3b80bfb 100644 --- a/ft_strsplit.c +++ b/ft_strsplit.c @@ -1,54 +1,77 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strsplit.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:22:09 by cacharle #+# #+# */ +/* Updated: 2019/10/07 11:11:15 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> -static size_t count_segment(char const *s, char c) +static size_t count_segment(char const *s, char c) +{ + size_t counter; + + counter = 0; + while (*s) + { + if (*s == c) + { + s++; + continue ; + } + counter++; + while (*s && *s != c) + s++; + } + return (counter); +} + +static char *ft_strndup(const char *s1, size_t n) { - size_t counter; + char *clone; + size_t i; - counter = 0; - while (*s) - { - if (*s == c) - { - s++; - continue ; - } - counter++; - while (*s && *s != c) - s++; - } - return (counter); + if ((clone = (char*)malloc(sizeof(char) * (n + 1))) == NULL) + return (NULL); + i = 0; + while (i < n) + { + clone[i] = s1[i]; + i++; + } + clone[i] = '\0'; + return (clone); } -char **ft_strsplit(char const *s, char c) +char **ft_strsplit(char const *s, char c) { - char **strs; - char *tmp; - size_t size; - size_t i; - size_t j; + char **strs; + size_t size; + size_t i; + size_t j; - size = count_segment(s, c); - if ((strs = (char**)malloc(sizeof(char*) * (size + 1))) == NULL) - return (NULL); - j = 0; - while (*s) - { - if (*s == c) - { - s++; - continue ; - } - i = 0; - while (s[i] && s[i] != c) - i++; - if ((tmp = (char*)malloc(sizeof(char) * (i + 1))) == NULL) - return (NULL); - i = 0; - while (*s && *s != c) - tmp[i++] = *s++; - tmp[i] = '\0'; - strs[j++] = tmp; - } - strs[j] = 0; - return (strs); + size = count_segment(s, c); + if ((strs = (char**)malloc(sizeof(char*) * (size + 1))) == NULL) + return (NULL); + j = 0; + while (*s) + { + if (*s == c) + { + s++; + continue ; + } + i = 0; + while (s[i] && s[i] != c) + i++; + strs[j++] = ft_strndup(s, i); + s += i; + } + strs[j] = 0; + return (strs); } diff --git a/ft_strstr.c b/ft_strstr.c index 0209de4..f71423f 100644 --- a/ft_strstr.c +++ b/ft_strstr.c @@ -1,13 +1,25 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strstr.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:15:29 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:21:49 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include <string.h> #include "libft.h" -char *ft_strstr(const char *haystack, const char *needle) +char *ft_strstr(const char *haystack, const char *needle) { - size_t i; - char *cursor; + size_t i; + char *cursor; - cursor = (char*)haystack; + cursor = (char*)haystack; if (!ft_strlen(needle)) return (cursor); while (*cursor) diff --git a/ft_strsub.c b/ft_strsub.c index 11be9c3..6f11657 100644 --- a/ft_strsub.c +++ b/ft_strsub.c @@ -1,18 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strsub.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:16:26 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:17:24 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> -char *ft_strsub(char const *s, unsigned int start, size_t len) +char *ft_strsub(char const *s, unsigned int start, size_t len) { - unsigned int i; - char *sub; + unsigned int i; + char *sub; - if ((sub = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - i = 0; - while (i < len) - { - sub[i] = s[start + i]; - i++; - } - sub[i] = '\0'; - return (sub); + if ((sub = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + i = 0; + while (i < len) + { + sub[i] = s[start + i]; + i++; + } + sub[i] = '\0'; + return (sub); } diff --git a/ft_strtrim.c b/ft_strtrim.c index 7b93eae..9d6e7d7 100644 --- a/ft_strtrim.c +++ b/ft_strtrim.c @@ -1,27 +1,39 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_strtrim.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:24:16 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:25:02 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include <stdlib.h> #include "libft.h" -static int is_space(char c) +static int is_space(char c) { - return (c == ' ' || c == '\n' || c == '\t'); + return (c == ' ' || c == '\n' || c == '\t'); } -char *ft_strtrim(char const *s) +char *ft_strtrim(char const *s) { - size_t start; - size_t len; - char *trimed; + size_t start; + size_t len; + char *trimed; - start = 0; - while (s[start] && is_space(s[start])) - start++; - len = ft_strlen(&s[start]); - if (len != 0) - while (s[start + len - 1] && is_space(s[start + len - 1])) - len--; - if ((trimed = (char*)malloc(sizeof(char) * (len + 1))) == NULL) - return (NULL); - trimed = ft_strncpy(trimed, &s[start], len); - trimed[len] = '\0'; - return (trimed); + start = 0; + while (s[start] && is_space(s[start])) + start++; + len = ft_strlen(&s[start]); + if (len != 0) + while (s[start + len - 1] && is_space(s[start + len - 1])) + len--; + if ((trimed = (char*)malloc(sizeof(char) * (len + 1))) == NULL) + return (NULL); + trimed = ft_strncpy(trimed, &s[start], len); + trimed[len] = '\0'; + return (trimed); } diff --git a/ft_tolower.c b/ft_tolower.c index a6f5119..a5cc5eb 100644 --- a/ft_tolower.c +++ b/ft_tolower.c @@ -1,12 +1,18 @@ -int ft_tolower(int c) +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_tolower.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:14:26 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:14:33 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + +int ft_tolower(int c) { - if (c < -1) - return (c + 256); - if (c == -1) - return (-1); - if (c == 0) - return (0); - if (c >= 'A' && c <= 'Z') - return ('a' + c - 'A'); - return (c); + if (c >= 'A' && c <= 'Z') + return ('a' + c - 'A'); + return (c); } diff --git a/ft_toupper.c b/ft_toupper.c index 2832c28..0257786 100644 --- a/ft_toupper.c +++ b/ft_toupper.c @@ -1,14 +1,20 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ft_toupper.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 10:14:10 by cacharle #+# #+# */ +/* Updated: 2019/10/07 10:14:20 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #include "libft.h" -int ft_toupper(int c) +int ft_toupper(int c) { - if (c < -1) - return (c + 256); - if (c == -1) - return (-1); - if (c == 0) - return (0); - if (c >= 'a' && c <= 'z') - return (c - 'a' + 'A'); - return (c); + if (c >= 'a' && c <= 'z') + return (c - 'a' + 'A'); + return (c); } @@ -1,56 +1,68 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* libft.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2019/10/07 09:45:02 by cacharle #+# #+# */ +/* Updated: 2019/10/07 09:45:04 by cacharle ### ########.fr */ +/* */ +/* ************************************************************************** */ + #ifndef LIBFT_H # define LIBFT_H # include <string.h> -void *ft_memset(void *s, int c, size_t n); -void ft_bzero(void *s, size_t n); -void *ft_memcpy(void *dest, const void *src, size_t n); -void *ft_memccpy(void *dest, const void *src, int c, size_t n); -void *ft_memmove(void *dest, const void *src, size_t n); -void *ft_memchr(const void *s, int c, size_t n); -int ft_memcmp(const void *s1, const void *s2, size_t n); -size_t ft_strlen(const char *s); -char *ft_strdup(const char *s); -char *ft_strcpy(char *dest, const char *src); -char *ft_strncpy(char *dest, const char *src, size_t n); -char *ft_strcat(char *dest, const char *src); -char *ft_strncat(char *dest, const char *src, size_t n); -size_t ft_strlcat(char *dst, const char *src, size_t size); -char *ft_strchr(const char *s, int c); -char *ft_strrchr(const char *s, int c); -char *ft_strstr(const char *haystack, const char *needle); -char *ft_strnstr(const char *big, const char *little, size_t len); -int ft_strcmp(const char *s1, const char *s2); -int ft_strncmp(const char *s1, const char *s2, size_t n); -int ft_atoi(const char *nptr); -int ft_isalpha(int c); -int ft_isdigit(int c); -int ft_isalnum(int c); -int ft_isascii(int c); -int ft_isprint(int c); -int ft_toupper(int c); -void *ft_memalloc(size_t size); -void ft_memdel(void **ap); -char *ft_strnew(size_t size); -void ft_strdel(char **as); -void ft_strclr(char *s); -void ft_striter(char *s, void (*f)(char *)); -void ft_striteri(char *s, void (*f)(unsigned int, char *)); -char *ft_strmap(char const *s, char (*f)(char)); -char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); -int ft_strequ(char const *s1, char const *s2); -int ft_strnequ(char const *s1, char const *s2, size_t n); -char *ft_strsub(char const *s, unsigned int start, size_t len); -char *ft_strjoin(char const *s1, char const *s2); -char *ft_strtrim(char const *s); -char **ft_strsplit(char const *s, char c); -char *ft_itoa(int n); -void ft_putchar(char c); -void ft_putstr(char const *s); -void ft_putnbr(int n); -void ft_putchar_fd(char c, int fd); -void ft_putstr_fd(char const *s, int fd); -void ft_putendl_fd(char const *s, int fd); +void *ft_memset(void *s, int c, size_t n); +void ft_bzero(void *s, size_t n); +void *ft_memcpy(void *dest, const void *src, size_t n); +void *ft_memccpy(void *dest, const void *src, int c, size_t n); +void *ft_memmove(void *dest, const void *src, size_t n); +void *ft_memchr(const void *s, int c, size_t n); +int ft_memcmp(const void *s1, const void *s2, size_t n); +size_t ft_strlen(const char *s); +char *ft_strdup(const char *s); +char *ft_strcpy(char *dest, const char *src); +char *ft_strncpy(char *dest, const char *src, size_t n); +char *ft_strcat(char *dest, const char *src); +char *ft_strncat(char *dest, const char *src, size_t n); +size_t ft_strlcat(char *dst, const char *src, size_t size); +char *ft_strchr(const char *s, int c); +char *ft_strrchr(const char *s, int c); +char *ft_strstr(const char *haystack, const char *needle); +char *ft_strnstr(const char *big, const char *little, size_t len); +int ft_strcmp(const char *s1, const char *s2); +int ft_strncmp(const char *s1, const char *s2, size_t n); +int ft_atoi(const char *nptr); +int ft_isalpha(int c); +int ft_isdigit(int c); +int ft_isalnum(int c); +int ft_isascii(int c); +int ft_isprint(int c); +int ft_toupper(int c); +void *ft_memalloc(size_t size); +void ft_memdel(void **ap); +char *ft_strnew(size_t size); +void ft_strdel(char **as); +void ft_strclr(char *s); +void ft_striter(char *s, void (*f)(char *)); +void ft_striteri(char *s, void (*f)(unsigned int, char *)); +char *ft_strmap(char const *s, char (*f)(char)); +char *ft_strmapi(char const *s, char (*f)(unsigned int, char)); +int ft_strequ(char const *s1, char const *s2); +int ft_strnequ(char const *s1, char const *s2, size_t n); +char *ft_strsub(char const *s, unsigned int start, size_t len); +char *ft_strjoin(char const *s1, char const *s2); +char *ft_strtrim(char const *s); +char **ft_strsplit(char const *s, char c); +char *ft_itoa(int n); +void ft_putchar(char c); +void ft_putstr(char const *s); +void ft_putnbr(int n); +void ft_putchar_fd(char c, int fd); +void ft_putstr_fd(char const *s, int fd); +void ft_putendl_fd(char const *s, int fd); #endif |
