Fixed all norme from lexer, parser. minishell and builtins

2026-02-14 00:02:03 +01:00
parent 7862f3e131
commit 6453abfda3
16 changed files with 667 additions and 571 deletions
--- a/src/parser/parser_expand.c
+++ b/src/parser/parser_expand.c
@@ -0,0 +1,122 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   parser_expand.c                                    :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: sede-san <sede-san@student.42madrid.com    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2026/02/13 21:24:45 by sede-san          #+#    #+#             */
+/*   Updated: 2026/02/13 21:24:45 by sede-san         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "parser.h"
+#include "errors.h"
+
+static char	*replace_value(char *original, char *value, int start, int end);
+static void	expand_variable(char **argument, int *i, t_minishell *minishell);
+static void	expand_argument(char **argument, t_minishell *minishell);
+
+static char	*replace_value(
+	char *original,
+	char *value,
+	int start,
+	int end
+)
+{
+	const char	*before = ft_substr(original, 0, start);
+	const char	*after = ft_substr(original, end, ft_strlen(original) - end);
+	const char	*expanded = ft_strnjoin(3, before, value, after);
+
+	free((char *)before);
+	free((char *)after);
+	return ((char *)expanded);
+}
+
+static void	expand_variable(
+	char **argument,
+	int *i,
+	t_minishell *minishell
+)
+{
+	char		*expanded;
+	char		*variable_name;
+	char		*variable_value;
+	const int	start = *i + 1;
+	int			end;
+
+	end = start;
+	while (ft_isalnum((*argument)[end]) || (*argument)[end] == '_')
+		end++;
+	variable_name = ft_substr(*argument, start, end - start);
+	if (variable_name == NULL)
+		return (minishell->exit = true, malloc_error());
+	variable_value = get_env(variable_name, minishell);
+	free(variable_name);
+	if (variable_value == NULL)
+		variable_value = "";
+	expanded = replace_value(*argument, variable_value, start - 1, end);
+	if (expanded == NULL)
+		return (minishell->exit = true, malloc_error());
+	*i += ft_strlen(variable_value);
+	free(*argument);
+	*argument = expanded;
+}
+
+static void	expand_argument(
+	char **argument,
+	t_minishell *minishell
+)
+{
+	bool	in_single_quote;
+	bool	in_double_quote;
+	int		i;
+
+	in_single_quote = false;
+	in_double_quote = false;
+	i = 0;
+	while ((*argument)[i] != '\0')
+	{
+		if ((*argument)[i] == '$' && !in_single_quote)
+		{
+			expand_variable(argument, &i, minishell);
+			if (*argument == NULL)
+				return (minishell->exit = true, malloc_error());
+		}
+		else
+		{
+			if ((*argument)[i] == '\'' && !in_double_quote)
+				in_single_quote = !in_single_quote;
+			else if ((*argument)[i] == '"' && !in_single_quote)
+				in_double_quote = !in_double_quote;
+			i++;
+		}
+	}
+}
+
+void	expand(
+	t_list **commands,
+	t_minishell *minishell
+)
+{
+	t_list		*current_command;
+	t_command	*command;
+	int			i;
+
+	current_command = *commands;
+	while (current_command != NULL)
+	{
+		command = (t_command *)current_command->content;
+		i = 0;
+		while (i < command->argc)
+		{
+			expand_argument(&command->argv[i], minishell);
+			if (command->argv[i] == NULL)
+				ft_lstclear(commands, (void (*)(void *))command_clear);
+			i++;
+		}
+		if (command == NULL)
+			return (ft_lstclear(commands, (void (*)(void *))command_clear));
+		current_command = current_command->next;
+	}
+}