Complete

Makefile

@@ -27,7 +27,7 @@ NAME			=	minishell
 # Comands
 COMPILER		=	cc
 DFLAGS			=	-g3 -gdwarf-2
-CFLAGS			=	-Wall -Wextra -Werror $(DFLAGS)
+CFLAGS			=	-Wall -Wextra -Werror $(DFLAGS) -g -O0
 AR			=	ar rcs
 RM			=	rm -rf
 MAKEFLAGS 		+= --silent
@@ -51,6 +51,7 @@ EXECUTE_DIR				=	$(SRC_DIR)/execute
 EXIT_STATUS_DIR			=	$(SRC_DIR)/exit_status
 TEST_DIR				=	$(SRC_DIR)/test
 SIGNALS_DIR				=	$(SRC_DIR)/signals
+CHECK_TOKENISE_DIR				=	$(SRC_DIR)/check_tokenise
 
 INCLUDES				=	-I./inc \
 							-I $(LIB_DIR)/libft/inc \
@@ -73,6 +74,8 @@ BUILTINS_SOURCES			=	$(wildcard $(BUILTINS_DIR)/*.c)
 EXECUTE_SOURCES				=	$(wildcard $(EXECUTE_DIR)/*.c)
 EXIT_STATUS_SOURCES			=	$(wildcard $(EXIT_STATUS_DIR)/*.c)
 SIGNALS_SOURCES				=	$(wildcard $(SIGNALS_DIR)/*.c)
+CHECK_TOKENISE_SOURCES		=	$(wildcard $(CHECK_TOKENISE_DIR)/*.c)
+
 
 MAIN_TEST_SOURCE			=	$(wildcard $(TEST_DIR)/*.c)
 ENV_TEST_SOURCES			=	$(wildcard $(TEST_DIR)/env/*.c)
@@ -94,7 +97,8 @@ SOURCES					=	$(MAIN_SOURCE) \
 							$(ENV_TEST_SOURCES) \
 							$(PIPE_TEST_SOURCES) \
 							$(REDIRECTION_SOURCES) \
-							$(SIGNALS_SOURCES)
+							$(SIGNALS_SOURCES) \
+							$(CHECK_TOKENISE)
 # Building
 BUILD_DIR					=	./build
 MAIN_OBJECT					=	$(patsubst $(SRC_DIR)/%.c, $(BUILD_DIR)/src/%.o, $(MAIN_SOURCE))
@@ -113,6 +117,7 @@ SIGNALS_OBJECTS				=	$(patsubst $(SIGNALS_DIR)/%.c, $(BUILD_DIR)/src/signals/%.o
 MAIN_TEST_OBJECT			=	$(patsubst $(TEST_DIR)/%.c, $(BUILD_DIR)/src/test/%.o, $(MAIN_TEST_SOURCE))
 ENV_TEST_OBJECTS			=	$(patsubst $(TEST_DIR)/env/%.c, $(BUILD_DIR)/src/test/env/%.o, $(ENV_TEST_SOURCES))
 PIPE_TEST_OBJECTS			=	$(patsubst $(TEST_DIR)/pipe/%.c, $(BUILD_DIR)/src/test/pipe/%.o, $(PIPE_TEST_SOURCES))
+CHECK_TOKENISE_OBJECTS		=	$(patsubst $(CHECK_TOKENISE_DIR)/check_tokenise/%.c, $(BUILD_DIR)/src/check_tokenise/%.o, $(CHECK_TOKENISE_SOURCES))
 
 OBJECTS					=	$(MAIN_OBJECT) \
 							$(APP_OBJECTS) \
@@ -127,7 +132,8 @@ OBJECTS					=	$(MAIN_OBJECT) \
 							$(PARSER_OBJECTS) \
 							$(PIPE_OBJECTS)	\
 							$(REDIRECTION_OBJECTS) \
-							$(SIGNALS_OBJECTS)
+							$(SIGNALS_OBJECTS) \
+							$(CHECK_TOKENISE_OBJECTS)
 
 TEST_OBJECTS			=	$(APP_OBJECTS) \
 							$(ENV_OBJECTS) \
@@ -139,7 +145,8 @@ TEST_OBJECTS			=	$(APP_OBJECTS) \
 							$(PIPE_OBJECTS) \
 							$(MAIN_TEST_OBJECT) \
 							$(ENV_TEST_OBJECTS)	\
-							$(PIPE_TEST_OBJECTS)
+							$(PIPE_TEST_OBJECTS) \
+							$(CHECK_TOKENISE_OBJECTS)
 
 # Processing
 all: $(NAME)
@@ -234,6 +241,6 @@ test: $(TEST_OBJECTS) $(LIBFT)
 	@./test
 
 valgrind: $(NAME)
-	@valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --verbose --suppressions=readline.supp --log-file=valgrind-out.txt ./minishell
+	@valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --track-fds=yes --trace-children=yes --suppressions=readline.supp --num-callers=20 --log-file=valgrind-out.txt ./minishell
 
 .PHONY: all bonus clean fclean re test

inc/execute.h

@@ -6,7 +6,7 @@
 /*   By: dmdemirk <[email protected]      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/06/03 16:34:42 by dmdemirk          #+#    #+#             */
-/*   Updated: 2024/09/06 12:31:40 by dmdemirk         ###   ########.fr       */
+/*   Updated: 2024/09/09 13:19:58 by dmdemirk         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,6 +26,7 @@ void	ft_free_2d_arr(char **arr);
 int		ft_perror(char *str);
 void	close_fds(int in, int out);
 void	handle_io_fd(t_ms_data *data);
+void	handle_std_io(int *std_io, int std_fileno);
 
 /*  shell variable execution */
 int		handle_shell_variable(t_ast *node, t_ms_data *data);

inc/exit_status.h

@@ -6,7 +6,7 @@
 /*   By: dmdemirk <[email protected]      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/06 12:29:24 by dmdemirk          #+#    #+#             */
-/*   Updated: 2024/09/06 12:31:02 by dmdemirk         ###   ########.fr       */
+/*   Updated: 2024/09/09 13:20:14 by dmdemirk         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,5 +37,6 @@ void	set_exit_status(int *exit_status, int status_code);
 /*  exit_status_utils    */
 int		ft_perror(char *str);
 int		ft_isnumber(char *str);
+void	free_shell_var_list(t_env *shell_var);
 
 #endif

inc/redirection.h

@@ -6,7 +6,7 @@
 /*   By: dmdemirk <[email protected]      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/11 14:59:47 by dmdemirk          #+#    #+#             */
-/*   Updated: 2024/07/11 15:00:25 by dmdemirk         ###   ########.fr       */
+/*   Updated: 2024/09/09 13:49:13 by dmdemirk         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,12 +17,14 @@
 # include "tokens.h"
 
 /*  redirect_in */
-int	redirect_in(t_ast *node, t_ms_data *data);
-int	redirect_out(t_ast *node, t_ms_data *data);
-int	redirect_append(t_ast *node, t_ms_data *data);
-int	redirect_here_doc(t_ast *node, t_ms_data *data);
+int		redirect_in(t_ast *node, t_ms_data *data);
+int		redirect_out(t_ast *node, t_ms_data *data);
+int		redirect_append(t_ast *node, t_ms_data *data);
+int		redirect_here_doc(t_ast *node, t_ms_data *data);
+char	*process_and_reassemble(char *line, t_ms_data *data);
 
 /*  utils   */
-int	open_file(t_ast *node, char *direction);
+int		open_file(t_ast *node, char *direction);
+int		open_tmp_file(const char *type);
 
 #endif

inc/signals.h

@@ -6,7 +6,7 @@
 /*   By: dmdemirk <[email protected]      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/17 14:07:19 by dmdemirk          #+#    #+#             */
-/*   Updated: 2024/07/18 15:59:38 by dmdemirk         ###   ########.fr       */
+/*   Updated: 2024/09/09 13:20:52 by dmdemirk         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,12 +19,17 @@
 # include <signal.h>
 # include "shell.h"
 
+// GLOBAL VAR
+extern volatile sig_atomic_t	g_heredoc_interrupted;
+
 /*      signals     */
 void	signal_reset_prompt(int signo);
 void	set_signals_interactive(void);
 void	signal_print_newline(int signal);
 void	sigquit_ignore(void);
 void	set_signals_noninteractive(void);
+void	handle_sigint_heredoc(int signo);
 
 int		ft_perror(char *str);
+
 #endif

inc/tokens.h

@@ -34,7 +34,8 @@ typedef enum e_token_type
 	REDIR_IN,
 	REDIR_OUT,
 	REDIR_APPEND,
-	REDIR_HEREDOC
+	REDIR_HEREDOC,
+	NONE
 }	t_token_type;
 
 typedef struct s_token
