From 107cdb31a01fd876bd5678866fc72a9e6784a219 Mon Sep 17 00:00:00 2001
From: Tanguy MAZE <tmaze@student.42.fr>
Date: Sat, 7 Apr 2018 16:56:28 +0200
Subject: [PATCH] ft_strjoin

---
 Makefile     | 44 +++-----------------------------------------
 ft_strjoin.c | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 41 deletions(-)
 create mode 100644 ft_strjoin.c

diff --git a/Makefile b/Makefile
index 9ebdbc1..739de38 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2018/04/07 12:47:06 by tmaze             #+#    #+#              #
-#    Updated: 2018/04/07 15:47:00 by tmaze            ###   ########.fr        #
+#    Updated: 2018/04/07 16:39:45 by tmaze            ###   ########.fr        #
 #                                                                              #
 #******************************************************************************#
 
@@ -16,47 +16,9 @@ CCSTD = -std=c99
 
 NAME = libft.a
 
-SRCS =	\
-		ft_memset.c  \
-		ft_bzero.c   \
-		ft_memcpy.c  \
-		ft_memccpy.c \
-		ft_memmove.c \
-		ft_memchr.c  \
-		ft_memcmp.c  \
-		ft_strlen.c  \
-		ft_strdup.c  \
-		ft_strcpy.c  \
-		ft_strncpy.c \
-		ft_strcat.c  \
-		ft_strncat.c \
-		ft_strchr.c  \
-		ft_strrchr.c \
-		ft_strstr.c  \
-		ft_strnstr.c \
-		ft_strcmp.c  \
-		ft_strncmp.c \
-		ft_atoi.c	 \
-		ft_isalpha.c \
-		ft_isdigit.c \
-		ft_isalnum.c \
-		ft_isascii.c \
-		ft_isprint.c \
-		ft_toupper.c \
-		ft_tolower.c \
+SRCS =	ft_memset.c ft_bzero.c ft_memcpy.c ft_memccpy.c ft_memmove.c ft_memchr.c ft_memcmp.c ft_strlen.c ft_strdup.c ft_strcpy.c ft_strncpy.c ft_strcat.c ft_strncat.c ft_strchr.c ft_strrchr.c ft_strstr.c ft_strnstr.c ft_strcmp.c ft_strncmp.c ft_atoi.c	ft_isalpha.c ft_isdigit.c ft_isalnum.c ft_isascii.c ft_isprint.c ft_toupper.c ft_tolower.c \
 		\
-		ft_memalloc.c \
-		ft_memdel.c   \
-		ft_strnew.c   \
-		ft_strdel.c   \
-		ft_strclr.c   \
-		ft_striter.c  \
-		ft_striteri.c \
-		ft_strmap.c   \
-		ft_strmapi.c  \
-		ft_strequ.c   \
-		ft_strnequ.c  \
-		ft_strsub.c
+		ft_memalloc.c ft_memdel.c ft_strnew.c ft_strdel.c ft_strclr.c ft_striter.c ft_striteri.c ft_strmap.c ft_strmapi.c ft_strequ.c ft_strnequ.c ft_strsub.c ft_strjoin.c
 OBJS = $(SRCS:.c=.o)
 INCLS = -I.
 
diff --git a/ft_strjoin.c b/ft_strjoin.c
new file mode 100644
index 0000000..4a57be6
--- /dev/null
+++ b/ft_strjoin.c
@@ -0,0 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_strjoin.c                                       :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: tmaze <tmaze@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2018/04/07 16:30:47 by tmaze             #+#    #+#             */
+/*   Updated: 2018/04/07 16:56:01 by tmaze            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+char	*ft_strjoin(char const *s1, char const *s2)
+{
+	char	*ret;
+
+	if ((ret = ft_strnew(ft_strlen(s1) + ft_strlen(s2))) != NULL)
+	{
+		ft_strcpy(ret, s1);
+		ft_strcat(ret, s2);
+	}
+	return (ret);
+}