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

Je ne veux pas dénoncer mais

Browse Source
This commit is contained in:
Etienne Rey-bethbeder 2023-03-13 16:51:56 +01:00
parent 7ea602b12c
commit 08261b1921
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtins/echo.c
View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2023/02/17 13:09:08 by erey-bet #+# #+# */
/* Updated: 2023/03/13 16:29:47 by erey-bet ### ########.fr */
/* Updated: 2023/03/13 16:50:40 by erey-bet ### ########.fr */
/* */
/* ************************************************************************** */
@ -18,7 +18,7 @@ int is_space(char c)
|| c == '\r' || c == '\n');
}
int check_argument(char *str, int *check)
int check_argument(char *str, int *check_backslash_n)
{
int i;
@ -27,7 +27,7 @@ int check_argument(char *str, int *check)
if (str[i] != '-' && str[i] != 'n')
return (1);
if (ft_strnstr(str, "n", ft_strlen(str)))
*check = 1;
*check_backslash_n = 1;
else
return (1);
return (0);
@ -35,24 +35,26 @@ int check_argument(char *str, int *check)
int echo(int fd, char **strs)
{
int check;
int check_backslash_n;
int check_start_write;
int i;
check = 0;
check_backslash_n = 0;
check_start_write = 0;
i = -1;
while (strs[++i])
{
while (is_space(*strs[i]))
strs[i]++;
if (check == 2 || check_argument(strs[i], &check))
if (check_start_write == 1 || check_argument(strs[i], &check_backslash_n))
{
check = 2;
check_start_write = 1;
ft_putstr_fd(strs[i], fd);
if (strs[i + 1] != NULL)
write(fd, " ", 1);
}
}
if (!check)
if (!check_backslash_n)
write(fd, "\n", 1);
return (0);
}