@@ -73,26 +74,22 @@ int			calc_stack_size(t_token *stack);
 char		**list_to_array(t_token *head);
 void		build_linked_list(t_token **tokens, char **argv);
 void		handle_quotes(char **tokens, int *pos, char **input);
-void		handle_special_chars(char **str, t_token **tokens);
-void		handle_regular_chars(char **tokens, int *pos, char **input, \
-		char *delim);
+char		*handle_special_chars(char *str, t_token **tokens);
 void		skip_delimiters(char **input, char *delim);
 void		reallocate_tokens(char ***tokens, int *bufsize);
 void		parse_loop(char **input, char **tokens, int *pos, int *bufsize);
 char		**parse_input(char *input);
-// char *generate_prompt(void);
 char		*generate_prompt(t_ms_data *data);
 void		make_history(char *line);
-void		loop_cleanup(char *line, t_token *tokens, \
-		char *prompt, t_ast *tree);
+void		loop_cleanup(t_loop_data *loop_data, t_token *tokens_head);
 void		free_ms_data(t_ms_data *data);
 char		*check_heredoc(char *line);
 char		*heredoc(char *eof);
 void		init_ms_data(t_ms_data *data, char **argv, char **envp);
 void		initialise(int argc, char **argv);
 void		execute_command(char **parsed_text, t_token **tokens);
 void		print_maxishell(void);
