Added ft_strjoin_free and ft_strjoin_free_snd, Removed ft_itoa_base

5 files changed, 87 insertions, 68 deletions

diff --git a/Makefile b/Makefile
index 9dca309..f713b34 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: cacharle <marvin@42.fr>                    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2019/10/08 15:45:53 by cacharle          #+#    #+#              #
-#    Updated: 2019/10/25 03:31:58 by cacharle         ###   ########.fr        #
+#    Updated: 2019/11/05 22:16:32 by cacharle         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,15 +17,19 @@ CC = gcc
 CCFLAGS = -Wall -Wextra -Werror
 
 NAME = libft.a
-SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c ft_isprint.c \
-		ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c ft_memcmp.c ft_memcpy.c ft_memdel.c \
-		ft_memmove.c ft_memset.c ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \
-		ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c ft_strchr.c \
-		ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c ft_strdup.c ft_strequ.c ft_striter.c \
-		ft_striteri.c ft_strjoin.c ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c \
-		ft_strncat.c ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \
-		ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c ft_tolower.c \
-		ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c
+SRC = ft_atoi.c ft_bzero.c ft_isalnum.c ft_isalpha.c ft_isascii.c ft_isdigit.c \
+		ft_isprint.c ft_itoa.c ft_memalloc.c ft_memccpy.c ft_memchr.c \
+		ft_memcmp.c ft_memcpy.c ft_memdel.c ft_memmove.c ft_memset.c \
+		ft_putchar.c ft_putchar_fd.c ft_putendl.c ft_putendl_fd.c \
+		ft_putnbr.c ft_putnbr_fd.c ft_putstr.c ft_putstr_fd.c ft_strcat.c \
+		ft_strchr.c ft_strclr.c ft_strcmp.c ft_strcpy.c ft_strdel.c \
+		ft_strdup.c ft_strequ.c ft_striter.c ft_striteri.c ft_strjoin.c \
+		ft_strlcat.c ft_strlen.c ft_strmap.c ft_strmapi.c ft_strncat.c \
+		ft_strncmp.c ft_strncpy.c ft_strnequ.c ft_strnew.c ft_strnstr.c \
+		ft_strrchr.c ft_split.c ft_strstr.c ft_substr.c ft_strtrim.c \
+		ft_tolower.c ft_toupper.c ft_strlcpy.c ft_calloc.c ft_strndup.c \
+		ft_strjoin_free.c ft_strjoin_free_snd.c
+
 OBJ = $(SRC:.c=.o)
 INCLUDE = libft.h
 
diff --git a/ft_itoa_base.c b/ft_itoa_base.c
deleted file mode 100644
index 9f65422..0000000
--- a/ft_itoa_base.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   ft_itoa_base.c                                     :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2019/10/25 04:00:58 by cacharle          #+#    #+#             */
-/*   Updated: 2019/10/25 04:07:42 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-static int	nbrlen_radix(long int nbr, int radix)
-{
-	int					counter;
-	long unsigned int	u_nbr;
-
-	if (nbr == 0)
-		return (1);
-	counter = 0;
-	u_nbr = nbr;
-	if (nbr < 0)
-	{
-		counter++;
-		u_nbr = -nbr;
-	}
-	while (u_nbr > 0)
-	{
-		u_nbr /= radix;
-		counter++;
-	}
-	return (counter);
-}
-
-char		*ft_itoa_base(long int n, char *base)
-{
-	char				*str;
-	int					len;
-	int					radix;
-	long unsigned int	u_nbr;
-
-	radix = ft_strlen(base);
-	len = nbrlen_radix(n, radix);
-	if ((str = (char*)malloc(sizeof(char) * (len + 1))) == NULL)
-		return (NULL);
-	str[len] = '\0';
-	u_nbr = n < 0 ? -n : n;
-	if (n < 0)
-		str[0] = '-';
-	while (--len >= (n < 0 ? 1 : 0))
-	{
-		str[len] = base[u_nbr % radix];
-		u_nbr /= radix;
-	}
-	return (str);
-}
diff --git a/ft_strjoin_free.c b/ft_strjoin_free.c
new file mode 100644
index 0000000..18ce83d
--- /dev/null
+++ b/ft_strjoin_free.c
@@ -0,0 +1,35 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strjoin_free.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/11/05 21:32:48 by cacharle          #+#    #+#             */
+/*   Updated: 2019/11/05 22:17:03 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#include "libft.h"
+
+char	*ft_strjoin_free(char const *s1, char const *s2, int free_nb)
+{
+	char	*joined;
+
+	if (s1 == NULL || s2 == NULL)
+		return (NULL);
+	if ((joined = (char*)malloc(sizeof(char)
+			* (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL)
+		return (NULL);
+	joined = ft_strcpy(joined, s1);
+	joined = ft_strcat(joined, s2);
+	if (free_nb == 1)
+		free((void*)s1);
+	if (free_nb == 2)
+	{
+		free((void*)s1);
+		free((void*)s2);
+	}
+	return (joined);
+}
diff --git a/ft_strjoin_free_snd.c b/ft_strjoin_free_snd.c
new file mode 100644
index 0000000..46e36ae
--- /dev/null
+++ b/ft_strjoin_free_snd.c
@@ -0,0 +1,29 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strjoin_free_snd.c                              :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2019/11/05 22:12:56 by cacharle          #+#    #+#             */
+/*   Updated: 2019/11/05 22:17:15 by cacharle         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include <stdlib.h>
+#include "libft.h"
+
+char	*ft_strjoin_free_snd(char const *s1, char const *s2)
+{
+	char	*joined;
+
+	if (s1 == NULL || s2 == NULL)
+		return (NULL);
+	if ((joined = (char*)malloc(sizeof(char)
+			* (ft_strlen(s1) + ft_strlen(s2) + 1))) == NULL)
+		return (NULL);
+	joined = ft_strcpy(joined, s1);
+	joined = ft_strcat(joined, s2);
+	free((void*)s2);
+	return (joined);
+}
diff --git a/libft.h b/libft.h
index 4a5fa36..7303028 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/10/07 09:45:02 by cacharle          #+#    #+#             */
-/*   Updated: 2019/10/25 04:03:57 by cacharle         ###   ########.fr       */
+/*   Updated: 2019/11/05 22:19:15 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -82,7 +82,6 @@ void				ft_putstr_fd(char *s, int fd);
 void				ft_putendl_fd(char *s, int fd);
 void				ft_putnbr_fd(int n, int fd);
 char				*ft_strndup(const char *s1, size_t n);
-char				*ft_itoa_base(long int n, char *base);
 
 /*
 ** bonus
@@ -100,4 +99,12 @@ t_list				*ft_lstmap(t_list *lst, void *(*f)(void *),
 								void (*del)(void *));
 void				ft_lstpop_front(t_list **lst, void (*del)(void *));
 
+/*
+** added
+*/
+
+char				*ft_strjoin_free(char const *s1, char const *s2,
+										int free_nb);
+char				*ft_strjoin_free_snd(char const *s1, char const *s2);
+
 #endif