aboutsummaryrefslogtreecommitdiff
path: root/test_mini/libft/src/str/ft_strjoin.c
diff options
context:
space:
mode:
authornass1pro <nass1pro@gmail.com>2020-06-12 13:52:58 +0200
committernass1pro <nass1pro@gmail.com>2020-06-13 11:45:50 +0200
commitd971bd8d16608f316396aba7a579d0b1f1af5aeb (patch)
tree98ec558582ed20a120e13b4a376fd206fb620da0 /test_mini/libft/src/str/ft_strjoin.c
parent3136f59540a8dd29e2f096be5a8943e2ddd28431 (diff)
downloadminishell-d971bd8d16608f316396aba7a579d0b1f1af5aeb.tar.gz
minishell-d971bd8d16608f316396aba7a579d0b1f1af5aeb.tar.bz2
minishell-d971bd8d16608f316396aba7a579d0b1f1af5aeb.zip
Added e_token enum
Diffstat (limited to 'test_mini/libft/src/str/ft_strjoin.c')
-rw-r--r--test_mini/libft/src/str/ft_strjoin.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/test_mini/libft/src/str/ft_strjoin.c b/test_mini/libft/src/str/ft_strjoin.c
deleted file mode 100644
index b65eaa2..0000000
--- a/test_mini/libft/src/str/ft_strjoin.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ************************************************************************** */
-/* */
-/* ::: :::::::: */
-/* ft_strjoin.c :+: :+: :+: */
-/* +:+ +:+ +:+ */
-/* By: cacharle <marvin@42.fr> +#+ +:+ +#+ */
-/* +#+#+#+#+#+ +#+ */
-/* Created: 2019/10/07 10:35:26 by cacharle #+# #+# */
-/* Updated: 2020/02/14 03:40:39 by cacharle ### ########.fr */
-/* */
-/* ************************************************************************** */
-
-#include "libft.h"
-
-char *ft_strjoin(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);
- return (ft_strcat(ft_strcpy(joined, s1), s2));
-}