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

teesgdmbklvr

Browse Source
This commit is contained in:
Etienne Rey-bethbeder
2023-02-21 23:29:56 +01:00
parent 4e92c03637 76bc8fbfd8
commit 9ace235831
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
builtins/.echo.c.swp
View File

Binary file not shown.

8
builtins/echo.c
View File

@ -7,6 +7,7 @@
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 13:09:08 by erey-bet #+# #+# */
<<<<<<< HEAD
<<<<<<< HEAD
/* Updated: 2023/02/21 22:24:51 by erey-bet ### ########.fr */
=======
<<<<<<< HEAD
@ -15,6 +16,9 @@
/* Updated: 2023/02/21 22:09:55 by erey-bet ### ########.fr */
>>>>>>> 1fdc51a668e616de94c33d5b3b1e9cb51182916d
>>>>>>> eb4a8ed663b2f93cd955f7608aa686bd8e767a65
=======
/* Updated: 2023/02/21 22:15:27 by cchauvet ### ########.fr */
>>>>>>> 76bc8fbfd8d5413e8f6e4f3eb6ec00db0fa3c884
/* */
/* ************************************************************************** */
@ -53,7 +57,6 @@ int check_argument(char *str, int *check, int i)
return (i);
}
char *conca(char **strs)
{
int len;
@ -64,7 +67,7 @@ char *conca(char **strs)
i = -1;
len = 0;
while (strs[++i] != NULL)
len += strlen(strs[i]) + 2;
len += ft_strlen(strs[i]) + 2;
str = (char *) ft_calloc(len + 1, sizeof(char));
if (str == NULL)
return NULL;
@ -79,7 +82,6 @@ char *conca(char **strs)
return (str);
}
int echo(int fd, char **strs)
{
int check;