From: Dominik Kaiser <dkaiser@3-H-1.42heilbronn.de>
Date: Mon, 20 Jan 2025 12:19:08 +0000 (+0100)
Subject: Merge changes
X-Git-Url: https://git.dkaiser.de/?a=commitdiff_plain;h=549fabc52ff4d159075f224fb05f5b87f7c5309c;p=42%2Fminishell.git

Merge changes
---

549fabc52ff4d159075f224fb05f5b87f7c5309c
diff --cc src/collect_redirs.c
index c170a30,350cf6b..aeaf177
--- a/src/collect_redirs.c
+++ b/src/collect_redirs.c
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/08/02 13:49:31 by dkaiser           #+#    #+#             */
- /*   Updated: 2025/01/20 13:00:04 by chuhlig          ###   ########.fr       */
 -/*   Updated: 2025/01/20 13:03:47 by dkaiser          ###   ########.fr       */
++/*   Updated: 2025/01/20 13:17:59 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */
  
@@@ -60,15 -81,15 +60,15 @@@ static void	collect_and_check_redir(t_r
  			return ;
  	}
  	else if ((*cur)->content.redir_type == INPUT_FILE)
- 		set_redir(&result[0], INPUT_FILE, str, env);
+ 		set_redir(&result[0], INPUT_FILE, format_string(str, env), env);
  	else if ((*cur)->content.redir_type == OUTPUT_OVERRIDE)
  		ft_lstadd_back(create_files, ft_lstnew(set_redir(&result[1],
- 					OUTPUT_OVERRIDE, str, env)));
+ 					OUTPUT_OVERRIDE, format_string(str, env), env)));
  	else if ((*cur)->content.redir_type == OUTPUT_APPEND)
  		ft_lstadd_back(create_files, ft_lstnew(set_redir(&result[1],
- 					OUTPUT_APPEND, str, env)));
+ 					OUTPUT_APPEND, format_string(str, env), env)));
  	next_token = (*cur)->next;
 -	free_token_and_connect(*cur);
 +	// free_token_and_connect(*cur);
  	if (next_token)
  	{
  		*cur = next_token->next;
diff --cc src/get_cmd_path.c
index c35b3bc,e005af1..2980b0f
--- a/src/get_cmd_path.c
+++ b/src/get_cmd_path.c
@@@ -6,7 -6,7 +6,7 @@@
  /*   By: chuhlig <chuhlig@student.42.fr>            +#+  +:+       +#+        */
  /*                                                +#+#+#+#+#+   +#+           */
  /*   Created: 2024/12/17 19:19:59 by chuhlig           #+#    #+#             */
- /*   Updated: 2025/01/19 18:56:22 by chuhlig          ###   ########.fr       */
 -/*   Updated: 2025/01/20 12:52:00 by dkaiser          ###   ########.fr       */
++/*   Updated: 2025/01/20 13:18:45 by dkaiser          ###   ########.fr       */
  /*                                                                            */
  /* ************************************************************************** */