added some functions / some updates

Author: Jeremy CAROL

Makefile

@@ -6,13 +6,13 @@
 #    By: jecarol <[email protected]>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/12/07 12:20:17 by jecarol           #+#    #+#              #
-#    Updated: 2016/12/14 15:48:28 by jecarol          ###   ########.fr        #
+#    Updated: 2017/04/11 20:24:17 by jecarol          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 NAME = libft.a
 
-CFLAGS += -Wall -Wextra -Werror
+CFLAGS += -Wall -Wextra -Werror -g
 
 SRC = 	ft_atoi.c \
 	ft_putchar.c \
@@ -51,6 +51,7 @@ SRC = 	ft_atoi.c \
 	ft_memcpy.c \
 	ft_memccpy.c \
 	ft_memmove.c \
+	ft_freejoin.c \
 	ft_memchr.c \
 	ft_memcmp.c \
 	ft_memalloc.c \
@@ -73,18 +74,32 @@ SRC = 	ft_atoi.c \
 	ft_lstiter.c \
 	ft_lstmap.c \
 	ft_printstrs.c \
+	ft_lstaddend.c \
+	ft_lstforeach.c \
+
+CC = @cc
 
 OBJ = $(SRC:.c=.o)
 
+# COLOR
+C_GOOD = "\033[32m"
+C_DURING = "\033[36m"
+
+# MESSAGE
+SUCCESS = $(C_GOOD)COMPILATION SUCCEEDED
+
 all: $(NAME)
 
 $(NAME): $(OBJ)
-	ar rc $(NAME) $(OBJ)
-	ranlib $(NAME)
+	@echo $(C_DURING)"Compiling" [ $(NAME) . . . ]
+	@ar rc $(NAME) $(OBJ)
+	@ranlib $(NAME)
+	@echo $(SUCCESS)
+
 clean:
-	/bin/rm -f $(OBJ)
+	@/bin/rm -f $(OBJ)
 
 fclean: clean
-	/bin/rm -f $(NAME)
+	@/bin/rm -f $(NAME)
 
 re: fclean all

README.md

