merge conflicts
This commit is contained in:
@@ -6,14 +6,12 @@
|
||||
/* By: lperrey <lperrey@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2021/11/07 02:01:33 by lperrey #+# #+# */
|
||||
/* Updated: 2021/12/02 15:50:40 by hulamy ### ########.fr */
|
||||
/* Updated: 2021/12/10 10:27:50 by hulamy ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
#include "minishell.h"
|
||||
|
||||
//t_list *ft_lstnew_generic(size_t lst_sizse, size_t content_size);
|
||||
|
||||
static t_list *ret_parameter_expansion(char *content, int *i);
|
||||
|
||||
t_list *expand_token(char *content)
|
||||
@@ -101,9 +99,12 @@ static t_list *ret_parameter_expansion(char *content, int *i)
|
||||
free(tmp);
|
||||
if (expand->content)
|
||||
expand->content = ft_strdup(expand->content);
|
||||
else
|
||||
expand->content = ft_calloc(1, 1);
|
||||
if (!expand->content)
|
||||
return (ft_retp_free(NULL, expand, free));
|
||||
return (expand);
|
||||
}
|
||||
|
||||
/*
|
||||
environment variables must be POSIX NAME :
|
||||
3.235 Name
|
||||
https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html
|
||||
#tag_03_235
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user