migrated to msh struct and normed
This commit is contained in:
25
srcs/alias.c
25
srcs/alias.c
@ -6,7 +6,7 @@
|
||||
/* By: marde-vr <marde-vr@42angouleme.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/02/16 23:16:07 by marde-vr #+# #+# */
|
||||
/* Updated: 2024/02/21 13:12:07 by marde-vr ### ########.fr */
|
||||
/* Updated: 2024/02/21 17:39:40 by marde-vr ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -39,11 +39,11 @@ char *get_alias_value(t_cmd *arg)
|
||||
return (res);
|
||||
}
|
||||
|
||||
void print_aliases(t_alias **aliases)
|
||||
void print_aliases(t_alias *aliases)
|
||||
{
|
||||
t_alias *cur_alias;
|
||||
|
||||
cur_alias = *aliases;
|
||||
cur_alias = aliases;
|
||||
while (cur_alias)
|
||||
{
|
||||
ft_printf("alias %s=%s\n", cur_alias->name, cur_alias->value);
|
||||
@ -51,24 +51,27 @@ void print_aliases(t_alias **aliases)
|
||||
}
|
||||
}
|
||||
|
||||
int alias(t_cmd *args, t_alias **aliases)
|
||||
int alias(t_msh *msh)
|
||||
{
|
||||
char *name;
|
||||
char *value;
|
||||
|
||||
if (!args->next || args->next->type != ARG)
|
||||
print_aliases(aliases);
|
||||
if (!msh->cmds->next || msh->cmds->next->type != ARG)
|
||||
print_aliases(msh->aliases);
|
||||
else
|
||||
{
|
||||
name = get_alias_name(args->next);
|
||||
if (ft_strchr(args->next->token, '='))
|
||||
name = get_alias_name(msh->cmds->next);
|
||||
if (ft_strchr(msh->cmds->next->token, '='))
|
||||
{
|
||||
value = get_alias_value(args->next);
|
||||
*aliases = alias_add_back(*aliases, name, value);
|
||||
value = get_alias_value(msh->cmds->next);
|
||||
msh->aliases = alias_add_back(msh->aliases, name, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
ft_printf("alias %s=%s\n", name, get_alias(*aliases, name));
|
||||
if (get_alias(msh->aliases, name))
|
||||
ft_printf("alias %s=%s\n", name, get_alias(msh->aliases, name));
|
||||
else
|
||||
ft_printf("minishell: alias %s: not found\n", name);
|
||||
free(name);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user