-int			input_error_checks(const char *str);
+int			input_error_checks(t_loop_data *loop_data);
 t_token		*tokenise(char *str);
 void		print_tokens(t_token *tokens);
 t_ast		*parse_tokens(t_token **tokens, t_ms_data *data);
@@ -103,11 +100,11 @@ void		free_all_tokens(t_token *tokens);
 t_token		*new_token(char *value, t_token_type type);
 void		append_token(t_token **tokens, t_token *new_token);
 int			valid_operator(const char **str);
-t_ast		*new_ast_node(t_token_type type);
+t_ast		*new_ast_node(void);
 t_ast		*create_redir(t_token **tokens, t_token *tmp, t_ms_data *data);
 int			arg_len(t_token *current);
 void		set_command_args(t_ast *command_node, t_token **tokens, \
-		int arg_count);
+				int arg_count);
 t_ast		*manage_commands(t_token **tokens, t_ms_data *data);
 t_ast		*create_redir_node(t_token *token);
 int			is_redir_node(t_token *tokens);
@@ -119,5 +116,22 @@ void		execute_tree(t_ast *node, t_ms_data *data);
 char		*expand_env_and_loc_var(char *arg, t_ms_data *data);
 char		*append_literal(char **start, char *processed_arg);
 char		*process_argument(char *arg, t_ms_data *data);
+char		*expand_variable(char **start, t_ms_data *data);
+void		clear_history_file(void);
+int			is_in_single_quotes(char *arg);
+void		print_ast_args(t_ast *node);
+void		append_word_if_valid(char *start, char *str, t_token **tokens);
+char		*exit_status_adj(char *arg);
+char		*str_start_adj(char *arg);
+char		*tmp_adj(char *arg);
+int			cmd_arg_len(t_token *current);
+char		*exit_status_adj(char *arg);
+int			is_in_single_quotes(char *arg);
+char		*str_start_adj(char *arg);
+char		*tmp_adj(char *arg);
+char		*append_literal(char **start, char *processed_arg);
+char		*expand_variable(char **start, t_ms_data *data);
+char		*expand_env_and_loc_var(char *arg, t_ms_data *data);
+void		final_quote_removal(int arg_count, t_ast *command_node);
 
-#endif
+#endif

lib/libft/inc/libft.h

