update: renamed variable
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
/* By: sede-san <sede-san@student.42madrid.com +#+ +:+ +#+ */
|
/* By: sede-san <sede-san@student.42madrid.com +#+ +:+ +#+ */
|
||||||
/* +#+#+#+#+#+ +#+ */
|
/* +#+#+#+#+#+ +#+ */
|
||||||
/* Created: 2025/10/22 18:37:38 by sede-san #+# #+# */
|
/* Created: 2025/10/22 18:37:38 by sede-san #+# #+# */
|
||||||
/* Updated: 2026/02/13 13:30:21 by sede-san ### ########.fr */
|
/* Updated: 2026/02/13 15:07:47 by sede-san ### ########.fr */
|
||||||
/* */
|
/* */
|
||||||
/* ************************************************************************** */
|
/* ************************************************************************** */
|
||||||
|
|
||||||
@@ -134,8 +134,8 @@ static void expand_variable(
|
|||||||
)
|
)
|
||||||
{
|
{
|
||||||
char *expanded;
|
char *expanded;
|
||||||
char *variable;
|
|
||||||
char *variable_name;
|
char *variable_name;
|
||||||
|
char *variable_value;
|
||||||
const int start = *i + 1;
|
const int start = *i + 1;
|
||||||
int end;
|
int end;
|
||||||
|
|
||||||
@@ -145,14 +145,14 @@ static void expand_variable(
|
|||||||
variable_name = ft_substr(*argument, start, end - start);
|
variable_name = ft_substr(*argument, start, end - start);
|
||||||
if (variable_name == NULL)
|
if (variable_name == NULL)
|
||||||
return (minishell->exit = true, malloc_error());
|
return (minishell->exit = true, malloc_error());
|
||||||
variable = get_env(variable_name, minishell);
|
variable_value = get_env(variable_name, minishell);
|
||||||
free(variable_name);
|
free(variable_name);
|
||||||
if (variable == NULL)
|
if (variable_value == NULL)
|
||||||
variable = "";
|
variable_value = "";
|
||||||
expanded = replace_value(*argument, variable, start - 1, end);
|
expanded = replace_value(*argument, variable_value, start - 1, end);
|
||||||
if (expanded == NULL)
|
if (expanded == NULL)
|
||||||
return (minishell->exit = true, malloc_error());
|
return (minishell->exit = true, malloc_error());
|
||||||
*i += ft_strlen(variable) - 1;
|
*i += ft_strlen(variable_value) - 1;
|
||||||
free(*argument);
|
free(*argument);
|
||||||
*argument = expanded;
|
*argument = expanded;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user