@@ -0,0 +1,27 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_freejoin.c                                      :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2016/12/02 14:21:04 by jecarol           #+#    #+#             */
+/*   Updated: 2017/04/22 03:51:25 by rlkcmptr         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char		*ft_freejoin(char *dst, char *src)
+{
+	char	*tmp;
+
+	tmp = malloc(sizeof(char) * (ft_strlen(dst) + 1));
+	tmp[0] = '\0';
+	ft_strcpy(tmp, dst);
+	ft_strdel(&dst);
+	if ((dst = ft_strjoin(tmp, src)) == NULL)
+		return (NULL);
+	ft_strdel(&tmp);
+	return (dst);
+}

ft_atoi.o

@@ -6,7 +6,7 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/08 19:17:35 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/08 19:17:38 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/02/11 17:21:45 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

ft_bzero.o

@@ -0,0 +1,28 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_lstaddend.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2017/03/08 19:55:44 by jecarol           #+#    #+#             */
+/*   Updated: 2017/04/11 19:11:12 by jecarol          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void			ft_lstaddend(t_list **alst, t_list *new)
+{
+	t_list		*tmp;
+
+	if (*alst)
+	{
+		tmp = *alst;
+		while (tmp->next)
+			tmp = tmp->next;
+		tmp->next = new;
+	}
+	else
+		*alst = new;
+}

ft_freejoin.c

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_lstforeach.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2017/03/10 11:59:09 by jecarol           #+#    #+#             */
+/*   Updated: 2017/03/10 11:59:22 by jecarol          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_lstforeach(t_list *lst, void (*f)())
+{
+	while (lst)
+	{
+		f(lst->content);
+		lst = lst->next;
+	}
+}

ft_freejoin.o

@@ -6,7 +6,7 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/07 17:57:52 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/08 19:19:36 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/03/23 14:45:07 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,10 +25,10 @@ t_list		*ft_lstnew(void const *content, size_t content_size)
 	}
 	else
 	{
-		new->content = malloc(content_size);
+		new->content = malloc(content_size + 1);
 		if (!new->content)
 			return (NULL);
-		ft_memcpy((new->content), content, content_size);
+		ft_memcpy((new->content), content, content_size + 1);
 		new->content_size = content_size;
 	}
 	new->next = NULL;

ft_isalnum.o

@@ -6,7 +6,7 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/22 19:57:55 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/13 14:09:13 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/03/23 14:47:25 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,5 +27,6 @@ void	*ft_memcpy(void *dst, const void *src, size_t n)
 		dest[i] = source[i];
 		i++;
 	}
+	dest[i] = '\0';
 	return (dst);
 }

ft_isalpha.o

@@ -5,27 +5,28 @@
 /*                                                    +:+ +:+         +:+     */
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2016/11/22 19:46:50 by jecarol           #+#    #+#             */
-/*   Updated: 2016/11/25 13:03:15 by jecarol          ###   ########.fr       */
+/*   Created: 2017/02/11 17:36:32 by jecarol           #+#    #+#             */
+/*   Updated: 2017/02/11 17:36:33 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-char	*ft_strdup(const char *s1)
+char		*ft_strdup(const char *s1)
 {
+	char	*result;
 	int		i;
-	char	*s2;
+	int		j;
 
 	i = 0;
-	s2 = (char*)malloc(sizeof(*s2) * (ft_strlen(s1) + 1));
-	if (s2 == NULL)
+	if (!(result = (char*)malloc(sizeof(char) * (ft_strlen(s1) + 1))))
 		return (NULL);
-	while (s1[i])
+	j = (ft_strlen(s1));
+	while (j >= 0)
 	{
-		s2[i] = s1[i];
+		result[i] = s1[i];
 		i++;
+		j--;
 	}
-	s2[i] = '\0';
-	return (s2);
+	return (result);
 }

ft_isascii.o

@@ -6,67 +6,69 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/02 19:17:52 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/07 16:33:25 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/04/22 03:52:59 by rlkcmptr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-static int		ft_words(const char *s, char c)
+static int		ft_cnt_parts(const char *s, char c)
 {
-	unsigned int	i;
-	int				compteur;
+	int		cnt;
+	int		in_substring;
 
-	i = 0;
-	compteur = 0;
-	while (s[i])
+	in_substring = 0;
+	cnt = 0;
+	while (*s != '\0')
 	{
-		while (s[i] == c)
-			i++;
-		if (s[i] != '\0')
-			compteur++;
-		while (s[i] && (s[i] != c))
-			i++;
+		if (in_substring == 1 && *s == c)
+			in_substring = 0;
+		if (in_substring == 0 && *s != c)
+		{
+			in_substring = 1;
+			cnt++;
+		}
+		s++;
 	}
-	return (compteur);
+	return (cnt);
 }
 
-char			**ft_split1(char const *s, char c, char **str)
+static int		ft_wlen(const char *s, char c)
 {
-	int			i;
-	int			j;
-	int			k;
-	int			l;
+	int		len;
 
-	i = 0;
-	k = 0;
-	while (s[i])
+	len = 0;
+	while (*s != c && *s != '\0')
 	{
-		l = 0;
-		while (s[i] == c)
-			i++;
-		j = i;
-		while (s[i] && s[i] != c)
-			i++;
-		if (i > j)
-		{
-			str[k] = (char *)malloc(sizeof(char) * (i - j + 1));
-			while (j < i)
-				str[k][l++] = s[j++];
-			str[k++][l] = '\0';
-		}
+		len++;
+		s++;
 	}
-	str[k] = NULL;
-	return (str);
+	return (len);
 }
 
 char			**ft_strsplit(char const *s, char c)
 {
-	char		**str;
+	char	**t;
+	int		nb_word;
+	int		index;
 
-	if (!s)
+	if (s == NULL)
 		return (NULL);
-	if ((str = (char **)malloc(sizeof(char*) * ft_words(s, c) + 1)) == NULL)
+	index = 0;
+	nb_word = ft_cnt_parts((const char *)s, c);
+	t = (char **)malloc(sizeof(*t) * (ft_cnt_parts((const char *)s, c) + 1));
+	if (t == NULL)
 		return (NULL);
-	return (ft_split1(s, c, str));
+	while (nb_word--)
+	{
+		while (*s == c && *s != '\0')
+			s++;
+		t[index] = ft_strsub((const char *)s, 0, ft_wlen((const char *)s, c));
+		if (t[index] == NULL)
+			return (NULL);
+		s = s + ft_wlen(s, c);
+		index++;
+	}
+	t[index] = NULL;
+	return (t);
 }

ft_isdigit.o

@@ -6,7 +6,7 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/02 15:38:48 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/02 18:37:12 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/04/24 18:24:06 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 

ft_isprint.o

@@ -6,7 +6,7 @@
 /*   By: jecarol <[email protected]>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/22 18:48:21 by jecarol           #+#    #+#             */
-/*   Updated: 2016/12/14 15:49:07 by jecarol          ###   ########.fr       */
+/*   Updated: 2017/04/19 17:10:37 by jecarol          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,6 +15,24 @@
 # include <unistd.h>
 # include <string.h>
 # include <stdlib.h>
+# include <stdarg.h>
+
+# define DEFAULT "\033[0m"
+# define BLACK "\033[30m"
+# define RED "\033[31m"
+# define GREEN "\033[32m"
+# define YELLOW "\033[33m"
+# define BLUE "\033[34m"
+# define PURPLE "\033[35m"
+# define TURQUOISE "\033[36m"
+# define REDCOVER "\033[41m"
+# define GREENCOVER "\033[42m"
+# define YELLOWCOVER "\033[43m"
+# define BLUECOVER "\033[44m"
+# define PURPLECOVER "\033[45m"
+# define UGLYBLUECOVER "\033[46m"
+# define GREYCOVER "\033[47m"
+# define TEST "\033[51m"
 
 typedef struct		s_list
 {
@@ -23,6 +41,8 @@ typedef struct		s_list
 	struct s_list	*next;
 }					t_list;
 
+void				ft_lstaddend(t_list **alst, t_list *new);
+char				*ft_freejoin(char *s1, char *s2);
 size_t				ft_strlen(const char *str);
 char				*ft_strdup(const char *s1);
 int					ft_atoi(const char *str);
@@ -83,5 +103,6 @@ void				ft_lstdel(t_list **alst, void (*del)(void *, size_t));
 void				ft_lstiter(t_list *lst, void(*f)(t_list *elem));
 t_list				*ft_lstmap(t_list *lst, t_list *(*f)(t_list *elem));
 void				ft_printstrs(char **str);
+void				ft_lstforeach(t_list *lst, void(*f)());
 
 #endif