@@ -52,15 +52,19 @@ char		*ft_strchr(const char *s, int c);
 char		*ft_strcat(char *dest, char *src);
 char		*ft_strrchr(const char *s, int c);
 char		**ft_split(char const *s, char c);
-char		*ft_strcpy(char *dest, const char *src);
 char		*ft_strndup(const char *s, size_t n);
+char		*ft_strjoin_free(char *s1, char *s2);
+char		*ft_strcpy(char *dest, const char *src);
 char		*ft_strjoin(char const *s1, char const *s2);
 char		*ft_strtrim(char const *s1, char const *set);
 char		*ft_strstr(const char *big, const char *little);
+char		*ft_strcat_const(const char *dest, const char *src);
 char		*ft_strmapi(char const *s, char (*f)(unsigned int, char));
 char		*ft_substr(char const *s, unsigned int start, size_t len);
 char		*ft_strnstr(const char *haystack, const char *needle, size_t len);
 
+void		ft_free_2d_arr(char **arr);
+void		ft_print_2d_arr(char **arr);
 void		ft_bzero(void *s, size_t n);
 void		ft_putnbr_fd(int n, int fd);
 void		ft_putchar_fd(char c, int fd);

lib/libft/src/ft_free_2d_arr.c

@@ -0,0 +1,25 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_free_2d_arr.c                                   :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: rmikhayl <[email protected]>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/09/09 19:37:13 by rmikhayl          #+#    #+#             */
+/*   Updated: 2024/09/09 19:37:16 by rmikhayl         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_free_2d_arr(char **arr)
+{
+	int	i;
+
+	if (!arr)
+		return ;
+	i = -1;
+	while (arr[++i] != NULL)
+		free(arr[i]);
+	free(arr);
+}

lib/libft/src/ft_print_2d_arr.c

@@ -0,0 +1,22 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_print_2d_arr.c                                  :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: rmikhayl <[email protected]>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/09/09 19:37:13 by rmikhayl          #+#    #+#             */
+/*   Updated: 2024/09/09 19:37:16 by rmikhayl         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft.h"
+
+void	ft_print_2d_arr(char **arr)
+{
+	int	i;
+
+	i = -1;
+	while (arr[++i] != NULL)
+		ft_printf("arr[%d]:	%s		at add:	%p	\n", i, arr[i], arr[i]);
+}

src/parser/tokeniser_helpers.c → lib/libft/src/ft_strcat_const.c

@@ -1,46 +1,38 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   tokeniser_helpers.c                                :+:      :+:    :+:   */
+/*   ft_strcat_const.c                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: rocky <[email protected]>                       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2024/06/14 10:38:28 by rocky             #+#    #+#             */
-/*   Updated: 2024/06/14 10:38:30 by rocky            ###   ########.fr       */
+/*   Created: 2024/09/06 12:15:55 by rocky             #+#    #+#             */
+/*   Updated: 2024/09/06 12:15:59 by rocky            ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-#include "tokens.h"
+#include "libft.h"
 
-t_token	*new_token(char *value, t_token_type type)
+char	*ft_strcat_const(const char *dest, const char *src)
 {
-	t_token	*token;
+	int		i;
+	int		j;
+	char	*result;
 
-	token = malloc(sizeof(t_token));
-	if (!token)
+	result = malloc(sizeof(char) * (ft_strlen(dest) + ft_strlen(src) + 1));
+	if (!result)
 		return (NULL);
-	token->data = ft_strdup(value);
-	if (!token->data)
+	i = 0;
+	while (dest[i] != '\0')
 	{
-		free(token);
-		return (NULL);
+		result[i] = dest[i];
+		i++;
 	}
-	token->type = type;
-	token->next = NULL;
-	return (token);
-}
-
-void	append_token(t_token **tokens, t_token *new_token)
-{
-	t_token	*prev;
-
-	if (!*tokens)
-		*tokens = new_token;
-	else
+	j = 0;
+	while (src[j] != '\0')
 	{
-		prev = *tokens;
-		while (prev->next)
-			prev = prev->next;
-		prev->next = new_token;
+		result[i + j] = src[j];
+		j++;
 	}
+	result[i + j] = '\0';
+	return (result);
 }