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

merging conflicts

Browse Source
This commit is contained in:
Hugo LAMY
2021-12-20 15:07:58 +01:00
parent 59a43ea1cc
commit 0a64977cdc
8 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/parsing/expansions/rejoin_after_expand.c
View File

@@ -6,7 +6,7 @@
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */
/* Updated: 2021/11/07 04:03:02 by lperrey ### ########.fr */
/* Updated: 2021/12/20 14:55:03 by hulamy ### ########.fr */
/* */
/* ************************************************************************** */
@@ -23,9 +23,9 @@ char *rejoin_after_expand(t_list *expand_lst)
{
result = ft_strjoinfree_s1(result, expand_lst->content);
if (!result)
{//todo wrap
{
perror("rejoin_after_expand() error");
return (ft_lstclear(&head, free));
return (ft_lstclear(&head, free));
}
expand_lst = expand_lst->next;
}