starnakin/42_minishell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: starnakin:76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
Branches Tags
starnakin:master
starnakin:camille
...
compare: starnakin:9ace235831188c2b41234605d2c1ba1dd1b920a9
Branches Tags
starnakin:master
starnakin:camille

3 Commits
76bc8fbfd8 ... 9ace235831

Author SHA1 Message Date
Etienne Rey-bethbeder
9ace235831 teesgdmbklvr 2023-02-21 23:29:56 +01:00
Etienne Rey-bethbeder
4e92c03637 tetgs 2023-02-21 23:28:37 +01:00
Etienne Rey-bethbeder
89c80e9bdb .......................prout 2023-02-21 22:26:45 +01:00
1 changed files with 14 additions and 1 deletions
Show Stats Expand all files Collapse all files

15
builtins/echo.c
View File

@ -6,7 +6,19 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 13:09:08 by erey-bet #+# #+# */ /* Created: 2023/02/17 13:09:08 by erey-bet #+# #+# */
<<<<<<< HEAD
<<<<<<< HEAD
/* Updated: 2023/02/21 22:24:51 by erey-bet ### ########.fr */
=======
<<<<<<< HEAD
/* Updated: 2023/02/21 21:45:38 by cchauvet ### ########.fr */
=======
/* Updated: 2023/02/21 22:09:55 by erey-bet ### ########.fr */
>>>>>>> 1fdc51a668e616de94c33d5b3b1e9cb51182916d
>>>>>>> eb4a8ed663b2f93cd955f7608aa686bd8e767a65
=======
/* Updated: 2023/02/21 22:15:27 by cchauvet ### ########.fr */ /* Updated: 2023/02/21 22:15:27 by cchauvet ### ########.fr */
>>>>>>> 76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -63,7 +75,8 @@ char *conca(char **strs)
while (strs[++i] != NULL) while (strs[++i] != NULL)
{ {
ft_strlcat(str, strs[i], ft_strlen(str) + ft_strlen(strs[i]) + 2); ft_strlcat(str, strs[i], ft_strlen(str) + ft_strlen(strs[i]) + 2);
str[ft_strlen(str)] = ' '; if (strs[i + 1] != NULL)
str[ft_strlen(str)] = ' ';
} }
str[ft_strlen(str)] = '\0'; str[ft_strlen(str)] = '\0';
return (str); return (str);