tom/minishell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge confclict

Browse Source
This commit is contained in:
mdev9
2024-02-18 17:05:13 +01:00
parent e126456b49 1396ee52af
commit da8d8cbe1c
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
srcs/alias.c
View File

@ -6,7 +6,7 @@
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/16 23:16:07 by marde-vr #+# #+# */
/* Updated: 2024/02/18 16:59:56 by marde-vr ### ########.fr */
/* Updated: 2024/02/18 17:04:08 by marde-vr ### ########.fr */
/* */
/* ************************************************************************** */
@ -21,7 +21,6 @@ char *get_alias_name(t_cmd *arg)
char *res;
res = ft_strdup("");
ft_strlcpy(res, arg->token, i);
//ft_printf("name: %s\n", res);
return (res);
}
@ -33,17 +32,16 @@ char *get_alias_value(t_cmd *arg)
i++;
char *res;
res = arg->token + i;
//ft_printf("value: %s\n", res);
return (res);
}
int alias(t_cmd *args, t_alias *aliases)
int alias(t_cmd *args, t_alias **aliases)
{
if (ft_strchr(args->next->token, '='))
{
char *name = get_alias_name(args->next);
char *value = get_alias_value(args->next);
aliases = alias_add_back(aliases, name, value);
*aliases = alias_add_back(*aliases, name, value);
}
else
{